Commit cb7a5122e15d3013bd51cfedc8e5d723b6e2e33c
2015-09-19T07:58:03
[pcf] Improve `FT_ABS' fix from 2015-09-17 (#45999). * src/pcf/pcfread.c (pcf_load_font): Do first the cast to FT_Short, then take the absolute value. Also apply FT_ABS to `height'.
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
diff --git a/ChangeLog b/ChangeLog
index 511c8cc..6d41da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-19 Werner Lemberg <wl@gnu.org>
+
+ [pcf] Improve `FT_ABS' fix from 2015-09-17 (#45999).
+
+ * src/pcf/pcfread.c (pcf_load_font): Do first the cast to FT_Short,
+ then take the absolute value.
+ Also apply FT_ABS to `height'.
+
2015-09-17 Werner Lemberg <wl@gnu.org>
[type42] Fix memory leak (#45989).
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 9d8d794..afa1480 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1272,13 +1272,18 @@ THE SOFTWARE.
FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
+ /* for simplicity, we take absolute values of integer properties */
+
#if 0
bsize->height = face->accel.maxbounds.ascent << 6;
#endif
- bsize->height = (FT_Short)( face->accel.fontAscent +
- face->accel.fontDescent );
- /* for simplicity, we take absolute values of integer properties */
+#ifdef FT_DEBUG_LEVEL_TRACE
+ if ( face->accel.fontAscent + face->accel.fontDescent < 0 )
+ FT_TRACE0(( "pcf_load_font: negative height\n" ));
+#endif
+ bsize->height = FT_ABS( (FT_Short)( face->accel.fontAscent +
+ face->accel.fontDescent ) );
prop = pcf_find_property( face, "AVERAGE_WIDTH" );
if ( prop )
@@ -1287,7 +1292,7 @@ THE SOFTWARE.
if ( prop->value.l < 0 )
FT_TRACE0(( "pcf_load_font: negative average width\n" ));
#endif
- bsize->width = (FT_Short)( ( FT_ABS( prop->value.l ) + 5 ) / 10 );
+ bsize->width = FT_ABS( (FT_Short)( ( prop->value.l ) + 5 ) / 10 );
}
else
bsize->width = (FT_Short)FT_MulDiv( bsize->height, 2, 3 );
@@ -1312,7 +1317,7 @@ THE SOFTWARE.
if ( prop->value.l < 0 )
FT_TRACE0(( "pcf_load_font: negative pixel size\n" ));
#endif
- bsize->y_ppem = (FT_Short)FT_ABS( prop->value.l ) << 6;
+ bsize->y_ppem = FT_ABS( (FT_Short)prop->value.l ) << 6;
}
prop = pcf_find_property( face, "RESOLUTION_X" );
@@ -1322,7 +1327,7 @@ THE SOFTWARE.
if ( prop->value.l < 0 )
FT_TRACE0(( "pcf_load_font: negative X resolution\n" ));
#endif
- resolution_x = (FT_Short)FT_ABS( prop->value.l );
+ resolution_x = FT_ABS( (FT_Short)prop->value.l );
}
prop = pcf_find_property( face, "RESOLUTION_Y" );
@@ -1332,7 +1337,7 @@ THE SOFTWARE.
if ( prop->value.l < 0 )
FT_TRACE0(( "pcf_load_font: negative Y resolution\n" ));
#endif
- resolution_y = (FT_Short)FT_ABS( prop->value.l );
+ resolution_y = FT_ABS( (FT_Short)prop->value.l );
}
if ( bsize->y_ppem == 0 )