From 8cabd919ca63f0e6c12e8405e8542a45d910fa62 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 4 Oct 2015 08:18:01 +0200 Subject: [PATCH] * Version 2.6.1 released. ========================= Tag sources with `VER-2-6-1'. * docs/VERSION.DLL: Update documentation and bump version number to 2.6.1. * 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.6.1/, s/26/261/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. * builds/unix/configure.raw (version_info): Set to 18:1:12. * CMakeLists.txt (VERSION_PATCH): Set to 1. * src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for dumping functions. --- CMakeLists.txt | 2 +- ChangeLog | 42 ++++++++++++- Jamfile | 2 +- README | 10 +-- builds/unix/configure.raw | 2 +- builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++----------- builds/wince/vc2005-ce/index.html | 14 ++--- builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++----------- builds/wince/vc2008-ce/index.html | 14 ++--- builds/windows/vc2005/freetype.vcproj | 12 ++-- builds/windows/vc2005/index.html | 14 ++--- builds/windows/vc2008/freetype.vcproj | 12 ++-- builds/windows/vc2008/index.html | 14 ++--- builds/windows/vc2010/freetype.vcxproj | 24 +++---- builds/windows/vc2010/index.html | 14 ++--- builds/windows/visualc/freetype.dsp | 20 +++--- builds/windows/visualc/freetype.vcproj | 12 ++-- builds/windows/visualc/index.html | 14 ++--- builds/windows/visualce/freetype.dsp | 20 +++--- builds/windows/visualce/freetype.vcproj | 84 ++++++++++++------------- builds/windows/visualce/index.html | 14 ++--- docs/CHANGES | 20 +++--- docs/VERSION.DLL | 16 +---- docs/freetype-config.1 | 2 +- include/freetype/freetype.h | 2 +- src/autofit/afmodule.c | 8 +++ 26 files changed, 286 insertions(+), 254 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edcb64e87..0f0940ff7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ endif () set(VERSION_MAJOR "2") set(VERSION_MINOR "6") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/ChangeLog b/ChangeLog index d7014cd24..f5ca59f5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,40 @@ -2015-10-03 Werner Lemberg +2015-10-04 Werner Lemberg + + * Version 2.6.1 released. + ========================= + + + Tag sources with `VER-2-6-1'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.6.1. + + * 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.6.1/, s/26/261/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 18:1:12. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + + * src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for + dumping functions. + +2015-10-04 Werner Lemberg [bzip2, gzip] Avoid access of unitialized memory (#46109). @@ -1098,8 +1134,8 @@ (FREETYPE_PATCH): Set to 0. * builds/unix/configure.raw (version_info): Set to 18:0:12. - * CMakeLists.txt (VERSION_MINOR): Set to 0. - (VERSION_PATCH): Set to 6. + * CMakeLists.txt (VERSION_MINOR): Set to 6. + (VERSION_PATCH): Set to 0. * src/autofit/afmodule.c [!FT_MAKE_OPTION_SINGLE_OBJECT]: Add declarations for dumping functions. diff --git a/Jamfile b/Jamfile index 66537141e..2d00682f3 100644 --- a/Jamfile +++ b/Jamfile @@ -197,7 +197,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.6 + --title=FreeType-2.6.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index adc63f6aa..ed62e1dee 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.6 - ============ + FreeType 2.6.1 + ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.6.tar.bz2 - freetype-doc-2.6.tar.gz - ftdoc26.zip + freetype-doc-2.6.1.tar.bz2 + freetype-doc-2.6.1.tar.gz + ftdoc261.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 443e2331c..5a30c653c 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:0:12' +version_info='18:1: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 f555dcf42..4f95fabf8 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 a8e92d700..b6161aea3 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,22 +21,22 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.6 sources:

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

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 3032b4b3f..982570523 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 sources:

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

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj index d02d370fd..9c69edace 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 7d47e39a4..30e40ded4 100644 --- a/builds/windows/vc2005/index.html +++ b/builds/windows/vc2005/index.html @@ -11,22 +11,22 @@

    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 sources:

    +compiles the following libraries from the FreeType 2.6.1 sources:

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj index 28cbc1f99..d0364f6f0 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 sources:

    +compiles the following libraries from the FreeType 2.6.1 sources:

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 2c2556111..64e330981 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype26d - freetype26d - freetype26MTd - freetype26MTd - freetype26STd - freetype26STd - freetype26 - freetype26 - freetype26MT - freetype26MT - freetype26ST - freetype26ST + freetype261d + freetype261d + freetype261MTd + freetype261MTd + freetype261STd + freetype261STd + freetype261 + freetype261 + freetype261MT + freetype261MT + freetype261ST + freetype261ST diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 37e642d3f..24766a6d3 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 sources:

    +FreeType 2.6.1 sources:

      -freetype26.lib     - release build
-freetype26d.lib    - debug build
-freetype26ST.lib   - release build; single threaded
-freetype26STd.lib  - debug build;   single threaded
-freetype26MT.lib   - release build; multi-threaded
-freetype26MTd.lib  - debug build;   multi-threaded
      + 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

    Both Win32 and x64 builds are supported.

    diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 0a7bd7be1..807b45f36 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\freetype26.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261.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\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261_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\freetype26_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_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\freetype26.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype261.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.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\freetype26.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype26ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype261ST.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\freetype26_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index a7da92f6e..41394f987 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 sources:

    +compiles the following libraries from the FreeType 2.6.1 sources:

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 0a7bd7be1..807b45f36 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\freetype26.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261.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\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261_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\freetype26_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_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\freetype26.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype261.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.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\freetype26.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype26ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype261ST.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\freetype26_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 65821d1fa..de95e24f2 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 sources:

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

      -    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. diff --git a/docs/CHANGES b/docs/CHANGES index b6ef37ed6..ffc686b46 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -3,9 +3,9 @@ CHANGES BETWEEN 2.6 and 2.6.1 I. IMPORTANT BUG FIXES - It turned out that for CFFs only the advance widths should be - taken from the `htmx', not the side bearings. This bug, + taken from the `htmx' table, not the side bearings. This bug, introduced in version 2.6.0, makes it necessary to upgrade if - you are using CFFs; otherwise you get cropped glyphs with GUI + you are using CFFs; otherwise, you get cropped glyphs with GUI interfaces like GTK or Qt. - Accessing Type 42 fonts returned incorrect results if the glyph @@ -19,13 +19,13 @@ CHANGES BETWEEN 2.6 and 2.6.1 header files except `ft2build.h' into a subdirectory tree. Doing so reduces the possibility of header file name clashes - (e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h' on case - insensitive file systems like Mac OS X or Windows). + (e.g., FTGL's `FTGlyph.h' with FreeType's `ftglyph.h') on case + insensitive file systems like Mac OS X or Windows. - Applications that use (a) `freetype-config' or FreeType's - `freetype2.pc' file for pkg-config to get the include directory - for the compiler, and (b) the documented way for header - inclusion like + Applications that use (a) the `freetype-config' script or + FreeType's `freetype2.pc' file for pkg-config to get the include + directory for the compiler, and (b) the documented way for + header inclusion like #include #include FT_FREETYPE_H @@ -35,7 +35,7 @@ CHANGES BETWEEN 2.6 and 2.6.1 - Simple access to named instances in GX variation fonts is now available (in addition to the previous method via FreeType's MM - interface). In the FT_Face structure, bits 16-30 of the + interface). In the `FT_Face' structure, bits 16-30 of the `face_index' field hold the current named instance index for the given face index, and bits 16-30 of `style_flags' contain the number of instances for the given face index. `FT_Open_Face' @@ -67,7 +67,7 @@ CHANGES BETWEEN 2.6 and 2.6.1 - The function `FT_FloorFix' now always rounds towards minus infinity. - - A new load flag `FT_LOAD_COMPUTE_METRICS' is now available; it + - A new load flag `FT_LOAD_COMPUTE_METRICS' has been added; it makes FreeType ignore pre-computed metrics, as needed by font validating or font editing programs. Right now, only the TrueType module supports it to ignore data from the `hdmx' diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index f219c9ac9..a28bd5be0 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -45,13 +45,14 @@ The release number is also available at *runtime* through the 2. History ---------- -The following table gives, for all releases since 2.3.0, the +The following table gives, for all releases since 2.4.0, the corresponding libtool number, as well as the shared object number found on _most_ systems, but not all of them: release libtool so ------------------------------- + 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 2.5.4 17.3.11 6.11.3 @@ -72,19 +73,6 @@ on _most_ systems, but not all of them: 2.4.2 12.0.6 6.6.0 2.4.1 11.1.5 6.5.1 2.4.0 11.0.5 6.5.0 - 2.3.12 10.0.4 6.4.0 - 2.3.11 9.22.3 6.3.22 - 2.3.10 9.21.3 6.3.21 - 2.3.9 9.20.3 6.3.20 - 2.3.8 9.19.3 6.3.19 - 2.3.7 9.18.3 6.3.18 - 2.3.6 9.17.3 6.3.17 - 2.3.5 9.16.3 6.3.16 - 2.3.4 9.15.3 6.3.15 - 2.3.3 9.14.3 6.3.14 - 2.3.2 9.13.3 6.3.13 - 2.3.1 9.12.3 6.3.12 - 2.3.0 9.11.3 6.3.11 3. Autoconf Code Fragment diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index cdab34b51..8ccec438c 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "June 2015" "FreeType 2.6" +.TH FREETYPE-CONFIG 1 "October 2015" "FreeType 2.6.1" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index ceb15918c..b6247f510 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4093,7 +4093,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 6 -#define FREETYPE_PATCH 0 +#define FREETYPE_PATCH 1 /*************************************************************************/ diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index 8ae425c00..bbf137251 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -25,6 +25,10 @@ #ifdef FT_DEBUG_AUTOFIT #ifndef FT_MAKE_OPTION_SINGLE_OBJECT + +#ifdef __cplusplus + extern "C" { +#endif extern void af_glyph_hints_dump_segments( AF_GlyphHints hints, FT_Bool to_stdout ); @@ -34,6 +38,10 @@ extern void af_glyph_hints_dump_edges( AF_GlyphHints hints, FT_Bool to_stdout ); +#ifdef __cplusplus + } +#endif + #endif int _af_debug_disable_horz_hints;