Commit d6061212c3bcef9082253a7ed40128fac5214c0f

Werner Lemberg 2014-11-19T21:13:23

Minor code improvement in `FT_Bitmap_Embolden'. * src/base/ftbitmap.c (FT_Bitmap_Embolden) <FT_PIXEL_MODE_GRAY[24]>: Fix thinko.

diff --git a/ChangeLog b/ChangeLog
index 912bbf6..1f5973c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-19  Werner Lemberg  <wl@gnu.org>
+
+	Minor code improvement in `FT_Bitmap_Embolden'.
+
+	* src/base/ftbitmap.c (FT_Bitmap_Embolden) <FT_PIXEL_MODE_GRAY[24]>:
+	Fix thinko.
+
 2014-11-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	* src/base/fttrigon.c: Use dedicated `FT_Angle' for arctan table.
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 572e625..1099860 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -254,17 +254,11 @@
     case FT_PIXEL_MODE_GRAY4:
       {
         FT_Bitmap  tmp;
-        FT_Int     align;
 
 
-        if ( bitmap->pixel_mode == FT_PIXEL_MODE_GRAY2 )
-          align = ( bitmap->width + xstr + 3 ) / 4;
-        else
-          align = ( bitmap->width + xstr + 1 ) / 2;
-
+        /* convert to 8bpp */
         FT_Bitmap_New( &tmp );
-
-        error = FT_Bitmap_Convert( library, bitmap, &tmp, align );
+        error = FT_Bitmap_Convert( library, bitmap, &tmp, 1 );
         if ( error )
           return error;