Cache-friendler blending loops in FontFreeType::getGlyphBitmapByIndex.

Author: j-jorge

core/2d/FontFreeType.cpp

@@ -45,11 +45,11 @@ namespace ax
 {
 
 FT_Library FontFreeType::_FTlibrary;
-bool FontFreeType::_FTInitialized             = false;
-bool FontFreeType::_streamParsingEnabled      = true;
-bool FontFreeType::_doNativeBytecodeHinting   = true;
-bool FontFreeType::_globalSDFEnabled          = false;
-const int FontFreeType::DistanceMapSpread     = 6;
+bool FontFreeType::_FTInitialized           = false;
+bool FontFreeType::_streamParsingEnabled    = true;
+bool FontFreeType::_doNativeBytecodeHinting = true;
+bool FontFreeType::_globalSDFEnabled        = false;
+const int FontFreeType::DistanceMapSpread   = 6;
 
 // By default, will render square when character glyph missing in current font
 char32_t FontFreeType::_mssingGlyphCharacter = 0;
@@ -440,12 +440,11 @@ unsigned char* FontFreeType::getGlyphBitmap(char32_t charCode,
 
         if (charUTF8 == "\n")
             charUTF8 = "\\n";
-        AXLOGW("The font face: {} doesn't contains char: <{}>", _fontFace->charmap->face->family_name,
-                     charUTF8);
+        AXLOGW("The font face: {} doesn't contains char: <{}>", _fontFace->charmap->face->family_name, charUTF8);
 #endif
 
         if (ppFallbackInfo && s_FontEngine)
-        { // try fallback
+        {  // try fallback
             auto faceInfo = s_FontEngine->lookupFontFaceForCodepoint(charCode);
             if (faceInfo)
             {
@@ -454,13 +453,14 @@ unsigned char* FontFreeType::getGlyphBitmap(char32_t charCode,
             }
         }
 
-		// Not found charCode in system fallback fonts
-		if (_mssingGlyphCharacter != 0)
+        // Not found charCode in system fallback fonts
+        if (_mssingGlyphCharacter != 0)
         {
-            if (_mssingGlyphCharacter == 0x1A) {
-			    xAdvance = 0;
+            if (_mssingGlyphCharacter == 0x1A)
+            {
+                xAdvance = 0;
                 return nullptr;  // don't render anything for this character
-			}
+            }
             // Try get new glyph index with missing glyph character code
             glyphIndex = FT_Get_Char_Index(_fontFace, static_cast<FT_ULong>(_mssingGlyphCharacter));
         }
@@ -545,9 +545,9 @@ unsigned char* FontFreeType::getGlyphBitmapByIndex(unsigned int glyphIndex,
 
                 auto px = outlineMinX - blendImageMinX;
                 auto py = blendImageMaxY - outlineMaxY;
-                for (int x = 0; x < outlineWidth; ++x)
+                for (int y = 0; y < outlineHeight; ++y)
                 {
-                    for (int y = 0; y < outlineHeight; ++y)
+                    for (int x = 0; x < outlineWidth; ++x)
                     {
                         index                 = px + x + ((py + y) * blendWidth);
                         index2                = x + (y * outlineWidth);
@@ -557,9 +557,9 @@ unsigned char* FontFreeType::getGlyphBitmapByIndex(unsigned int glyphIndex,
 
                 px = glyphMinX - blendImageMinX;
                 py = blendImageMaxY - glyphMaxY;
-                for (int x = 0; x < outWidth; ++x)
+                for (int y = 0; y < outHeight; ++y)
                 {
-                    for (int y = 0; y < outHeight; ++y)
+                    for (int x = 0; x < outWidth; ++x)
                     {
                         index                     = px + x + ((y + py) * blendWidth);
                         index2                    = x + (y * outWidth);
@@ -710,4 +710,4 @@ void FontFreeType::releaseFont(std::string_view fontName)
     }
 }
 
-}
+}  // namespace ax