diff --git a/ChangeLog b/ChangeLog index fa7cdeacd..eef639514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-06-28 Werner Lemberg + + [truetype] Set the `subpixel_positioned' flag unconditionally. + + This is how the code currently behaves. + + * src/truetype/ttgload.c (tt_loader_init): Do it. + 2012-06-27 Werner Lemberg Fix conditional compilation. diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 63d37730b..94ffde4e4 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1923,6 +1923,7 @@ FT_Bool compatible_widths; FT_Bool symmetrical_smoothing; FT_Bool bgr; + FT_Bool subpixel_positioned; #endif #endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */ @@ -1969,6 +1970,7 @@ exec->compatible_widths = SPH_OPTION_SET_COMPATIBLE_WIDTHS; exec->symmetrical_smoothing = FALSE; exec->bgr = FALSE; + exec->subpixel_positioned = TRUE; #else /* 0 */ exec->compatible_widths = FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != @@ -1979,6 +1981,9 @@ exec->bgr = FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != TT_LOAD_BGR ); + exec->subpixel_positioned = + FT_BOOL( FT_LOAD_TARGET_MODE( load_flags ) != + TT_LOAD_SUBPIXEL_POSITIONED ); #endif /* 0 */ #else /* !TT_CONFIG_OPTION_SUBPIXEL_HINTING */