ref: 35bfc0f1b9fba03acefcfce79d2417428c0e4582
parent: 674ba91f1234b92a9932da7b62e36f61fea01e94
author: Wu, Chia-I (吳佳一) <[email protected]>
date: Wed Nov 16 20:53:07 EST 2005
* 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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-11-17 Chia-I Wu <[email protected]>
+
+ * 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 <[email protected]>
* src/base/fttrigon.c (ft_trig_prenorm): Fix a bug that created
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -57,9 +57,12 @@
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)
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -44,7 +44,7 @@
/* <Note> */
/* This function is not very fast. */
/* */
- FT_EXPORT( FT_Int32 )
+ FT_BASE( FT_Int32 )
FT_SqrtFixed( FT_Int32 x );
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -113,7 +113,7 @@
/* 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 @@
/* 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 @@
#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 */
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -716,7 +716,7 @@
/* <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 @@
/* <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 */
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -328,7 +328,7 @@
#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 );
--- 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;
--- 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,7 +224,7 @@
}
- FT_EXPORT_DEF( FT_Int )
+ FT_BASE_DEF( FT_Int )
FT_Trace_Get_Count( void )
{return 0;
@@ -231,7 +231,7 @@
}
- FT_EXPORT_DEF( const char * )
+ FT_BASE_DEF( const char * )
FT_Trace_Get_Name( FT_Int idx )
{FT_UNUSED( idx );
--- 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