* 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.
This commit is contained in:
Werner Lemberg 2004-04-24 14:43:37 +00:00
parent 2b32a177f3
commit e95365b291
17 changed files with 127 additions and 39 deletions

View File

@ -1,10 +1,36 @@
2004-02-21 Werner Lemberg <wl@gnu.org> 2004-04-23 Werner Lemberg <wl@gnu.org>
* 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 <wl@gnu.org>
* src/cff/cffparse.c (cff_parser_run), src/psaux/psobjs.c * src/cff/cffparse.c (cff_parser_run), src/psaux/psobjs.c
(ps_parser_load_field): Use FT_CHAR_BIT. (ps_parser_load_field): Use FT_CHAR_BIT.
2004-04-21 David Turner <david@freetype.org> 2004-04-21 David Turner <david@freetype.org>
* Version 2.1.8 released.
=========================
* src/cff/cffobjs.c (cff_face_init): Fix a small memory leak. * src/cff/cffobjs.c (cff_face_init): Fix a small memory leak.
* src/autofit/afloader.c (af_loader_load_g), src/autofit/afmodule.c * src/autofit/afloader.c (af_loader_load_g), src/autofit/afmodule.c

View File

@ -148,7 +148,7 @@ if $(DEBUG_HINTER)
actions RefDoc 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 ; RefDoc refdoc ;

8
README
View File

@ -9,7 +9,7 @@
is called `libttf'. They are *not* compatible! 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. 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 Note that the FreeType 2 documentation is now available as a
separate package from our sites. See: 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.9.tar.bz2
ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.8.tar.gz ftp://ftp.freetype.org/pub/freetype2/ftdocs-2.1.9.tar.gz
ftp://ftp.freetype.org/pub/freetype2/ftdoc218.zip ftp://ftp.freetype.org/pub/freetype2/ftdoc219.zip
Bugs Bugs

View File

@ -254,7 +254,7 @@ library: $(PROJECT_LIBRARY)
refdoc: refdoc:
python $(SRC_DIR)/tools/docmaker/docmaker.py \ python $(SRC_DIR)/tools/docmaker/docmaker.py \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-2.1.8 \ --title=FreeType-2.1.9 \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \

View File

@ -1720,7 +1720,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update docs/VERSION.DLL! # Don't forget to update docs/VERSION.DLL!
version_info='9:6:3' version_info='9:7:3'
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`

View File

@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL! # Don't forget to update docs/VERSION.DLL!
version_info='9:6:3' version_info='9:7:3'
AC_SUBST([version_info]) AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version]) AC_SUBST([ft_version])

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype218.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype219.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug" !ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # 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" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@ -103,7 +103,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.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" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@ -127,7 +127,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8.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" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@ -152,7 +152,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib" # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype218ST.lib" # ADD LIB32 /out:"..\..\..\objs\freetype219ST.lib"
# SUBTRACT LIB32 /nologo # SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -178,7 +178,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206_D.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 !ENDIF

View File

@ -41,7 +41,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218.lib" OutputFile="..\..\..\objs\freetype219.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -94,7 +94,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218MT.lib" OutputFile="..\..\..\objs\freetype219MT.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -147,7 +147,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218ST.lib"/> OutputFile="..\..\..\objs\freetype219ST.lib"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
<Tool <Tool
@ -197,7 +197,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218_D.lib" OutputFile="..\..\..\objs\freetype219_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218ST_D.lib" OutputFile="..\..\..\objs\freetype219ST_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -299,7 +299,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype218MT_D.lib" OutputFile="..\..\..\objs\freetype219MT_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>

View File

@ -16,10 +16,10 @@ will compile the following libraries from the FreeType 2.1.8 sources:</p>
<ul> <ul>
<pre> <pre>
freetype218.lib - release build; single threaded freetype219.lib - release build; single threaded
freetype218_D.lib - debug build; single threaded freetype219_D.lib - debug build; single threaded
freetype218MT.lib - release build; multi-threaded freetype219MT.lib - release build; multi-threaded
freetype218MT_D.lib - debug build; multi-threaded</pre> freetype219MT_D.lib - debug build; multi-threaded</pre>
</ul> </ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

View File

@ -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 LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
I. IMPORTANT BUG FIXES I. IMPORTANT BUG FIXES

View File

@ -52,6 +52,7 @@ systems, but not all of them:
release libtool so release libtool so
------------------------------- -------------------------------
2.1.9 9.7.3 6.3.7
2.1.8 9.6.3 6.3.6 2.1.8 9.6.3 6.3.6
2.1.7 9.5.3 6.3.5 2.1.7 9.5.3 6.3.5
2.1.6 9.5.3 6.3.5 2.1.6 9.5.3 6.3.5

View File

@ -44,7 +44,7 @@
/* */ /* */
#define FREETYPE_MAJOR 2 #define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 1 #define FREETYPE_MINOR 1
#define FREETYPE_PATCH 8 #define FREETYPE_PATCH 9
#include <ft2build.h> #include <ft2build.h>
@ -172,6 +172,7 @@ FT_BEGIN_HEADER
/* FT_CharMapRec */ /* FT_CharMapRec */
/* FT_Select_Charmap */ /* FT_Select_Charmap */
/* FT_Set_Charmap */ /* FT_Set_Charmap */
/* FT_Get_Charmap_Index */
/* */ /* */
/*************************************************************************/ /*************************************************************************/
@ -2672,6 +2673,25 @@ FT_BEGIN_HEADER
FT_CharMap charmap ); 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 );
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Function> */ /* <Function> */

View File

@ -55,7 +55,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* <Description> */ /* <Description> */
/* This section describes the FreeType 2 cache sub-system which is */ /* This section describes the FreeType 2 cache sub-system which is */
/* stile in beta. */ /* still in beta. */
/* */ /* */
/* <Order> */ /* <Order> */
/* FTC_Manager */ /* FTC_Manager */
@ -63,11 +63,13 @@ FT_BEGIN_HEADER
/* FTC_Face_Requester */ /* FTC_Face_Requester */
/* */ /* */
/* FTC_Manager_New */ /* FTC_Manager_New */
/* FTC_Manager_Reset */
/* FTC_Manager_Done */
/* FTC_Manager_LookupFace */ /* FTC_Manager_LookupFace */
/* FTC_Manager_LookupSize */ /* FTC_Manager_LookupSize */
/* FTC_Manager_RemoveFaceID */
/* */ /* */
/* FTC_Node */ /* FTC_Node */
/* FTC_Node_Ref */
/* FTC_Node_Unref */ /* FTC_Node_Unref */
/* */ /* */
/* FTC_Font */ /* FTC_Font */
@ -80,6 +82,10 @@ FT_BEGIN_HEADER
/* FTC_SBitCache_New */ /* FTC_SBitCache_New */
/* FTC_SBitCache_Lookup */ /* FTC_SBitCache_Lookup */
/* */ /* */
/* FTC_CMapCache */
/* FTC_CMapCache_New */
/* FTC_CMapCache_Lookup */
/* */
/* */ /* */
/* FTC_Image_Desc */ /* FTC_Image_Desc */
/* FTC_Image_Cache */ /* FTC_Image_Cache */
@ -502,11 +508,6 @@ FT_BEGIN_HEADER
FTC_CMapCache *acache ); FTC_CMapCache *acache );
/* retrieve the index of a given charmap */
FT_EXPORT( FT_Int )
FT_Get_CharMap_Index( FT_CharMap charmap );
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* @function: */ /* @function: */
@ -519,9 +520,9 @@ FT_BEGIN_HEADER
/* @input: */ /* @input: */
/* cache :: A charmap cache handle. */ /* 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). */ /* char_code :: The character code (in the corresponding charmap). */
/* */ /* */

View File

@ -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_BASE_DEF( void )
FT_CMap_Done( FT_CMap cmap ) FT_CMap_Done( FT_CMap cmap )
{ {

View File

@ -231,6 +231,8 @@
}; };
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_ImageCache_New( FTC_Manager manager, FTC_ImageCache_New( FTC_Manager manager,
FTC_ImageCache *acache ) FTC_ImageCache *acache )
@ -240,7 +242,7 @@
} }
/* documentation is in ftcimage.h */ /* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_ImageCache_Lookup( FTC_ImageCache cache, FTC_ImageCache_Lookup( FTC_ImageCache cache,
@ -347,6 +349,8 @@
}; };
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_SBitCache_New( FTC_Manager manager, FTC_SBitCache_New( FTC_Manager manager,
FTC_SBitCache *acache ) FTC_SBitCache *acache )
@ -356,6 +360,8 @@
} }
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_SBitCache_Lookup( FTC_SBitCache cache, FTC_SBitCache_Lookup( FTC_SBitCache cache,
FTC_ImageType type, FTC_ImageType type,

4
src/cache/ftccmap.c vendored
View File

@ -196,7 +196,7 @@
}; };
/* documentation is in ftccmap.h */ /* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_CMapCache_New( FTC_Manager manager, 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 ) FT_EXPORT_DEF( FT_UInt )
FTC_CMapCache_Lookup( FTC_CMapCache cmap_cache, FTC_CMapCache_Lookup( FTC_CMapCache cmap_cache,

View File

@ -149,6 +149,8 @@
} }
/* documentation is in ftcache.h */
FT_EXPORT_DEF( FT_Error ) FT_EXPORT_DEF( FT_Error )
FTC_Manager_LookupSize( FTC_Manager manager, FTC_Manager_LookupSize( FTC_Manager manager,
FTC_Scaler scaler, FTC_Scaler scaler,
@ -617,6 +619,8 @@
} }
/* documentation is in ftcache.h */
FT_EXPORT_DEF( void ) FT_EXPORT_DEF( void )
FTC_Manager_RemoveFaceID( FTC_Manager manager, FTC_Manager_RemoveFaceID( FTC_Manager manager,
FTC_FaceID face_id ) FTC_FaceID face_id )
@ -633,7 +637,7 @@
} }
/* documentation is in ftcmanag.h */ /* documentation is in ftcache.h */
FT_EXPORT_DEF( void ) FT_EXPORT_DEF( void )
FTC_Node_Unref( FTC_Node node, FTC_Node_Unref( FTC_Node node,