Commit 9d76a8d67a33559b88b4a145276023995980ffc8
2000-03-06T09:51:19
a few fixes to get rid of unwanted compile-time 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 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141
diff --git a/src/type1/t1tokens.c b/src/type1/t1tokens.c
index 7069d69..92a16d7 100644
--- a/src/type1/t1tokens.c
+++ b/src/type1/t1tokens.c
@@ -946,6 +946,7 @@
}
+#if 0
/*************************************************************************/
/* */
/* <Function> 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 d83148b..364b0d2 100644
--- a/src/type1/t1tokens.h
+++ b/src/type1/t1tokens.h
@@ -303,7 +303,7 @@
T1_Error Read_Token( T1_Tokenizer tokenizer );
-
+#if 0
/*************************************************************************/
/* */
/* <Function> 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 476b618..54abf7d 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 d880c8a..0bf082f 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 @@
-/*************************************************************************/
-/* */
-/* <Function> T1_Add_Points */
-/* */
-/* <Description> */
-/* 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.. */
-/* */
-/* <Input> */
-/* builder :: pointer to glyph builder object */
-/* num_points :: number of points that will be added later */
-/* */
-/* <Return> */
-/* Type1 error code. 0 means success */
-/* */
-/* <Note> */
-/* 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 );
-
-/*************************************************************************/
-/* */
-/* <Function> T1_Add_Contours */
-/* */
-/* <Description> */
-/* 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.. */
-/* */
-/* <Input> */
-/* builder :: pointer to glyph builder object */
-/* num_contours :: number of contours that will be added later */
-/* */
-/* <Return> */
-/* Type1 error code. 0 means success */
-/* */
-/* <Note> */
-/* 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 a34b079..7a6644c 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,