diff --git a/CMakeLists.txt b/CMakeLists.txt index ac9d4adfd..f02ee518e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ endif () set(VERSION_MAJOR "2") set(VERSION_MINOR "6") -set(VERSION_PATCH "2") +set(VERSION_PATCH "3") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/ChangeLog b/ChangeLog index e9adf4baa..a19b4decf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2016-02-07 Werner Lemberg + + * Version 2.6.3 released. + ========================= + + + Tag sources with `VER-2-6-3'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.6.3. + + * 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.6.2/2.6.3/, s/262/263/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. + + * builds/unix/configure.raw (version_info): Set to 18:3:12. + * CMakeLists.txt (VERSION_PATCH): Set to 2. + + * docs/CHANGES: Updated. + 2016-02-07 Werner Lemberg Fix another runtime error found by clang's sanitizer (#47082). diff --git a/Jamfile b/Jamfile index b157a7b2d..8c033fcc9 100644 --- a/Jamfile +++ b/Jamfile @@ -197,7 +197,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.6.2 + --title=FreeType-2.6.3 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index 9d497f3a3..ff81cdf3b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.6.2 + FreeType 2.6.3 ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.6.2.tar.bz2 - freetype-doc-2.6.2.tar.gz - ftdoc262.zip + freetype-doc-2.6.3.tar.bz2 + freetype-doc-2.6.3.tar.gz + ftdoc263.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 479673438..1be10a3ca 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='18:2:12' +version_info='18:3:12' 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 9097566dc..020d954f6 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 fffdd92be..a477550f9 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.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 2ad69022b..8a87e3c71 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.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 3c550df6f..e9310eca2 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 998451783..bc6751e32 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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 54f7f4a18..c90a08c5d 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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 3709ef3c7..96f76cae8 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype262d - freetype262d - freetype262MTd - freetype262MTd - freetype262STd - freetype262STd - freetype262 - freetype262 - freetype262MT - freetype262MT - freetype262ST - freetype262ST + freetype263d + freetype263d + freetype263MTd + freetype263MTd + freetype263STd + freetype263STd + freetype263 + freetype263 + freetype263MT + freetype263MT + freetype263ST + freetype263ST diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 31ab72800..aaac97923 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -12,16 +12,16 @@

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

    +FreeType 2.6.3 sources:

      -    freetype262.lib    - release build
-    freetype262d.lib   - debug build
-    freetype262ST.lib  - release build; single threaded
-    freetype262STd.lib - debug build;   single threaded
-    freetype262MT.lib  - release build; multi-threaded
-    freetype262MTd.lib - debug build;   multi-threaded
      + freetype263.lib - release build + freetype263d.lib - debug build + freetype263ST.lib - release build; single threaded + freetype263STd.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MTd.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 58bcbee4f..0ffc9ad1c 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\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263.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\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263_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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT_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\freetype262.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT.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\freetype262.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype262ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype263ST.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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 7e2963d92..462223a6b 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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 58bcbee4f..0ffc9ad1c 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\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263.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\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263_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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT_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\freetype262.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT.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\freetype262.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype262ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype263ST.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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index d5de12315..fa097bd3f 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.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_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 42abb111b..ee2f21d1d 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,4 +1,53 @@ +CHANGES BETWEEN 2.6.2 and 2.6.3 + + I. IMPORTANT CHANGES + + - Khmer, Myanmar, Bengali, and Kannada script support has been + added to the auto-hinter. + + + II. MISCELLANEOUS + + - Better support of Indic scripts like Devanagari by using a + top-to-bottom hinting flow. + + - All FreeType macros starting with two underscores have been + renamed to avoid a violation of both the C and C++ standards. + Example: Header macros of the form `__FOO_H__' are now called + `FOO_H_'. In most cases, this should be completely transparent + to the user. The exception to this is `__FTERRORS_H__', which + must be sometimes undefined by the user to get FreeType error + strings: Both this form and the new `FTERRORS_H_' macro are + accepted for backwards compatibility. + + - Minor improvements mainly to the Type 1 driver. + + - The new CFF engine now supports all Type 2 operators except + `random'. + + - The macro `_STANDALONE_', used for compiling the B/W and smooth + rasterizers as stand-alone modules, has been renamed to + `STANDALONE_', since macro names starting with an underscore and + followed by an uppercase letter are reserved in both C and C++. + + - Function `FT_Library_SetLcdFilterWeights' now also activates + custom LCD filter weights (instead of just adjusting them). + + - Support for `unpatented hinting' has been completely removed: + Consequently, the two functions `FT_Face_CheckTrueTypePatents' + and `FT_Face_SetUnpatentedHinting' now return always false, + doing nothing. + + - The `ftgamma' demo program has been modernized; the gamma grid + display has been moved from `ftview' to this program. + + - It is now possible to cycle through the available LCD fitlering + modes. + + +====================================================================== + CHANGES BETWEEN 2.6.1 and 2.6.2 I. IMPORTANT CHANGES diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 4bcda9c55..804c2f236 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.6.3 18.3.12 6.12.3 2.6.2 18.2.12 6.12.2 2.6.1 18.1.12 6.12.1 2.6.0 18.0.12 6.12.0 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index ec7d87ec8..1720d476b 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "November 2015" "FreeType 2.6.2" +.TH FREETYPE-CONFIG 1 "February 2016" "FreeType 2.6.3" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index e575eabc4..4666d4893 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4172,7 +4172,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 6 -#define FREETYPE_PATCH 2 +#define FREETYPE_PATCH 3 /*************************************************************************/