minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[truetype] Fix commit from 2015-05-22. 

* src/truetype/ttgload.c, src/truetype/ttinterp.c: Guard new code
with `TT_CONFIG_OPTION_SUBPIXEL_HINTING'.

Problem reported by Nikolaus Waxweiler <madigens@gmail.com>.
This commit is contained in:
Werner Lemberg 2015-05-24 23:29:23 +02:00
parent 7f0994820b
commit a5e1f6f39b
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2015-05-24 Werner Lemberg <wl@gnu.org>
[truetype] Fix commit from 2015-05-22.
* src/truetype/ttgload.c, src/truetype/ttinterp.c: Guard new code
with `TT_CONFIG_OPTION_SUBPIXEL_HINTING'.
Problem reported by Nikolaus Waxweiler <madigens@gmail.com>.
2015-05-23 Werner Lemberg <wl@gnu.org>
[truetype] Fix return values of GETINFO bytecode instruction.

2
src/truetype/ttgload.c
View File

@ -2299,10 +2299,12 @@
if ( exec->GS.instruct_control & 2 )
exec->GS = tt_default_graphics_state;
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
/* check whether we have a font hinted for ClearType -- */
/* note that this flag can also be modified in a glyph's bytecode */
if ( exec->GS.instruct_control & 4 )
exec->ignore_x_mode = 0;
#endif
exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
loader->exec = exec;

2
src/truetype/ttinterp.c
View File

@ -5185,10 +5185,12 @@
exc->GS.instruct_control &= ~(FT_Byte)Kf;
exc->GS.instruct_control |= (FT_Byte)L;
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
/* INSTCTRL modifying flag 3 also has an effect */
/* outside of the CVT program */
if ( K == 3 )
exc->ignore_x_mode = FT_BOOL( L == 4 );
#endif
}