ref: 265799a9334a5c76fc543b068576cfbb71080ecf
parent: 6453a819e89b8c3378b037f92b6801d0ec32c5c3
author: David Turner <[email protected]>
date: Wed Jan 8 04:52:32 EST 2003
* src/autohint/ahtypes.h, src/autohint/ahhint.c, src/pshinter/pshalgo3.h, src/pshinter/pshalgo3.c: implemented the FT_RENDER_MODE_LIGHT hinting mode in the auto and postscript hinters
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-08 Owen Taylor <[email protected]>
+
+ * src/autohint/ahtypes.h, src/autohint/ahhint.c, src/pshinter/pshalgo3.h,
+ src/pshinter/pshalgo3.c: implemented the FT_RENDER_MODE_LIGHT hinting
+ mode in the auto and postscript hinters
+
2003-01-08 David Turner <[email protected]>
* src/base/ftobjs.c (find_unicode_charmap): fixed the error code
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -104,9 +104,13 @@
sign = 1;
}
- if ( ( vertical && !hinter->do_vert_snapping ) ||
- ( !vertical && !hinter->do_horz_snapping ) )
+ if ( !hinter->do_stem_adjust )
{
+ /* leave stem widths unchanged */
+ }
+ else if ( ( vertical && !hinter->do_vert_snapping ) ||
+ ( !vertical && !hinter->do_horz_snapping ) )
+ {
/* smooth hinting process, very lightly quantize the stem width */
/* */
if ( dist < 64 )
@@ -1426,6 +1430,8 @@
/* vertical LCD rendering targets only. Corresponds to Y snapping. */
hinter->do_vert_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
hint_mode == FT_RENDER_MODE_LCD_V );
+
+ hinter->do_stem_adjust = FT_BOOL( hint_mode != FT_RENDER_MODE_LIGHT );
#if 1
load_flags = FT_LOAD_NO_SCALE
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -496,6 +496,7 @@
FT_Bool do_vert_hints; /* disable Y hinting */
FT_Bool do_horz_snapping; /* disable X stem size snapping */
FT_Bool do_vert_snapping; /* disable Y stem size snapping */
+ FT_Bool do_stem_adjust; /* disable light stem snapping */
} AH_HinterRec, *AH_Hinter;
--- a/src/pshinter/pshalgo3.c
+++ b/src/pshinter/pshalgo3.c
@@ -516,18 +516,21 @@
hint->cur_pos = pos;
hint->cur_len = fit_len;
- if ( len <= 64 )
+ if ( glyph->do_stem_adjust )
{
- /* the stem is less than one pixel, we will center it */
- /* around the nearest pixel center */
- /* */
- pos = ( pos + ( (len >> 1) & -64 ) );
- len = 64;
+ if ( len <= 64 )
+ {
+ /* the stem is less than one pixel, we will center it */
+ /* around the nearest pixel center */
+ /* */
+ pos = ( pos + ( (len >> 1) & -64 ) );
+ len = 64;
+ }
+ else
+ {
+ len = psh3_dimension_quantize_len( dim, len, 0 );
+ }
}
- else
- {
- len = psh3_dimension_quantize_len( dim, len, 0 );
- }
/* now that we have a good hinted stem width, try to position */
/* the stem along a pixel grid integer coordinate */
@@ -1719,6 +1722,8 @@
glyph->do_vert_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
hint_mode == FT_RENDER_MODE_LCD_V );
+
+ glyph->do_stem_adjust = FT_BOOL( hint_mode != FT_RENDER_MODE_LIGHT );
for ( dimension = 0; dimension < 2; dimension++ )
{
--- a/src/pshinter/pshalgo3.h
+++ b/src/pshinter/pshalgo3.h
@@ -221,6 +221,7 @@
FT_Bool do_vert_hints;
FT_Bool do_horz_snapping;
FT_Bool do_vert_snapping;
+ FT_Bool do_stem_adjust;
} PSH3_GlyphRec, *PSH3_Glyph;