some minor changes to allow compilation in all modes, without warnings
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
diff --git a/ChangeLog b/ChangeLog
index a5ae35a..1743041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2001-01-11 Matthew Crosby <mcrosby@marthon.org>
+ * src/pcd/pcfread.c: removed some compilation warnings related
+ to comparison of signed vs. unsigned integers
+
+ * include/freetype/internal/ftdebug.h: changed the debug trace
+ constants from trace_t2xxxx to trace_cffxxxx to be able to compile
+ the CFF driver in debug mode
+
+2001-01-11 Matthew Crosby <mcrosby@marthon.org>
+
* builds/unix/freetype-config.in: Fix problems with separate
--prefix and --exec-prefix.
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index d42e7f0..db905ed 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -82,11 +82,11 @@ FT_BEGIN_HEADER
trace_psobjs,
/* Type 2 driver components */
- trace_t2driver,
- trace_t2gload,
- trace_t2load,
- trace_t2objs,
- trace_t2parse,
+ trace_cffdriver,
+ trace_cffgload,
+ trace_cffload,
+ trace_cffobjs,
+ trace_cffparse,
/* CID driver components */
trace_cidafm,
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index c6b4970..0d5dec4 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -117,8 +117,8 @@ THE SOFTWARE.
#if defined( FT_DEBUG_LEVEL_TRACE )
{
- int i,j;
- char* name;
+ unsigned int i,j;
+ char* name = "?";
FT_TRACE4(( "Tables count: %ld\n", face->toc.count ));
@@ -126,7 +126,7 @@ THE SOFTWARE.
for ( i = 0; i < toc->count; i++ )
{
for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ )
- if ( tables[i].type == ( 1 << j ) )
+ if ( tables[i].type == (unsigned int)( 1 << j ) )
name=tableNames[j];
FT_TRACE4(( "Table %d: type=%-6s format=0x%04lX "
"size=0x%06lX (%8ld) offset=0x%04lX\n",