diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c9dd4b13..c782fb773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ project(freetype) set(VERSION_MAJOR "2") set(VERSION_MINOR "5") -set(VERSION_PATCH "0") +set(VERSION_PATCH "2") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) # Compiler definitions for building the library diff --git a/ChangeLog b/ChangeLog index df8f9cefd..b67e4362a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2013-12-08 Werner Lemberg + + * Version 2.5.2 released. + ========================= + + + Tag sources with `VER-2-5-2'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.2. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/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.5.1/2.5.2/, s/251/252/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 17:1:11. + * docs/CHANGES: Updated. + 2013-12-07 Werner Lemberg [truetype] Next round in phantom point handling. @@ -103,6 +136,7 @@ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. * builds/unix/configure.raw (version_info): Set to 17:0:11. + * CMakeLists.txt (VERSION_PATCH): Set to 2. * docs/CHANGES, docs/release: Updated. 2013-11-23 Werner Lemberg diff --git a/Jamfile b/Jamfile index a097dffd5..07d1eacce 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.5.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.2 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h } RefDoc refdoc ; diff --git a/README b/README index c694282a7..c660cd1c2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.5.1 + FreeType 2.5.2 ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.5.1.tar.bz2 - freetype-doc-2.5.1.tar.gz - ftdoc251.zip + freetype-doc-2.5.2.tar.bz2 + freetype-doc-2.5.2.tar.gz + ftdoc252.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 508be9a3f..57fb5f416 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='17:0:11' +version_info='17:1:11' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index ada8ceb33..2c147c865 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 fac9e7315..3f39ffbae 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.5.1 sources:

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

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_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 3b1a10ce1..123b8a6b6 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.5.1 sources:

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

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index 113239a29..9d5d5d73b 100644 --- a/builds/windows/vc2005/freetype.vcproj +++ b/builds/windows/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/windows/vc2005/index.html b/builds/windows/vc2005/index.html index a80a4cb40..c060a4dfa 100644 --- a/builds/windows/vc2005/index.html +++ b/builds/windows/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.5.1 sources:

    +compiles the following libraries from the FreeType 2.5.2 sources:

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 794c1648b..6f25fc1ff 100644 --- a/builds/windows/vc2008/freetype.vcproj +++ b/builds/windows/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.5.1 sources:

    +compiles the following libraries from the FreeType 2.5.2 sources:

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index a161d662a..21dd963e1 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -179,18 +179,18 @@ - freetype251_D - freetype251_D - freetype251MT_D - freetype251MT_D - freetype251ST_D - freetype251ST_D - freetype251 - freetype251 - freetype251MT - freetype251MT - freetype251ST - freetype251ST + freetype252_D + freetype252_D + freetype252MT_D + freetype252MT_D + freetype252ST_D + freetype252ST_D + freetype252 + freetype252 + freetype252MT + freetype252MT + freetype252ST + freetype252ST .\..\..\..\objs\win64\vc2010\ diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index c6e2b946c..38d79c754 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -11,16 +11,16 @@

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

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

      -freetype251.lib     - release build
-freetype251_D.lib   - debug build
-freetype251ST.lib   - release build; single threaded
-freetype251ST_D.lib - debug build;   single threaded
-freetype251MT.lib   - release build; multi-threaded
-freetype251MT_D.lib - debug build;   multi-threaded
      +freetype252.lib - release build +freetype252_D.lib - debug build +freetype252ST.lib - release build; single threaded +freetype252ST_D.lib - debug build; single threaded +freetype252MT.lib - release build; multi-threaded +freetype252MT_D.lib - debug build; multi-threaded

    Both Win32 and x64 builds are supported.

    diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 75a8167fc..8c3f1d904 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/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\freetype251.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.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\freetype251_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_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\freetype251_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_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\freetype251.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.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\freetype251.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype251ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype252ST.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\freetype251_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 493ee9e9d..89a0a5126 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/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.5.1 sources:

    +compiles the following libraries from the FreeType 2.5.2 sources:

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 75a8167fc..8c3f1d904 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/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\freetype251.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.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\freetype251_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_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\freetype251_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_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\freetype251.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.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\freetype251.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype251ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype252ST.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\freetype251_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype251ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index e2ce4364c..bbb1a62c5 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.5.1 sources:

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

      -    freetype251.lib     - release build; single threaded
-    freetype251_D.lib   - debug build;   single threaded
-    freetype251MT.lib   - release build; multi-threaded
-    freetype251MT_D.lib - debug build;   multi-threaded
      + freetype252.lib - release build; single threaded + freetype252_D.lib - debug build; single threaded + freetype252MT.lib - release build; multi-threaded + freetype252MT_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 8a8bfd506..007d873f2 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,3 +1,28 @@ + +CHANGES BETWEEN 2.5.1 and 2.5.2 + + I. IMPORTANT BUG FIXES + + - Improving the display of some broken TrueType fonts introduced a + bug that made FreeType crash on some popular (but not fully + conformant) fonts like `ahronbd.ttf'. + + - Another round of improvements to correct positioning and hinting + of composite glyphs in TrueType fonts. + + + II. MISCELLANEOUS + + - Version 2.5.1 introduced a bug in handling embedded bitmap + strikes of TrueType fonts, causing garbage display under some + circumstances. + + - The `ftgrid' demo program couldn't be compiled in + non-development builds. + + +====================================================================== + CHANGES BETWEEN 2.5 and 2.5.1 I. IMPORTANT BUG FIXES diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index ee6ccdfb4..354683a93 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.5.2 17.1.11 6.11.1 2.5.1 17.0.11 6.11.0 2.5.0 16.2.10 6.10.2 2.4.12 16.1.10 6.10.1 diff --git a/include/freetype.h b/include/freetype.h index 76fbda2db..39a18af89 100644 --- a/include/freetype.h +++ b/include/freetype.h @@ -3925,7 +3925,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 5 -#define FREETYPE_PATCH 1 +#define FREETYPE_PATCH 2 /*************************************************************************/