shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[base] Replace left shifts with multiplication (#46118).

* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,11 @@

 2015-10-04  Werner Lemberg  <[email protected]>

+	[base] Replace left shifts with multiplication (#46118).

+

+	* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.

+

+2015-10-04  Werner Lemberg  <[email protected]>

+

 	* Version 2.6.1 released.

 	=========================

--- a/src/base/ftglyph.c

+++ b/src/base/ftglyph.c

@@ -125,10 +125,10 @@

     FT_BitmapGlyph  glyph = (FT_BitmapGlyph)bitmap_glyph;

-    cbox->xMin = glyph->left << 6;

-    cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );

-    cbox->yMax = glyph->top << 6;

-    cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );

+    cbox->xMin = glyph->left * 64;

+    cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );

+    cbox->yMax = glyph->top * 64;

+    cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );

   }

@@ -403,9 +403,9 @@

     if ( error )

       goto Exit;

-    /* copy advance while converting it to 16.16 format */

-    glyph->advance.x = slot->advance.x << 10;

-    glyph->advance.y = slot->advance.y << 10;

+    /* copy advance while converting 26.6 to 16.16 format */

+    glyph->advance.x = slot->advance.x * 1024;

+    glyph->advance.y = slot->advance.y * 1024;

     /* now import the image from the glyph slot */

     error = clazz->glyph_init( glyph, slot );