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

[truetype] Minor. 

* src/truetype/ttinterp.h (TT_ExecContext):
 s/subpixel/subpixel_hinting.

* src/truetype/ttgload.c, src/truetype/ttgload.h: Updated.
This commit is contained in:
Werner Lemberg 2015-05-23 07:21:25 +02:00
parent c61cad868b
commit bb435da213
4 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,4 +1,13 @@
2015-05-20 Werner Lemberg <wl@gnu.org>
2015-05-23 Werner Lemberg <wl@gnu.org>
[truetype] Minor.
* src/truetype/ttinterp.h (TT_ExecContext):
s/subpixel/subpixel_hinting.
* src/truetype/ttgload.c, src/truetype/ttgload.h: Updated.
2015-05-22 Werner Lemberg <wl@gnu.org>
[truetype] Support selector index 3 of the INSTCTRL instruction.

37
src/truetype/ttgload.c
View File

@ -1367,11 +1367,14 @@
#define TT_LOADER_SET_PP( loader ) \
do \
{ \
FT_Bool subpixel_ = loader->exec ? loader->exec->subpixel \
: 0; \
FT_Bool grayscale_ = loader->exec ? loader->exec->grayscale \
: 0; \
FT_Bool use_aw_2_ = (FT_Bool)( subpixel_ && grayscale_ ); \
FT_Bool subpixel_hinting_ = loader->exec \
? loader->exec->subpixel_hinting \
: 0; \
FT_Bool grayscale_ = loader->exec \
? loader->exec->grayscale \
: 0; \
FT_Bool use_aw_2_ = (FT_Bool)( subpixel_hinting_ && \
grayscale_ ); \
\
\
(loader)->pp1.x = (loader)->bbox.xMin - (loader)->left_bearing; \
@ -2133,7 +2136,7 @@
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( face );
FT_Bool subpixel = FALSE;
FT_Bool subpixel_hinting = FALSE;
#if 0
/* not used yet */
@ -2167,24 +2170,24 @@
if ( driver->interpreter_version == TT_INTERPRETER_VERSION_38 )
{
subpixel = FT_BOOL( ( FT_LOAD_TARGET_MODE( load_flags ) !=
FT_RENDER_MODE_MONO ) &&
SPH_OPTION_SET_SUBPIXEL );
subpixel_hinting = FT_BOOL( ( FT_LOAD_TARGET_MODE( load_flags ) !=
FT_RENDER_MODE_MONO ) &&
SPH_OPTION_SET_SUBPIXEL );
if ( subpixel )
if ( subpixel_hinting )
grayscale = FALSE;
else if ( SPH_OPTION_SET_GRAYSCALE )
{
grayscale = TRUE;
subpixel = FALSE;
grayscale = TRUE;
subpixel_hinting = FALSE;
}
else
grayscale = FALSE;
if ( FT_IS_TRICKY( glyph->face ) )
subpixel = FALSE;
subpixel_hinting = FALSE;
exec->ignore_x_mode = subpixel || grayscale;
exec->ignore_x_mode = subpixel_hinting || grayscale;
exec->rasterizer_version = SPH_OPTION_SET_RASTERIZER_VERSION;
if ( exec->sph_tweak_flags & SPH_TWEAK_RASTERIZER_35 )
exec->rasterizer_version = TT_INTERPRETER_VERSION_35;
@ -2229,13 +2232,13 @@
{
/* a change from mono to subpixel rendering (and vice versa) */
/* requires a re-execution of the CVT program */
if ( subpixel != exec->subpixel )
if ( subpixel_hinting != exec->subpixel_hinting )
{
FT_TRACE4(( "tt_loader_init: subpixel hinting change,"
" re-executing `prep' table\n" ));
exec->subpixel = subpixel;
reexecute = TRUE;
exec->subpixel_hinting = subpixel_hinting;
reexecute = TRUE;
}
/* a change from mono to grayscale rendering (and vice versa) */

8
src/truetype/ttinterp.c
View File

@ -7301,9 +7301,9 @@
/* Selector Bit: 0 */
/* Return Bit(s): 0-7 */
/* */
if ( SUBPIXEL_HINTING &&
( args[0] & 1 ) != 0 &&
exc->subpixel )
if ( SUBPIXEL_HINTING &&
( args[0] & 1 ) != 0 &&
exc->subpixel_hinting )
{
if ( exc->ignore_x_mode )
{
@ -7358,7 +7358,7 @@
/* Selector Bit: 6 */
/* Return Bit(s): 13 */
/* */
if ( ( args[0] & 64 ) != 0 && exc->subpixel )
if ( ( args[0] & 64 ) != 0 && exc->subpixel_hinting )
K |= 1 << 13;
/********************************/

2
src/truetype/ttinterp.h
View File

@ -252,7 +252,7 @@ FT_BEGIN_HEADER
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
TT_Round_Func func_round_sphn; /* subpixel rounding function */
FT_Bool subpixel; /* Using subpixel hinting? */
FT_Bool subpixel_hinting; /* Using subpixel hinting? */
FT_Bool ignore_x_mode; /* Standard rendering mode for */
/* subpixel hinting. On if gray */
/* or subpixel hinting is on. */