Changeset 406

Timestamp:

07/21/08 15:25:56 (2 years ago)

Author:

odole

Message:

2008-07-21 Olivier DOLE <odole@pleyo.com>

Reviewed by Mario Bensi.
Fix huge leak in freetype font implementation.

• WKAL/Concretizations/Fonts/Freetype/BCFontFreetype.cpp:
  (WKAL::Font::drawGlyphs):
  

Files:

• trunk/BAL/ChangeLogOWB (modified) (1 diff)
• trunk/BAL/WKAL/Concretizations/Fonts/Freetype/BCFontFreetype.cpp (modified) (2 diffs)

trunk/BAL/ChangeLogOWB

@@ +1 @@
+2008-07-21  Olivier DOLE  <odole@pleyo.com>
+
+        Reviewed by Mario Bensi.
+        Fix huge leak in freetype font implementation.
+
+        * WKAL/Concretizations/Fonts/Freetype/BCFontFreetype.cpp:
+        (WKAL::Font::drawGlyphs):
+
-2008-07-21  Mario Bensi  <mbensi@pleyo.com>
-

trunk/BAL/WKAL/Concretizations/Fonts/Freetype/BCFontFreetype.cpp

@@ -197 +197 @@
-        if (ftBitmapGlyph[0]->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
-            unsigned pixelColor = (penColor.alpha() << 24) | (penColor.red() << 16) | (penColor.green() << 8) | penColor.blue();
+            unsigned char* bitmapAddr = ftBitmapGlyph[i]->bitmap.buffer;
-            for (int j = 0; j < ftBitmapGlyph[i]->bitmap.rows; j++) {
-                unsigned char *bufferAddr = ftBitmapGlyph[i]->bitmap.buffer;
@@ -205 +206 @@
-                        (*glyphRGBABuffer)[(yOffset + j) * width + glyphBoxX[i].x() + k] = 0;
-                    if (k > 0 && (k % 8) == 0)
-ftBitmapGlyph[i]->bitmap.buffe
+bitmapAdd
-                }
-ftBitmapGlyph[i]->bitmap.buffe
+bitmapAdd
-            }
-        } else {
+            unsigned char* bitmapAddr = ftBitmapGlyph[i]->bitmap.buffer;
-            for (int j = 0; j < ftBitmapGlyph[i]->bitmap.rows; j++) {
-                for (int k = 0; k < ftBitmapGlyph[i]->bitmap.width; k++) {
-ftBitmapGlyph[i]->bitmap.buffe
+bitmapAdd
-                }
-            }
-        }
+        FT_Done_Glyph((FT_Glyph) ftBitmapGlyph[i]);
-    }
-    SDL_Surface* img;