Commit 33db39e2923516e52975a13ccfd0cd129d3507ab
2007-06-08T06:30:29
* src/sfnt/sfobjs.c (sfnt_load_face): Undo change from 2007-04-28. Fonts without a cmap must be handled correctly by FreeType (anything else would be a bug). * src/psaux/t1decode.c (t1_decoder_parse_charstrings) [FT_DEBUG_LEVEL_TRACE]: Improve tracing message.
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
diff --git a/ChangeLog b/ChangeLog
index 911ebc8..38d2b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-08 Werner Lemberg <wl@gnu.org>
+
+ * src/sfnt/sfobjs.c (sfnt_load_face): Undo change from 2007-04-28.
+ Fonts without a cmap must be handled correctly by FreeType (anything
+ else would be a bug).
+
+
+ * src/psaux/t1decode.c (t1_decoder_parse_charstrings)
+ [FT_DEBUG_LEVEL_TRACE]: Improve tracing message.
+
2007-06-07 Werner Lemberg <wl@gnu.org>
* src/sfnt/ttsbit0.c (tt_sbit_decoder_init,
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 4373d6f..f790643 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -4,7 +4,7 @@
/* */
/* PostScript Type 1 decoding routines (body). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
+/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -951,8 +951,9 @@
default:
if ( top - decoder->stack != num_args )
- FT_TRACE0(( "\nMore operands on the stack than expected "
- "(have %d, expected %d)\n",
+ FT_TRACE0(( "t1_decoder_parse_charstrings: "
+ "too much operands on the stack "
+ "(seen %d, expected %d)\n",
top - decoder->stack, num_args ));
break;
}
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 3d12996..cc90110 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -575,10 +575,7 @@
/* the following tables are often not present in embedded TrueType */
/* fonts within PDF documents, so don't check for them. */
LOAD_( maxp );
-
LOAD_( cmap );
- if ( error )
- goto Exit;
/* the following tables are optional in PCL fonts -- */
/* don't check for errors */