diff --git a/ChangeLog b/ChangeLog index 58b6a1671..04394f9ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2011-07-29 Werner Lemberg + + * Version 2.4.6 released. + ========================= + + + Tag sources with `VER-2-4-6'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.6. + + * 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.5/2.4.6/, s/245/246/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. + + * builds/unix/configure.raw (version_info): Set to 13:1:7. + 2011-07-29 Werner Lemberg [cff] Add some more tracing infos. diff --git a/Jamfile b/Jamfile index 94d77f903..3f4cd5b75 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.5 --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.6 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index f9eb9bd6b..e8cb48057 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.4.5 + FreeType 2.4.6 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.4.5.tar.bz2 - freetype-doc-2.4.5.tar.gz - ftdoc245.zip + freetype-doc-2.4.6.tar.bz2 + freetype-doc-2.4.6.tar.gz + ftdoc246.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 378c26ebc..0f4db1523 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:0:7' +version_info='13:1: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 387667463..4728f0320 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 127aa1312..7a315b801 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.5 sources:

+compiles the following libraries from the FreeType 2.4.6 sources:

    -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
    + 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

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 5d798a932..7dad23118 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.5 sources:

+compiles the following libraries from the FreeType 2.4.6 sources:

    -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
    + 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

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 1c2316244..15e701589 100644 --- a/builds/win32/vc2010/freetype.vcxproj +++ b/builds/win32/vc2010/freetype.vcxproj @@ -95,12 +95,12 @@ AllRules.ruleset - freetype245_D - freetype245MT_D - freetype245ST_D - freetype245 - freetype245MT - freetype245ST + freetype246_D + freetype246MT_D + freetype246ST_D + freetype246 + freetype246MT + freetype246ST diff --git a/builds/win32/vc2010/index.html b/builds/win32/vc2010/index.html index 8802ab2c9..b90836622 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.5 sources:

+compiles the following libraries from the FreeType 2.4.6 sources:

    -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
    + 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

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 a2d3ac877..268696760 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\freetype245.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246.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\freetype245_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246_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\freetype245_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_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\freetype245.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype246.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.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\freetype245.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype245ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype246ST.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\freetype245_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index b6e99cf63..8ec4df665 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.5 sources:

+compiles the following libraries from the FreeType 2.4.6 sources:

    -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
    + 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

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 a2d3ac877..268696760 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\freetype245.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246.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\freetype245_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246_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\freetype245_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_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\freetype245.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype246.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.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\freetype245.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype245ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype246ST.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\freetype245_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 47b3eb728..46426866d 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.5 sources:

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

    -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
    + 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

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 761c7af9f..4267cc20c 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 42b6d19ac..04e3c4bdf 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.5 sources:

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

      -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
      + 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

    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 548d19979..85b5c114a 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.5 sources:

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

      -    freetype245.lib     - release build; single threaded
-    freetype245_D.lib   - debug build;   single threaded
-    freetype245MT.lib   - release build; multi-threaded
-    freetype245MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index d09410088..70ce80081 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,7 +1,16 @@ -CHANGES BETWEEN 2.4.4 and 2.4.5 +CHANGES BETWEEN 2.4.5 and 2.4.6 I. IMPORTANT BUG FIXES + - For TrueType based fonts, the ascender and descender values were + incorrect sometimes (off by a pixel if the ppem value was not a + multiple of 5). Depending on the use you might now experience + a different layout; the change should result in better, more + consistent line spacing. + + - Fix CVE-2011-0226 which causes a vulnerability while handling + Type 1 fonts. + - BDF fonts containing glyphs with negative values for ENCODING were incorrectly rejected. This bug has been introduced in FreeType version 2.2.0. diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 8c5992606..36bede99f 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 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 2.4.3 12.1.6 6.6.1 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index c506b3cec..660b3032d 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 5 +#define FREETYPE_PATCH 6 /*************************************************************************/