From 9d76a8d67a33559b88b4a145276023995980ffc8 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 6 Mar 2000 09:51:19 +0000 Subject: [PATCH] a few fixes to get rid of unwanted compile-time warnings --- src/type1/t1tokens.c | 3 ++- src/type1/t1tokens.h | 4 ++-- src/type1z/t1gload.c | 2 +- src/type1z/t1gload.h | 53 +------------------------------------------- src/type1z/t1parse.h | 4 ++-- 5 files changed, 8 insertions(+), 58 deletions(-) diff --git a/src/type1/t1tokens.c b/src/type1/t1tokens.c index 7069d691d..92a16d7e1 100644 --- a/src/type1/t1tokens.c +++ b/src/type1/t1tokens.c @@ -946,6 +946,7 @@ } +#if 0 /*************************************************************************/ /* */ /* Read_CharStrings */ @@ -991,4 +992,4 @@ if ( grow(tokenizer) ) return tokenizer->error; } } - +#endif diff --git a/src/type1/t1tokens.h b/src/type1/t1tokens.h index d83148bd6..364b0d2c1 100644 --- a/src/type1/t1tokens.h +++ b/src/type1/t1tokens.h @@ -303,7 +303,7 @@ T1_Error Read_Token( T1_Tokenizer tokenizer ); - +#if 0 /*************************************************************************/ /* */ /* Read_CharStrings */ @@ -330,7 +330,7 @@ T1_Error Read_CharStrings( T1_Tokenizer tokenizer, T1_Int num_chars, T1_Byte* buffer ); - +#endif /*************************************************************************/ /* */ diff --git a/src/type1z/t1gload.c b/src/type1z/t1gload.c index 476b6183f..54abf7d51 100644 --- a/src/type1z/t1gload.c +++ b/src/type1z/t1gload.c @@ -546,7 +546,7 @@ #define USE_ARGS(n) top -= n; if (top < decoder->stack) goto Stack_Underflow - EXPORT_FUNC + LOCAL_FUNC T1_Error T1_Parse_CharStrings( T1_Decoder* decoder, T1_Byte* charstring_base, T1_Int charstring_len, diff --git a/src/type1z/t1gload.h b/src/type1z/t1gload.h index d880c8ad0..0bf082f98 100644 --- a/src/type1z/t1gload.h +++ b/src/type1z/t1gload.h @@ -163,7 +163,7 @@ /* This function is exported, because it is used by the T1Dump utility */ - EXPORT_DEF + LOCAL_DEF T1_Error T1_Parse_CharStrings( T1_Decoder* decoder, T1_Byte* charstring_base, T1_Int charstring_len, @@ -173,57 +173,6 @@ -/*************************************************************************/ -/* */ -/* T1_Add_Points */ -/* */ -/* */ -/* Checks that there is enough room in the current load glyph outline */ -/* to accept "num_points" additional outline points. If not, this */ -/* function grows the load outline's arrays accordingly.. */ -/* */ -/* */ -/* builder :: pointer to glyph builder object */ -/* num_points :: number of points that will be added later */ -/* */ -/* */ -/* Type1 error code. 0 means success */ -/* */ -/* */ -/* This function does NOT update the points count in the glyph loader */ -/* This must be done by the caller itself, after this function is */ -/* invoked.. */ -/* */ - LOCAL_DEF - T1_Error T1_Add_Points( T1_Builder* builder, - T1_Int num_points ); - -/*************************************************************************/ -/* */ -/* T1_Add_Contours */ -/* */ -/* */ -/* Checks that there is enough room in the current load glyph outline */ -/* to accept "num_contours" additional contours. If not, this func */ -/* the load outline's arrays accordingly.. */ -/* */ -/* */ -/* builder :: pointer to glyph builder object */ -/* num_contours :: number of contours that will be added later */ -/* */ -/* */ -/* Type1 error code. 0 means success */ -/* */ -/* */ -/* This function does NOT update the contours count in the load glyph */ -/* This must be done by the caller itself, after this function is */ -/* invoked.. */ -/* */ - LOCAL_DEF - T1_Error T1_Add_Contours( T1_Builder* builder, - T1_Int num_contours ); - - LOCAL_DEF T1_Error T1_Load_Glyph( T1_GlyphSlot glyph, T1_Size size, diff --git a/src/type1z/t1parse.h b/src/type1z/t1parse.h index a34b079e3..7a6644c37 100644 --- a/src/type1z/t1parse.h +++ b/src/type1z/t1parse.h @@ -177,10 +177,10 @@ LOCAL_DEF T1_Bool T1_ToBool( T1_Parser* parser ); - +#if 0 LOCAL_DEF T1_Int T1_ToImmediate( T1_Parser* parser ); - +#endif LOCAL_DEF T1_Error T1_New_Parser( T1_Parser* parser,