Commit abb3fcac8578c4161606973e751beb7d3f05b2c2
2014-04-25T22:13:32
* src/autofit/hbshim.c: Partially revert commit from 2014-04-17. Using input glyph coverage data is simply wrong. Problem reported by Nikolaus Waxweiler <madigens@gmail.com> and Mantas Mikulėnas <grawity@gmail.com>.
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 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
diff --git a/ChangeLog b/ChangeLog
index 7be6820..c9f93b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-25 Werner Lemberg <wl@gnu.org>
+
+ * src/autofit/hbshim.c: Partially revert commit from 2014-04-17.
+
+ Using input glyph coverage data is simply wrong.
+
+ Problem reported by Nikolaus Waxweiler <madigens@gmail.com> and
+ Mantas Mikulėnas <grawity@gmail.com>.
+
2014-04-23 Werner Lemberg <wl@gnu.org>
* src/raster/ftraster.c (Vertical_Sweep_Span): Use drop-out mode.
diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
index 431360e..cf375a0 100644
--- a/src/autofit/hbshim.c
+++ b/src/autofit/hbshim.c
@@ -102,12 +102,10 @@
{
hb_face_t* face;
- hb_set_t* gsub_lookups; /* GSUB lookups for a given script */
- hb_set_t* gsub_glyphs_in; /* glyphs covered by GSUB lookups */
- hb_set_t* gsub_glyphs_out;
-
- hb_set_t* gpos_lookups; /* GPOS lookups for a given script */
- hb_set_t* gpos_glyphs; /* glyphs covered by GPOS lookups */
+ hb_set_t* gsub_lookups; /* GSUB lookups for a given script */
+ hb_set_t* gsub_glyphs; /* glyphs covered by GSUB lookups */
+ hb_set_t* gpos_lookups; /* GPOS lookups for a given script */
+ hb_set_t* gpos_glyphs; /* glyphs covered by GPOS lookups */
hb_script_t script;
const hb_tag_t* coverage_tags;
@@ -127,11 +125,10 @@
face = hb_font_get_face( globals->hb_font );
- gsub_lookups = hb_set_create();
- gsub_glyphs_in = hb_set_create();
- gsub_glyphs_out = hb_set_create();
- gpos_lookups = hb_set_create();
- gpos_glyphs = hb_set_create();
+ gsub_lookups = hb_set_create();
+ gsub_glyphs = hb_set_create();
+ gpos_lookups = hb_set_create();
+ gpos_glyphs = hb_set_create();
coverage_tags = coverages[style_class->coverage];
script = scripts[style_class->script];
@@ -202,9 +199,9 @@
HB_OT_TAG_GSUB,
idx,
NULL,
- gsub_glyphs_in,
NULL,
- gsub_glyphs_out );
+ NULL,
+ gsub_glyphs );
}
#ifdef FT_DEBUG_LEVEL_TRACE
@@ -292,9 +289,6 @@
}
}
- /* merge in and out glyphs */
- hb_set_union( gsub_glyphs_out, gsub_glyphs_in );
-
/*
* Various OpenType features might use the same glyphs at different
* vertical positions; for example, superscript and subscript glyphs
@@ -343,14 +337,14 @@
*
*/
if ( style_class->coverage != AF_COVERAGE_DEFAULT )
- hb_set_subtract( gsub_glyphs_out, gpos_glyphs );
+ hb_set_subtract( gsub_glyphs, gpos_glyphs );
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE4(( " glyphs without GPOS data (`*' means already assigned)" ));
count = 0;
#endif
- for ( idx = -1; hb_set_next( gsub_glyphs_out, &idx ); )
+ for ( idx = -1; hb_set_next( gsub_glyphs, &idx ); )
{
#ifdef FT_DEBUG_LEVEL_TRACE
if ( !( count % 10 ) )
@@ -382,11 +376,10 @@
#endif
Exit:
- hb_set_destroy( gsub_lookups );
- hb_set_destroy( gsub_glyphs_in );
- hb_set_destroy( gsub_glyphs_out );
- hb_set_destroy( gpos_lookups );
- hb_set_destroy( gpos_glyphs );
+ hb_set_destroy( gsub_lookups );
+ hb_set_destroy( gsub_glyphs );
+ hb_set_destroy( gpos_lookups );
+ hb_set_destroy( gpos_glyphs );
return FT_Err_Ok;
}