diff --git a/CMakeLists.txt b/CMakeLists.txt index 8efa08bf4..77a5622c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ endif () set(VERSION_MAJOR "2") set(VERSION_MINOR "6") -set(VERSION_PATCH "1") +set(VERSION_PATCH "2") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/ChangeLog b/ChangeLog index 60f52e222..31c2ac9e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2015-11-28 Werner Lemberg + + * Version 2.6.2 released. + ========================= + + + Tag sources with `VER-2-6-2'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.6.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.6.1/2.6.2/, s/261/262/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. + + * builds/unix/configure.raw (version_info): Set to 18:2:12. + * CMakeLists.txt (VERSION_PATCH): Set to 2. + + * docs/CHANGES: Updated. + 2015-11-28 Werner Lemberg Fix C++ compilation. diff --git a/Jamfile b/Jamfile index 2d00682f3..7db263050 100644 --- a/Jamfile +++ b/Jamfile @@ -197,7 +197,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.6.1 + --title=FreeType-2.6.2 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index ed62e1dee..f53644dac 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.6.1 + FreeType 2.6.2 ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.6.1.tar.bz2 - freetype-doc-2.6.1.tar.gz - ftdoc261.zip + freetype-doc-2.6.2.tar.bz2 + freetype-doc-2.6.2.tar.gz + ftdoc262.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index f28baff19..7f4986f7e 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:1:12' +version_info='18:2: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 4f95fabf8..9097566dc 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 b6161aea3..fffdd92be 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.1 sources:

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

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    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 982570523..2ad69022b 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.1 sources:

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

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    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 9c69edace..3c550df6f 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 30e40ded4..998451783 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.1 sources:

    +compiles the following libraries from the FreeType 2.6.2 sources:

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    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 d0364f6f0..54f7f4a18 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.1 sources:

    +compiles the following libraries from the FreeType 2.6.2 sources:

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    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 64e330981..3709ef3c7 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype261d - freetype261d - freetype261MTd - freetype261MTd - freetype261STd - freetype261STd - freetype261 - freetype261 - freetype261MT - freetype261MT - freetype261ST - freetype261ST + freetype262d + freetype262d + freetype262MTd + freetype262MTd + freetype262STd + freetype262STd + freetype262 + freetype262 + freetype262MT + freetype262MT + freetype262ST + freetype262ST diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 24766a6d3..31ab72800 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.1 sources:

    +FreeType 2.6.2 sources:

      -    freetype261.lib    - release build
-    freetype261d.lib   - debug build
-    freetype261ST.lib  - release build; single threaded
-    freetype261STd.lib - debug build;   single threaded
-    freetype261MT.lib  - release build; multi-threaded
-    freetype261MTd.lib - debug build;   multi-threaded
      + 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

    Both Win32 and x64 builds are supported.

    diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 807b45f36..58bcbee4f 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\freetype261.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262.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\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262_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\freetype261_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_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\freetype261.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.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\freetype261.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype261ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype262.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype262ST.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\freetype261_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 41394f987..7e2963d92 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.1 sources:

    +compiles the following libraries from the FreeType 2.6.2 sources:

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    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 807b45f36..58bcbee4f 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\freetype261.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262.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\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262_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\freetype261_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_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\freetype261.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.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\freetype261.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype261ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype262.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype262ST.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\freetype261_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index de95e24f2..d5de12315 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.1 sources:

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

      -    freetype261.lib     - release build; single threaded
-    freetype261_D.lib   - debug build;   single threaded
-    freetype261MT.lib   - release build; multi-threaded
-    freetype261MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index c55dd3852..67ab23329 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -1,11 +1,13 @@ -CHANGES BETWEEN 2.6 and 2.6.2 + +CHANGES BETWEEN 2.6.1 and 2.6.2 I. IMPORTANT CHANGES - The auto-hinter now supports stem darkening, to be controlled by the new `no-stem-darkening' and `darkening-parameters' - properties. This is an experimental feature, and the interface - might change in a future release. + properties. This is an experimental feature contributed by + Nikolaus Waxweiler, and the interface might change in a future + release. - By default, stem darkening is now switched off (for both the CFF engine and the auto-hinter). The main reason is that you need @@ -25,6 +27,9 @@ CHANGES BETWEEN 2.6 and 2.6.2 II. MISCELLANEOUS + - The default LCD filter has been changed to be normalized and + color-balanced. + - For better compatibility with FontConfig, function `FT_Library_SetLcdFilter' accepts a new enumeration value `FT_LCD_FILTER_LEGACY1' (which has the same meaning as @@ -42,6 +47,15 @@ CHANGES BETWEEN 2.6 and 2.6.2 - The smooth renderer has been made faster. + - The `ftstring' demo program now supports sub-pixel rendering; + use key `l' to cycle through the LCD modes. + + - The `ftstring' demo program now supports colour rendering; use + the `space' key to cycle through various colour combinations. + + - The graphical demo programs now use a default gamma value of 1.8 + (instead of 1.2). + ====================================================================== diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index a28bd5be0..1cc1c5d9b 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.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 2.5.5 17.4.11 6.11.4 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 8ccec438c..ec7d87ec8 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "October 2015" "FreeType 2.6.1" +.TH FREETYPE-CONFIG 1 "November 2015" "FreeType 2.6.2" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 80bc5f371..41379ea18 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4173,7 +4173,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 6 -#define FREETYPE_PATCH 1 +#define FREETYPE_PATCH 2 /*************************************************************************/