[autofit] Make glyph style array use 16bit values.
* include/freetype/ftautoh.h (FT_Prop_GlyphToScriptMap): Use `FT_UShort' for `map' field. * src/autofit/afglobal.c (af_face_globals_compute_style_coverage, af_face_globals_new), src/autofit/hbshim.c, src/autofit/hbshim.h (af_get_coverage): Use FT_UShort for `glyph_styles' array. * src/autofit/afglobal.h (AF_STYLE_UNASSIGNED, AF_DIGIT): Extend to 16 bits. (AF_FaceGlobalsRec): Use `FT_UShort' for `glyph_styles' field.
This commit is contained in:
parent
0963526435
commit
87c81f0460
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
||||||
|
2015-08-30 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
[autofit] Make glyph style array use 16bit values.
|
||||||
|
|
||||||
|
* include/freetype/ftautoh.h (FT_Prop_GlyphToScriptMap): Use
|
||||||
|
`FT_UShort' for `map' field.
|
||||||
|
|
||||||
|
* src/autofit/afglobal.c (af_face_globals_compute_style_coverage,
|
||||||
|
af_face_globals_new), src/autofit/hbshim.c, src/autofit/hbshim.h
|
||||||
|
(af_get_coverage): Use FT_UShort for `glyph_styles' array.
|
||||||
|
|
||||||
|
* src/autofit/afglobal.h (AF_STYLE_UNASSIGNED, AF_DIGIT): Extend to
|
||||||
|
16 bits.
|
||||||
|
(AF_FaceGlobalsRec): Use `FT_UShort' for `glyph_styles' field.
|
||||||
|
|
||||||
2015-08-26 Werner Lemberg <wl@gnu.org>
|
2015-08-26 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* builds/unix/configure.raw: Need harfbuzz >= 0.9.21 (#45828).
|
* builds/unix/configure.raw: Need harfbuzz >= 0.9.21 (#45828).
|
||||||
|
|
|
@ -247,8 +247,8 @@ FT_BEGIN_HEADER
|
||||||
*/
|
*/
|
||||||
typedef struct FT_Prop_GlyphToScriptMap_
|
typedef struct FT_Prop_GlyphToScriptMap_
|
||||||
{
|
{
|
||||||
FT_Face face;
|
FT_Face face;
|
||||||
FT_Byte* map;
|
FT_UShort* map;
|
||||||
|
|
||||||
} FT_Prop_GlyphToScriptMap;
|
} FT_Prop_GlyphToScriptMap;
|
||||||
|
|
||||||
|
|
|
@ -135,16 +135,15 @@
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
FT_Face face = globals->face;
|
FT_Face face = globals->face;
|
||||||
FT_CharMap old_charmap = face->charmap;
|
FT_CharMap old_charmap = face->charmap;
|
||||||
FT_Byte* gstyles = globals->glyph_styles;
|
FT_UShort* gstyles = globals->glyph_styles;
|
||||||
FT_UInt ss;
|
FT_UInt ss;
|
||||||
FT_UInt i;
|
FT_UInt i;
|
||||||
FT_UInt dflt = ~0U; /* a non-valid value */
|
FT_UInt dflt = ~0U; /* a non-valid value */
|
||||||
|
|
||||||
|
|
||||||
/* the value AF_STYLE_UNASSIGNED means `uncovered glyph' */
|
/* the value AF_STYLE_UNASSIGNED means `uncovered glyph' */
|
||||||
FT_MEM_SET( globals->glyph_styles,
|
for ( i = 0; i < (FT_UInt)globals->glyph_count; i++ )
|
||||||
AF_STYLE_UNASSIGNED,
|
gstyles[i] = AF_STYLE_UNASSIGNED;
|
||||||
globals->glyph_count );
|
|
||||||
|
|
||||||
error = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
|
error = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
|
||||||
if ( error )
|
if ( error )
|
||||||
|
@ -193,7 +192,7 @@
|
||||||
if ( gindex != 0 &&
|
if ( gindex != 0 &&
|
||||||
gindex < (FT_ULong)globals->glyph_count &&
|
gindex < (FT_ULong)globals->glyph_count &&
|
||||||
gstyles[gindex] == AF_STYLE_UNASSIGNED )
|
gstyles[gindex] == AF_STYLE_UNASSIGNED )
|
||||||
gstyles[gindex] = (FT_Byte)ss;
|
gstyles[gindex] = (FT_UShort)ss;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
@ -204,7 +203,7 @@
|
||||||
|
|
||||||
if ( gindex < (FT_ULong)globals->glyph_count &&
|
if ( gindex < (FT_ULong)globals->glyph_count &&
|
||||||
gstyles[gindex] == AF_STYLE_UNASSIGNED )
|
gstyles[gindex] == AF_STYLE_UNASSIGNED )
|
||||||
gstyles[gindex] = (FT_Byte)ss;
|
gstyles[gindex] = (FT_UShort)ss;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -314,14 +313,17 @@
|
||||||
|
|
||||||
memory = face->memory;
|
memory = face->memory;
|
||||||
|
|
||||||
|
/* we allocate an AF_FaceGlobals structure together */
|
||||||
|
/* with the glyph_styles array */
|
||||||
if ( FT_ALLOC( globals,
|
if ( FT_ALLOC( globals,
|
||||||
sizeof ( *globals ) +
|
sizeof ( *globals ) +
|
||||||
(FT_ULong)face->num_glyphs * sizeof ( FT_Byte ) ) )
|
(FT_ULong)face->num_glyphs * sizeof ( FT_UShort ) ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
globals->face = face;
|
globals->face = face;
|
||||||
globals->glyph_count = face->num_glyphs;
|
globals->glyph_count = face->num_glyphs;
|
||||||
globals->glyph_styles = (FT_Byte*)( globals + 1 );
|
/* right after the globals structure come the glyph styles */
|
||||||
|
globals->glyph_styles = (FT_UShort*)( globals + 1 );
|
||||||
globals->module = module;
|
globals->module = module;
|
||||||
|
|
||||||
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
||||||
|
|
|
@ -73,9 +73,9 @@ FT_BEGIN_HEADER
|
||||||
/* default script for OpenType; ignored if HarfBuzz isn't used */
|
/* default script for OpenType; ignored if HarfBuzz isn't used */
|
||||||
#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN
|
#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN
|
||||||
/* a bit mask indicating an uncovered glyph */
|
/* a bit mask indicating an uncovered glyph */
|
||||||
#define AF_STYLE_UNASSIGNED 0x7F
|
#define AF_STYLE_UNASSIGNED 0x7FFF
|
||||||
/* if this flag is set, we have an ASCII digit */
|
/* if this flag is set, we have an ASCII digit */
|
||||||
#define AF_DIGIT 0x80
|
#define AF_DIGIT 0x8000U
|
||||||
|
|
||||||
/* `increase-x-height' property */
|
/* `increase-x-height' property */
|
||||||
#define AF_PROP_INCREASE_X_HEIGHT_MIN 6
|
#define AF_PROP_INCREASE_X_HEIGHT_MIN 6
|
||||||
|
@ -100,7 +100,7 @@ FT_BEGIN_HEADER
|
||||||
{
|
{
|
||||||
FT_Face face;
|
FT_Face face;
|
||||||
FT_Long glyph_count; /* same as face->num_glyphs */
|
FT_Long glyph_count; /* same as face->num_glyphs */
|
||||||
FT_Byte* glyph_styles;
|
FT_UShort* glyph_styles;
|
||||||
|
|
||||||
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
||||||
hb_font_t* hb_font;
|
hb_font_t* hb_font;
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
FT_Error
|
FT_Error
|
||||||
af_get_coverage( AF_FaceGlobals globals,
|
af_get_coverage( AF_FaceGlobals globals,
|
||||||
AF_StyleClass style_class,
|
AF_StyleClass style_class,
|
||||||
FT_Byte* gstyles )
|
FT_UShort* gstyles )
|
||||||
{
|
{
|
||||||
hb_face_t* face;
|
hb_face_t* face;
|
||||||
|
|
||||||
|
@ -363,7 +363,7 @@
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
|
if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
|
||||||
gstyles[idx] = (FT_Byte)style_class->style;
|
gstyles[idx] = (FT_UShort)style_class->style;
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
else
|
else
|
||||||
FT_TRACE4(( "*" ));
|
FT_TRACE4(( "*" ));
|
||||||
|
|
|
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
|
||||||
FT_Error
|
FT_Error
|
||||||
af_get_coverage( AF_FaceGlobals globals,
|
af_get_coverage( AF_FaceGlobals globals,
|
||||||
AF_StyleClass style_class,
|
AF_StyleClass style_class,
|
||||||
FT_Byte* gstyles );
|
FT_UShort* gstyles );
|
||||||
|
|
||||||
FT_Error
|
FT_Error
|
||||||
af_get_char_index( AF_StyleMetrics metrics,
|
af_get_char_index( AF_StyleMetrics metrics,
|
||||||
|
|
Loading…
Reference in New Issue