Commit 35bfc0f1b9fba03acefcfce79d2417428c0e4582
2005-11-17T01:53:07
* src/base/ftcalc.c (FT_MulTo64): Commented out. * include/freetype/internal/ftcalc.h (FT_SqrtFixed), src/base/ftcalc.c (FT_SqrtFixed), include/freetype/internal/ftdebug.h (FT_Trace_Get_Count, FT_Trace_Get_Name, FT_Message, FT_Panic), src/base/ftdebug.c (FT_Trace_Get_Count, FT_Trace_Get_Name, FT_Message, FT_Panic), include/freetype/internal/ftobjs.h (FT_New_Memory, FT_Done_Memory), include/freetype/internal/ftstream.h (FT_Stream_Open), src/base/ftsystem.c (FT_New_Memory, FT_Done_Memory, FT_Stream_Open): s/FT_EXPORT/FT_BASE/. * builds/exports.mk: Manually add TT_New_Context to EXPORTS_LIST too.
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 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
diff --git a/ChangeLog b/ChangeLog
index 42abd1d..b8186c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-11-17 Chia-I Wu <b90201047@ntu.edu.tw>
+
+ * src/base/ftcalc.c (FT_MulTo64): Commented out.
+
+ * include/freetype/internal/ftcalc.h (FT_SqrtFixed), src/base/ftcalc.c
+ (FT_SqrtFixed), include/freetype/internal/ftdebug.h
+ (FT_Trace_Get_Count, FT_Trace_Get_Name, FT_Message, FT_Panic),
+ src/base/ftdebug.c (FT_Trace_Get_Count, FT_Trace_Get_Name, FT_Message,
+ FT_Panic), include/freetype/internal/ftobjs.h (FT_New_Memory,
+ FT_Done_Memory), include/freetype/internal/ftstream.h
+ (FT_Stream_Open), src/base/ftsystem.c (FT_New_Memory, FT_Done_Memory,
+ FT_Stream_Open): s/FT_EXPORT/FT_BASE/.
+
+ * builds/exports.mk: Manually add TT_New_Context to EXPORTS_LIST too.
+
2005-11-15 David Turner <david@freetype.org>
* src/base/fttrigon.c (ft_trig_prenorm): Fix a bug that created
diff --git a/builds/exports.mk b/builds/exports.mk
index 31b954f..76b28c5 100644
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -57,9 +57,12 @@ ifneq ($(EXPORTS_LIST),)
symbols_list: $(EXPORTS_LIST)
- # We manually add TT_RunIns to the API which is needed by TT debuggers.
+ # We manually add TT_New_Context and TT_RunIns, which are needed by TT
+ # debuggers, to the EXPORTS_LIST.
+ #
$(EXPORTS_LIST): $(APINAMES_EXE) $(PUBLIC_HEADERS)
$(subst /,$(SEP),$(APINAMES_EXE)) -o$@ $(APINAMES_OPTIONS) $(PUBLIC_HEADERS)
+ @echo TT_New_Context >> $(EXPORTS_LIST)
@echo TT_RunIns >> $(EXPORTS_LIST)
$(PROJECT_LIBRARY): $(EXPORTS_LIST)
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index c89baa3..7cfd9a3 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -44,7 +44,7 @@ FT_BEGIN_HEADER
/* <Note> */
/* This function is not very fast. */
/* */
- FT_EXPORT( FT_Int32 )
+ FT_BASE( FT_Int32 )
FT_SqrtFixed( FT_Int32 x );
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index ce142c5..dc569d8 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -113,7 +113,7 @@ FT_BEGIN_HEADER
/* This function may be useful if you want to access elements of */
/* the internal `ft_trace_levels' array by an index. */
/* */
- FT_EXPORT( FT_Int )
+ FT_BASE( FT_Int )
FT_Trace_Get_Count( void );
@@ -140,7 +140,7 @@ FT_BEGIN_HEADER
/* This function may be useful if you want to control FreeType 2's */
/* debug level in your appliaciton. */
/* */
- FT_EXPORT( const char * )
+ FT_BASE( const char * )
FT_Trace_Get_Name( FT_Int idx );
@@ -213,11 +213,11 @@ FT_BEGIN_HEADER
#include "stdio.h" /* for vprintf() */
/* print a message */
- FT_EXPORT( void )
+ FT_BASE( void )
FT_Message( const char* fmt, ... );
/* print a message and exit */
- FT_EXPORT( void )
+ FT_BASE( void )
FT_Panic( const char* fmt, ... );
#endif /* FT_DEBUG_LEVEL_ERROR */
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 317c2f0..ca5196a 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -716,7 +716,7 @@ FT_BEGIN_HEADER
/* <Return> */
/* A pointer to the new memory object. 0 in case of error. */
/* */
- FT_EXPORT( FT_Memory )
+ FT_BASE( FT_Memory )
FT_New_Memory( void );
@@ -731,7 +731,7 @@ FT_BEGIN_HEADER
/* <Input> */
/* memory :: A handle to the memory manager. */
/* */
- FT_EXPORT( void )
+ FT_BASE( void )
FT_Done_Memory( FT_Memory memory );
#endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */
diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h
index 1fa9db4..c5a391e 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -328,7 +328,7 @@ FT_BEGIN_HEADER
#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
/* initialize a stream for reading a regular system stream */
- FT_EXPORT( FT_Error )
+ FT_BASE( FT_Error )
FT_Stream_Open( FT_Stream stream,
const char* filepathname );
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 4633945..36064cd 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -505,6 +505,8 @@
}
+#if 0
+
/* documentation is in ftcalc.h */
FT_EXPORT_DEF( void )
@@ -528,8 +530,6 @@
}
-#if 0
-
/* apparently, the second version of this code is not compiled correctly */
/* on Mac machines with the MPW C compiler.. tsk, tsk, tsk... */
@@ -631,7 +631,7 @@
/* documentation is in ftcalc.h */
- FT_EXPORT_DEF( FT_Int32 )
+ FT_BASE_DEF( FT_Int32 )
FT_SqrtFixed( FT_Int32 x )
{
FT_UInt32 root, rem_hi, rem_lo, test_div;
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index 160f20b..c55d3c8 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -50,7 +50,7 @@
/* documentation is in ftdebug.h */
- FT_EXPORT_DEF( void )
+ FT_BASE_DEF( void )
FT_Message( const char* fmt, ... )
{
va_list ap;
@@ -64,7 +64,7 @@
/* documentation is in ftdebug.h */
- FT_EXPORT_DEF( void )
+ FT_BASE_DEF( void )
FT_Panic( const char* fmt, ... )
{
va_list ap;
@@ -101,7 +101,7 @@
/* documentation is in ftdebug.h */
- FT_EXPORT_DEF( FT_Int )
+ FT_BASE_DEF( FT_Int )
FT_Trace_Get_Count( void )
{
return trace_count;
@@ -110,7 +110,7 @@
/* documentation is in ftdebug.h */
- FT_EXPORT_DEF( const char * )
+ FT_BASE_DEF( const char * )
FT_Trace_Get_Name( FT_Int idx )
{
int max = FT_Trace_Get_Count();
@@ -224,14 +224,14 @@
}
- FT_EXPORT_DEF( FT_Int )
+ FT_BASE_DEF( FT_Int )
FT_Trace_Get_Count( void )
{
return 0;
}
- FT_EXPORT_DEF( const char * )
+ FT_BASE_DEF( const char * )
FT_Trace_Get_Name( FT_Int idx )
{
FT_UNUSED( idx );
diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c
index 2365de2..b703323 100644
--- a/src/base/ftsystem.c
+++ b/src/base/ftsystem.c
@@ -215,7 +215,7 @@
/* documentation is in ftobjs.h */
- FT_EXPORT_DEF( FT_Error )
+ FT_BASE_DEF( FT_Error )
FT_Stream_Open( FT_Stream stream,
const char* filepathname )
{
@@ -266,7 +266,7 @@
/* documentation is in ftobjs.h */
- FT_EXPORT_DEF( FT_Memory )
+ FT_BASE_DEF( FT_Memory )
FT_New_Memory( void )
{
FT_Memory memory;
@@ -290,7 +290,7 @@
/* documentation is in ftobjs.h */
- FT_EXPORT_DEF( void )
+ FT_BASE_DEF( void )
FT_Done_Memory( FT_Memory memory )
{
#ifdef FT_DEBUG_MEMORY