From 016eba976f6ca3f6432fca63ac09ed56133723f5 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 18 Oct 2011 13:34:32 +0200 Subject: [PATCH] * Version 2.4.7 released. ========================= Tag sources with `VER-2-4-7'. * docs/CHANGES: Updated. * docs/VERSION.DLL: Update documentation and bump version number to 2.4.7. * README, Jamfile (RefDoc), builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj, builds/win32/visualce/index.html, builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/freetype.vcproj, builds/wince/vc2008-ce/index.html: s/2.4.6/2.4.7/, s/246/247/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. * builds/unix/configure.raw (version_info): Set to 13:2:7. --- ChangeLog | 31 ++++++++++ Jamfile | 2 +- README | 8 +-- builds/unix/configure.raw | 2 +- builds/win32/vc2005/freetype.vcproj | 12 ++-- builds/win32/vc2005/index.html | 10 +-- builds/win32/vc2008/freetype.vcproj | 12 ++-- builds/win32/vc2008/index.html | 10 +-- builds/win32/vc2010/freetype.vcxproj | 12 ++-- builds/win32/vc2010/index.html | 10 +-- builds/win32/visualc/freetype.dsp | 20 +++--- builds/win32/visualc/freetype.vcproj | 12 ++-- builds/win32/visualc/index.html | 10 +-- builds/win32/visualce/freetype.dsp | 20 +++--- builds/win32/visualce/freetype.vcproj | 84 +++++++++++++------------- builds/win32/visualce/index.html | 10 +-- builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2005-ce/index.html | 10 +-- builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2008-ce/index.html | 10 +-- docs/CHANGES | 16 +++++ docs/VERSION.DLL | 1 + include/freetype/freetype.h | 2 +- 23 files changed, 252 insertions(+), 204 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84f7ab607..d2eb4d3ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2011-10-18 Werner Lemberg + + * Version 2.4.7 released. + ========================= + + + Tag sources with `VER-2-4-7'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.7. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.6/2.4.7/, s/246/247/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. + + * builds/unix/configure.raw (version_info): Set to 13:2:7. + 2011-10-15 Kal Conley Fix handling of transformations if no renderer is present. diff --git a/Jamfile b/Jamfile index 3f4cd5b75..5614bc75c 100644 --- a/Jamfile +++ b/Jamfile @@ -195,7 +195,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.6 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.7 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index a19a0d4be..d538f1e56 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.4.6 + FreeType 2.4.7 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -15,9 +15,9 @@ and download one of the following files. - freetype-doc-2.4.6.tar.bz2 - freetype-doc-2.4.6.tar.gz - ftdoc246.zip + freetype-doc-2.4.7.tar.bz2 + freetype-doc-2.4.7.tar.gz + ftdoc247.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 0f4db1523..1e96c91d0 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='13:1:7' +version_info='13:2:7' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj index 4728f0320..a4784f526 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/builds/win32/vc2005/index.html b/builds/win32/vc2005/index.html index 7a315b801..133502b31 100644 --- a/builds/win32/vc2005/index.html +++ b/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.6 sources:

+compiles the following libraries from the FreeType 2.4.7 sources:

    -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
    + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj index 7dad23118..c8221e511 100644 --- a/builds/win32/vc2008/freetype.vcproj +++ b/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.6 sources:

+compiles the following libraries from the FreeType 2.4.7 sources:

    -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
    + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/win32/vc2010/freetype.vcxproj index 15e701589..bca681393 100644 --- a/builds/win32/vc2010/freetype.vcxproj +++ b/builds/win32/vc2010/freetype.vcxproj @@ -95,12 +95,12 @@ AllRules.ruleset - freetype246_D - freetype246MT_D - freetype246ST_D - freetype246 - freetype246MT - freetype246ST + freetype247_D + freetype247MT_D + freetype247ST_D + freetype247 + freetype247MT + freetype247ST diff --git a/builds/win32/vc2010/index.html b/builds/win32/vc2010/index.html index b90836622..7d428ae6f 100644 --- a/builds/win32/vc2010/index.html +++ b/builds/win32/vc2010/index.html @@ -11,14 +11,14 @@

This directory contains a project file for Visual C++, named freetype.vcxproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.6 sources:

+compiles the following libraries from the FreeType 2.4.7 sources:

    -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
    + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index 268696760..d887dba4b 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\freetype246.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247.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\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype246_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype246.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype247.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype246ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype247ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index 8ec4df665..f442e9bb3 100644 --- a/builds/win32/visualc/freetype.vcproj +++ b/builds/win32/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.6 sources:

+compiles the following libraries from the FreeType 2.4.7 sources:

    -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
    + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp index 268696760..d887dba4b 100644 --- a/builds/win32/visualce/freetype.dsp +++ b/builds/win32/visualce/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\freetype246.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247.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\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype246_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype246.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype247.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype246ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype247ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 46426866d..3c08b0c61 100644 --- a/builds/win32/visualce/freetype.vcproj +++ b/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.6 sources:

+It compiles the following libraries from the FreeType 2.4.7 sources:

    -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
    + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index 4267cc20c..c8bba48d4 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 04e3c4bdf..963c7c9e1 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.4.6 sources:

    +It compiles the following libraries from the FreeType 2.4.7 sources:

      -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
      + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 85b5c114a..228d77889 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.6 sources:

    +It compiles the following libraries from the FreeType 2.4.7 sources:

      -    freetype246.lib     - release build; single threaded
-    freetype246_D.lib   - debug build;   single threaded
-    freetype246MT.lib   - release build; multi-threaded
-    freetype246MT_D.lib - debug build;   multi-threaded
      + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_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 70ce80081..4cb3cf60c 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,3 +1,19 @@ +CHANGES BETWEEN 2.4.6 and 2.4.7 + + I. IMPORTANT BUG FIXES + + - Some vulnerabilities in handling Type 1 fonts have been fixed; + see CVE-2011-3256. + + II. MISCELLANEOUS + + - FreeType now properly handles ZapfDingbats glyph names while + constructing a Unicode character map (for fonts which don't have + one). + + +====================================================================== + CHANGES BETWEEN 2.4.5 and 2.4.6 I. IMPORTANT BUG FIXES diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 36bede99f..2dd8eadb3 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.4.7 13.2.7 6.7.2 2.4.6 13.1.7 6.7.1 2.4.5 13.0.7 6.7.0 2.4.4 12.2.6 6.6.2 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 660b3032d..08b77e16c 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3810,7 +3810,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 6 +#define FREETYPE_PATCH 7 /*************************************************************************/