Commit 40103a3af089857e553f39c3b9ce61a9ee38dd59
2015-08-31T08:51:52
[autofit] Code clean-up. * src/autofit/afglobal.h (AF_STYLE_MASK): New macro. (AF_STYLE_UNASSIGNED): Use AF_STYLE_MASK for definition. * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): Updated.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
diff --git a/ChangeLog b/ChangeLog
index 5d27489..84ae8fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2015-08-30 Werner Lemberg <wl@gnu.org>
+ [autofit] Code clean-up.
+
+ * src/autofit/afglobal.h (AF_STYLE_MASK): New macro.
+ (AF_STYLE_UNASSIGNED): Use AF_STYLE_MASK for definition.
+
+ * src/autofit/afglobal.c (af_face_globals_compute_style_coverage):
+ Updated.
+
+2015-08-30 Werner Lemberg <wl@gnu.org>
+
[autofit] Make glyph style array use 16bit values.
* include/freetype/ftautoh.h (FT_Prop_GlyphToScriptMap): Use
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index d908370..cd0e2ab 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -249,9 +249,9 @@
for ( nn = 0; nn < globals->glyph_count; nn++ )
{
- if ( ( gstyles[nn] & ~AF_DIGIT ) == AF_STYLE_UNASSIGNED )
+ if ( ( gstyles[nn] & AF_STYLE_MASK ) == AF_STYLE_UNASSIGNED )
{
- gstyles[nn] &= ~AF_STYLE_UNASSIGNED;
+ gstyles[nn] &= ~AF_STYLE_MASK;
gstyles[nn] |= globals->module->fallback_style;
}
}
@@ -275,7 +275,7 @@
for ( idx = 0; idx < globals->glyph_count; idx++ )
{
- if ( ( gstyles[idx] & ~AF_DIGIT ) == style_class->style )
+ if ( ( gstyles[idx] & AF_STYLE_MASK ) == style_class->style )
{
if ( !( count % 10 ) )
FT_TRACE4(( " " ));
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index 6cacd69..284f6a0 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -72,8 +72,12 @@ FT_BEGIN_HEADER
#endif
/* default script for OpenType; ignored if HarfBuzz isn't used */
#define AF_SCRIPT_DEFAULT AF_SCRIPT_LATN
- /* a bit mask indicating an uncovered glyph */
-#define AF_STYLE_UNASSIGNED 0x7FFF
+
+ /* a bit mask for TA_DIGIT */
+#define AF_STYLE_MASK 0x7FFF
+ /* an uncovered glyph */
+#define AF_STYLE_UNASSIGNED AF_STYLE_MASK
+
/* if this flag is set, we have an ASCII digit */
#define AF_DIGIT 0x8000U