Changeset 407

Timestamp:

07/21/08 17:40:06 (2 years ago)

Author:

odole

Message:

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

Reviewed by Mario Bensi.
fix a regression in freetype with FT_PIXEL_MODE_MONO.

• 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 a regression in freetype with FT_PIXEL_MODE_MONO.
+
+        * WKAL/Concretizations/Fonts/Freetype/BCFontFreetype.cpp:
+        (WKAL::Font::drawGlyphs):
+
-2008-07-21  Olivier DOLE  <odole@pleyo.com>
-

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

@@ -192 +192 @@
-    Vector<unsigned> *glyphRGBABuffer = new Vector<unsigned>(width * height);
-    glyphRGBABuffer->fill(0);
+    bool isMono = (ftBitmapGlyph[0]->bitmap.pixel_mode == FT_PIXEL_MODE_MONO); 
-    for (int i = 0; i < numGlyphs; i++) {
-        int yOffset = height - glyphBoxY[i].y() + yMin;
-
-
+
+
+
-            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++) {
-ftBitmapGlyph[i]->bitmap.buffe
+bitmapAdd
-                for (int k = 0; k < ftBitmapGlyph[i]->bitmap.width; k++) {
-ftBitmapGlyph[i]->bitmap.buffe
+bitmapAdd
-                        (*glyphRGBABuffer)[(yOffset + j) * width + glyphBoxX[i].x() + k] = pixelColor;
-                    else
@@ -211 +212 @@
-            }
-        } 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++) {