Commit fd70512eee757d59bbf46377151081b8d054746e
2015-08-06T21:49:08
[type42] Parse FontMatrix according to specifications. * src/type42/t42parse.c (t42_parse_font_matrix): Type 42 FontMatrix does not need scaling by 1000. Units_per_EM are taken from the embedded TrueType.
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
diff --git a/ChangeLog b/ChangeLog
index de55ffa..50e2676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-06 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [type42] Parse FontMatrix according to specifications.
+
+ * src/type42/t42parse.c (t42_parse_font_matrix): Type 42 FontMatrix
+ does not need scaling by 1000. Units_per_EM are taken from the
+ embedded TrueType.
+
2015-08-06 Werner Lemberg <wl@gnu.org>
[autofit] Improve Arabic hinting.
diff --git a/src/type42/t42parse.c b/src/type42/t42parse.c
index 109e996..66107f3 100644
--- a/src/type42/t42parse.c
+++ b/src/type42/t42parse.c
@@ -252,7 +252,7 @@
FT_Int result;
- result = T1_ToFixedArray( parser, 6, temp, 3 );
+ result = T1_ToFixedArray( parser, 6, temp, 0 );
if ( result < 6 )
{
@@ -264,17 +264,11 @@
if ( temp_scale == 0 )
{
- FT_ERROR(( "t1_parse_font_matrix: invalid font matrix\n" ));
+ FT_ERROR(( "t42_parse_font_matrix: invalid font matrix\n" ));
parser->root.error = FT_THROW( Invalid_File_Format );
return;
}
- /* Set Units per EM based on FontMatrix values. We set the value to */
- /* 1000 / temp_scale, because temp_scale was already multiplied by */
- /* 1000 (in t1_tofixed, from psobjs.c). */
-
- root->units_per_EM = (FT_UShort)FT_DivFix( 1000, temp_scale );
-
/* we need to scale the values by 1.0/temp_scale */
if ( temp_scale != 0x10000L )
{