diff --git a/CMakeLists.txt b/CMakeLists.txt index 95daeb78d..ad8ded0bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ project(freetype C) set(VERSION_MAJOR "2") set(VERSION_MINOR "9") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") # SOVERSION scheme: CURRENT.AGE.REVISION # If there was an incompatible interface change: diff --git a/ChangeLog b/ChangeLog index 1b86d6025..806b8354a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2018-05-01 Werner Lemberg + + * Version 2.9.1 released. + ========================= + + + Tag sources with `VER-2-9-1'. + + * docs/VERSION.TXT: Add entry for version 2.9.1. + * docs/CHANGES: Updated. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + src/base/ftver.rc, 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.9/2.9.1/, s/29/291/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 22:1:16. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + + * include/freetype/ftgasp.h: Use FT_BEGIN_HEADER and FT_END_HEADER. + 2018-04-26 Werner Lemberg Another fix for handling invalid format 2 cmaps. @@ -522,7 +557,7 @@ (FREETYPE_PATCH): Set to 0. * builds/unix/configure.raw (version_info): Set to 22:0:16. - * CMakeLists.txt (VERSION_PATCH): Set to 1. + * CMakeLists.txt (VERSION_PATCH): Set to 0. 2018-01-07 Werner Lemberg diff --git a/Jamfile b/Jamfile index a9eb39632..9078a5fe3 100644 --- a/Jamfile +++ b/Jamfile @@ -210,7 +210,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.9 + --title=FreeType-2.9.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index 1e7ea97d4..c23b99e18 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.9 - ============ + FreeType 2.9.1 + ============== Homepage: https://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.9.tar.bz2 - freetype-doc-2.9.tar.gz - ftdoc29.zip + freetype-doc-2.9.1.tar.bz2 + freetype-doc-2.9.1.tar.gz + ftdoc291.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 1b4aa2cad..baab79dc5 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/VERSIONS.TXT'! -version_info='22:0:16' +version_info='22:1:16' 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 012934bef..1ca45a80f 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 267241528..02a1caf8b 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.9 sources:

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

      -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
      + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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 d80cfde91..7a5445e9c 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.9 sources:

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

      -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
      + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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 383f07ea8..b1e2ae681 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 a25e67426..c5e182ef0 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.9 sources:

    +compiles the following libraries from the FreeType 2.9.1 sources:

      -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
      + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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 c9e395120..f526cd2f6 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.9 sources:

    +compiles the following libraries from the FreeType 2.9.1 sources:

      -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
      + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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/index.html b/builds/windows/vc2010/index.html index 8677511dc..c3e604034 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -12,7 +12,7 @@

    This directory contains solution and project files for Visual C++ 2010 or newer, named freetype.sln, and freetype.vcxproj. It compiles the following libraries -from the FreeType 2.9 sources:

    +from the FreeType 2.9.1 sources:

    • freetype.dll using 'Release' or 'Debug' configurations
      • diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index 04b200d1d..dac3d25c4 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\freetype29.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291.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\freetype29_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291_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\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT_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\freetype29.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT.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\freetype29.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype29ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype291ST.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\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 7e6a46c47..dd0c41801 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.9 sources:

      +compiles the following libraries from the FreeType 2.9.1 sources:

        -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
        + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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 d65714572..5fe2b5a97 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\freetype29.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291.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\freetype29_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291_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\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT_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\freetype29.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype291.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT.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\freetype29.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype29ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype291ST.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\freetype29_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype29ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index df1584829..b79731175 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.9 sources:

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

      -    freetype29.lib     - release build; single threaded
-    freetype29_D.lib   - debug build;   single threaded
-    freetype29MT.lib   - release build; multi-threaded
-    freetype29MT_D.lib - debug build;   multi-threaded
      + freetype291.lib - release build; single threaded + freetype291_D.lib - debug build; single threaded + freetype291MT.lib - release build; multi-threaded + freetype291MT_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 99c9d481c..a6d088af4 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -5,7 +5,7 @@ CHANGES BETWEEN 2.9 and 2.9.1 - Type 1 fonts containing flex features were not rendered correctly (bug introduced in version 2.9). - - CVE-2018-6942: Older FreeType versions can crash with certain + - CVE-2018-6942: Older FreeType versions can crash with certain malformed variation fonts. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942 @@ -19,6 +19,9 @@ CHANGES BETWEEN 2.9 and 2.9.1 the base module (and thus no longer configurable in file `modules.cfg'). + - Emboldening of bitmaps didn't work correctly sometimes, showing + various artifacts (bug introduced in version 2.8.1). + - Use of the `freetype-config' script to get compilation and linking options is deprecated since it doesn't support cross-compiling, among other deficiencies. Instead, you should @@ -29,6 +32,17 @@ CHANGES BETWEEN 2.9 and 2.9.1 `--enable-freetype-config' is provided that reverts this decision. + - The auto-hinter script ranges have been updated for Unicode 11. + No support for new scripts have been added, however, with the + exception of Georgian Mtavruli. + + - Support for cmake has been improved. + + - The next release will remove support for Position Independent + Code as needed by systems that prohibit automatic address + fixups, such as BREW. [Compilation with modern compilers that + use flags like `-fPIC' or `-fPIE' is not affected.] + ====================================================================== diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT index b0d25b54f..377415702 100644 --- a/docs/VERSIONS.TXT +++ b/docs/VERSIONS.TXT @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.9.1 22.1.16 6.16.1 2.9.0 22.0.16 6.16.0 2.8.1 21.0.15 6.15.0 2.8.0 20.0.14 6.14.0 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index e060dcbd1..164b8ffa0 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "January 2018" "FreeType 2.9" +.TH FREETYPE-CONFIG 1 "May 2018" "FreeType 2.9.1" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 008335cfa..96644046e 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4557,7 +4557,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 9 -#define FREETYPE_PATCH 0 +#define FREETYPE_PATCH 1 /*************************************************************************/ diff --git a/include/freetype/ftgasp.h b/include/freetype/ftgasp.h index 9b54fc86a..fc1248ff4 100644 --- a/include/freetype/ftgasp.h +++ b/include/freetype/ftgasp.h @@ -29,6 +29,9 @@ #endif +FT_BEGIN_HEADER + + /*************************************************************************** * * @section: @@ -131,6 +134,8 @@ /* */ +FT_END_HEADER + #endif /* FTGASP_H_ */ diff --git a/src/base/ftver.rc b/src/base/ftver.rc index cdff99f7f..a2903d588 100644 --- a/src/base/ftver.rc +++ b/src/base/ftver.rc @@ -18,8 +18,8 @@ #include -#define FT_VERSION 2,9,0,0 -#define FT_VERSION_STR "2.9.0" +#define FT_VERSION 2,9,1,0 +#define FT_VERSION_STR "2.9.1" VS_VERSION_INFO VERSIONINFO FILEVERSION FT_VERSION