From e95365b291d13000e84b8e81671bea7e762ea557 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 24 Apr 2004 14:43:37 +0000 Subject: [PATCH] * include/freetype/ftcache.h (FT_Get_CharMap_Index): Rename declaration and move to... * include/freetype/freetype.h (FT_Get_Charmap_Index): Here. (FREETYPE_PATCH): Set to 9. * src/base/ftobjs.c (FT_Get_Charmap_Index): New function. * builds/unix/configure.ac (version_info): Set to 9:7:3. * builds/unix/configure: Updated. * builds/win32/visualc/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj: s/218/219/. * builds/freetype.mk (refdoc), README, Jamfile (RefDoc): s/2.1.8/2.1.9/. * docs/CHANGES, docs/VERSION.DLL: Updated. --- ChangeLog | 28 +++++++++++++++++++++++++++- Jamfile | 2 +- README | 8 ++++---- builds/freetype.mk | 2 +- builds/unix/configure | 2 +- builds/unix/configure.ac | 2 +- builds/win32/visualc/freetype.dsp | 12 ++++++------ builds/win32/visualc/freetype.vcproj | 12 ++++++------ builds/win32/visualc/index.html | 8 ++++---- docs/CHANGES | 12 ++++++++++++ docs/VERSION.DLL | 1 + include/freetype/freetype.h | 22 +++++++++++++++++++++- include/freetype/ftcache.h | 19 ++++++++++--------- src/base/ftobjs.c | 18 ++++++++++++++++++ src/cache/ftcbasic.c | 8 +++++++- src/cache/ftccmap.c | 4 ++-- src/cache/ftcmanag.c | 6 +++++- 17 files changed, 127 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3907b9c24..2d7dd5dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,36 @@ -2004-02-21 Werner Lemberg +2004-04-23 Werner Lemberg + + * include/freetype/ftcache.h (FT_Get_CharMap_Index): Rename + declaration and move to... + * include/freetype/freetype.h (FT_Get_Charmap_Index): Here. + (FREETYPE_PATCH): Set to 9. + + * src/base/ftobjs.c (FT_Get_Charmap_Index): New function. + + * builds/unix/configure.ac (version_info): Set to 9:7:3. + * builds/unix/configure: Updated. + + * builds/win32/visualc/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj: s/218/219/. + + * builds/freetype.mk (refdoc), README, Jamfile (RefDoc): + s/2.1.8/2.1.9/. + + * docs/CHANGES, docs/VERSION.DLL: Updated. + +2004-04-21 Werner Lemberg * src/cff/cffparse.c (cff_parser_run), src/psaux/psobjs.c (ps_parser_load_field): Use FT_CHAR_BIT. 2004-04-21 David Turner + + * Version 2.1.8 released. + ========================= + + * src/cff/cffobjs.c (cff_face_init): Fix a small memory leak. * src/autofit/afloader.c (af_loader_load_g), src/autofit/afmodule.c diff --git a/Jamfile b/Jamfile index c4e98a909..54fe154e8 100644 --- a/Jamfile +++ b/Jamfile @@ -148,7 +148,7 @@ if $(DEBUG_HINTER) actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.8 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.1.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h } RefDoc refdoc ; diff --git a/README b/README index 72baf3d6a..064a3c777 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.1.8 + FreeType 2.1.9 ============== Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION. @@ -19,9 +19,9 @@ Note that the FreeType 2 documentation is now available as a separate package from our sites. See: - ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.8.tar.bz2 - ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.8.tar.gz - ftp://ftp.freetype.org/pub/freetype2/ftdoc218.zip + ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.9.tar.bz2 + ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.9.tar.gz + ftp://ftp.freetype.org/pub/freetype2/ftdoc219.zip Bugs diff --git a/builds/freetype.mk b/builds/freetype.mk index 29fa344d5..00325d6fc 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -254,7 +254,7 @@ library: $(PROJECT_LIBRARY) refdoc: python $(SRC_DIR)/tools/docmaker/docmaker.py \ --prefix=ft2 \ - --title=FreeType-2.1.8 \ + --title=FreeType-2.1.9 \ --output=$(DOC_DIR) \ $(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/config/*.h \ diff --git a/builds/unix/configure b/builds/unix/configure index 35bd6d20d..d08ac9d6a 100644 --- a/builds/unix/configure +++ b/builds/unix/configure @@ -1720,7 +1720,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='9:6:3' +version_info='9:7:3' ft_version=`echo $version_info | tr : .` diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac index 1cddcaccd..71a04ce90 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='9:6:3' +version_info='9:7:3' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index bb353dec0..5e88deb38 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -103,7 +103,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218MT_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -127,7 +127,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"lib\freetype200b8.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218MT.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -152,7 +152,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype218ST.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype219ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -178,7 +178,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218ST_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype219ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index fefe7c7d0..4967e582a 100644 --- a/builds/win32/visualc/freetype.vcproj +++ b/builds/win32/visualc/freetype.vcproj @@ -41,7 +41,7 @@ Name="VCCustomBuildTool"/> @@ -94,7 +94,7 @@ Name="VCCustomBuildTool"/> @@ -147,7 +147,7 @@ Name="VCCustomBuildTool"/> + OutputFile="..\..\..\objs\freetype219ST.lib"/> @@ -248,7 +248,7 @@ Name="VCCustomBuildTool"/> @@ -299,7 +299,7 @@ Name="VCCustomBuildTool"/> diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html index 657460ac0..10e4cfcbd 100644 --- a/builds/win32/visualc/index.html +++ b/builds/win32/visualc/index.html @@ -16,10 +16,10 @@ will compile the following libraries from the FreeType 2.1.8 sources:

    -    freetype218.lib     - release build; single threaded
-    freetype218_D.lib   - debug build;   single threaded
-    freetype218MT.lib   - release build; multi-threaded
-    freetype218MT_D.lib - debug build;   multi-threaded
    + freetype219.lib - release build; single threaded + freetype219_D.lib - debug build; single threaded + freetype219MT.lib - release build; multi-threaded + freetype219MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index 2bb57b559..6daf3284e 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,16 @@ +LATEST CHANGES BETWEEN 2.1.9 and 2.1.8 + + I. IMPORTANT BUG FIXES + + - The function `FT_Get_CharMap_Index' was only declared, without + any real code. For consistency, it has been renamed to + `FT_Get_Charmap_Index'. (This function is needed to implement + cmap caches.) + + +====================================================================== + LATEST CHANGES BETWEEN 2.1.8 and 2.1.7 I. IMPORTANT BUG FIXES diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 5b178bdc4..9e27a57d2 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -52,6 +52,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.1.9 9.7.3 6.3.7 2.1.8 9.6.3 6.3.6 2.1.7 9.5.3 6.3.5 2.1.6 9.5.3 6.3.5 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 6acf16611..72870052b 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -44,7 +44,7 @@ /* */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 1 -#define FREETYPE_PATCH 8 +#define FREETYPE_PATCH 9 #include @@ -172,6 +172,7 @@ FT_BEGIN_HEADER /* FT_CharMapRec */ /* FT_Select_Charmap */ /* FT_Set_Charmap */ + /* FT_Get_Charmap_Index */ /* */ /*************************************************************************/ @@ -2672,6 +2673,25 @@ FT_BEGIN_HEADER FT_CharMap charmap ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Get_Charmap_Index */ + /* */ + /* @description: */ + /* Retrieve index of a given charmap. */ + /* */ + /* @input: */ + /* charmap :: A handle to a charmap. */ + /* */ + /* @return: */ + /* The index into the array of character maps within the face to */ + /* which `charmap' belongs. */ + /* */ + FT_EXPORT( FT_Int ) + FT_Get_Charmap_Index( FT_CharMap charmap ); + + /*************************************************************************/ /* */ /* */ diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index c6dc14aec..c26ce6b1b 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -55,7 +55,7 @@ FT_BEGIN_HEADER /* */ /* */ /* This section describes the FreeType 2 cache sub-system which is */ - /* stile in beta. */ + /* still in beta. */ /* */ /* */ /* FTC_Manager */ @@ -63,11 +63,13 @@ FT_BEGIN_HEADER /* FTC_Face_Requester */ /* */ /* FTC_Manager_New */ + /* FTC_Manager_Reset */ + /* FTC_Manager_Done */ /* FTC_Manager_LookupFace */ /* FTC_Manager_LookupSize */ + /* FTC_Manager_RemoveFaceID */ /* */ /* FTC_Node */ - /* FTC_Node_Ref */ /* FTC_Node_Unref */ /* */ /* FTC_Font */ @@ -80,6 +82,10 @@ FT_BEGIN_HEADER /* FTC_SBitCache_New */ /* FTC_SBitCache_Lookup */ /* */ + /* FTC_CMapCache */ + /* FTC_CMapCache_New */ + /* FTC_CMapCache_Lookup */ + /* */ /* */ /* FTC_Image_Desc */ /* FTC_Image_Cache */ @@ -502,11 +508,6 @@ FT_BEGIN_HEADER FTC_CMapCache *acache ); - /* retrieve the index of a given charmap */ - FT_EXPORT( FT_Int ) - FT_Get_CharMap_Index( FT_CharMap charmap ); - - /*************************************************************************/ /* */ /* @function: */ @@ -519,9 +520,9 @@ FT_BEGIN_HEADER /* @input: */ /* cache :: A charmap cache handle. */ /* */ - /* face_id :: source face id */ + /* face_id :: The source face ID. */ /* */ - /* cmap_index :: index of charmap in source face */ + /* cmap_index :: The index of the charmap in the source face. */ /* */ /* char_code :: The character code (in the corresponding charmap). */ /* */ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 517e83e42..8b0256e1a 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2215,6 +2215,24 @@ } + /* documentation is in freetype.h */ + + FT_EXPORT_DEF( FT_Int ) + FT_Get_Charmap_Index( FT_CharMap charmap ) + { + FT_Int i; + + + for ( i = 0; i < charmap->face->num_charmaps; i++ ) + if ( charmap->face->charmaps[i] == charmap ) + break; + + FT_ASSERT( i < charmap->face->num_charmaps ); + + return i; + } + + FT_BASE_DEF( void ) FT_CMap_Done( FT_CMap cmap ) { diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index 5d5061cfb..e14497141 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -231,6 +231,8 @@ }; + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_ImageCache_New( FTC_Manager manager, FTC_ImageCache *acache ) @@ -240,7 +242,7 @@ } - /* documentation is in ftcimage.h */ + /* documentation is in ftcache.h */ FT_EXPORT_DEF( FT_Error ) FTC_ImageCache_Lookup( FTC_ImageCache cache, @@ -347,6 +349,8 @@ }; + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_SBitCache_New( FTC_Manager manager, FTC_SBitCache *acache ) @@ -356,6 +360,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_SBitCache_Lookup( FTC_SBitCache cache, FTC_ImageType type, diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index dfdbb488b..60f995321 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -196,7 +196,7 @@ }; - /* documentation is in ftccmap.h */ + /* documentation is in ftcache.h */ FT_EXPORT_DEF( FT_Error ) FTC_CMapCache_New( FTC_Manager manager, @@ -208,7 +208,7 @@ } - /* documentation is in ftccmap.h */ + /* documentation is in ftcache.h */ FT_EXPORT_DEF( FT_UInt ) FTC_CMapCache_Lookup( FTC_CMapCache cmap_cache, diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 9cc64891c..04d064be1 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -149,6 +149,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Manager_LookupSize( FTC_Manager manager, FTC_Scaler scaler, @@ -617,6 +619,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( void ) FTC_Manager_RemoveFaceID( FTC_Manager manager, FTC_FaceID face_id ) @@ -633,7 +637,7 @@ } - /* documentation is in ftcmanag.h */ + /* documentation is in ftcache.h */ FT_EXPORT_DEF( void ) FTC_Node_Unref( FTC_Node node,