ref: 752f39127b80368a60b1b84f8901694502340560
parent: 8b281f83e8516535756f92dbf90940ac44bd45e1
author: Werner Lemberg <[email protected]>
date: Thu Jan 23 04:14:25 EST 2014
Fix Savannah bug #41310. * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) <glyph_format==5>: Don't check metrics, which this format doesn't have. This is another correction to the commit from 2013-11-21.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2014-01-23 Werner Lemberg <[email protected]>
+ Fix Savannah bug #41310.
+
+ * src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) <glyph_format==5>:
+ Don't check metrics, which this format doesn't have.
+ This is another correction to the commit from 2013-11-21.
+
+2014-01-23 Werner Lemberg <[email protected]>
+
Fix Savannah bug #41309.
* src/type1/t1load.c (t1_parse_font_matrix): Properly handle result
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
-/* Copyright 2005-2009, 2013 by */
+/* Copyright 2005-2009, 2013, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* Copyright 2013 by Google, Inc. */
@@ -967,7 +967,6 @@
break;
case 2:
- case 5:
case 7:
{/* Don't trust `glyph_format'. For example, Apple's main Korean */
@@ -995,6 +994,10 @@
else
loader = tt_sbit_decoder_load_bit_aligned;
}
+ break;
+
+ case 5:
+ loader = tt_sbit_decoder_load_bit_aligned;
break;
case 8: