rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
This commit is contained in:
Werner Lemberg 2015-10-04 13:08:08 +02:00
parent 8cabd919ca
commit 30fe5e762e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-10-04 Werner Lemberg <wl@gnu.org>
[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 <wl@gnu.org>
* Version 2.6.1 released.

14
src/base/ftglyph.c
View File

@ -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 );