Compare commits

...

3 Commits

Author SHA1 Message Date
Yaroslav Erohin
23871ca3b1
Merge d7e072fe25 into 19a27b39f2 2025-03-09 10:28:25 +13:00
Daniel Collin
19a27b39f2
[Compilers] Fixed SIMD related compile error on some ARM compilers (#316)
Some checks are pending
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Waiting to run
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Waiting to run
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Waiting to run
2025-03-09 10:28:09 +13:00
Iaroslav Erokhin
d7e072fe25 fix heap buffer overflow and support unicode characters 2025-03-06 14:20:46 +01:00
2 changed files with 13 additions and 7 deletions

2
clay.h
View File

@ -1771,7 +1771,7 @@ bool Clay__MemCmp(const char *s1, const char *s2, int32_t length);
uint8x16_t v2 = vld1q_u8((const uint8_t *)s2);
// Compare vectors
if (vminvq_u32(vceqq_u8(v1, v2)) != 0xFFFFFFFF) { // If there's a difference
if (vminvq_u32(vreinterpretq_u32_u8(vceqq_u8(v1, v2))) != 0xFFFFFFFF) { // If there's a difference
return false;
}

View File

@ -99,16 +99,22 @@ static inline Clay_Dimensions Raylib_MeasureText(Clay_StringSlice text, Clay_Tex
float scaleFactor = config->fontSize/(float)fontToUse.baseSize;
for (int i = 0; i < text.length; ++i)
{
if (text.chars[i] == '\n') {
int byte_index = 0;
while (byte_index < text.length) {
if (text.chars[byte_index] == '\n') {
maxTextWidth = fmax(maxTextWidth, lineTextWidth);
lineTextWidth = 0;
byte_index++;
continue;
}
int index = text.chars[i] - 32;
if (fontToUse.glyphs[index].advanceX != 0) lineTextWidth += fontToUse.glyphs[index].advanceX;
else lineTextWidth += (fontToUse.recs[index].width + fontToUse.glyphs[index].offsetX);
int codepoint_bytes = 0;
int codepoint = GetCodepoint(&text.chars[byte_index], &codepoint_bytes);
int glyph_index = GetGlyphIndex(fontToUse, codepoint);
byte_index += codepoint_bytes;
if (fontToUse.glyphs[glyph_index].advanceX != 0) lineTextWidth += fontToUse.glyphs[glyph_index].advanceX;
else lineTextWidth += (fontToUse.recs[glyph_index].width + fontToUse.glyphs[glyph_index].offsetX);
}
maxTextWidth = fmax(maxTextWidth, lineTextWidth);