diff --git a/CMakeLists.txt b/CMakeLists.txt index e226ce4dc..e3ffb83ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,7 @@ project(freetype C) set(VERSION_MAJOR "2") set(VERSION_MINOR "10") -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 1f74fdc2f..6450a60be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2019-07-01 Werner Lemberg + + * Version 2.10.1 released. + ========================== + + + Tag sources with `VER-2-10-1'. + + * docs/VERSION.TXT: Add entry for version 2.10.1. + + * README, Jamfile (RefDoc), src/base/ftver.rc, + 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.10.0/2.10.1/, s/2100/2101/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. + + * builds/unix/configure.raw (version_info): Set to 23:1:17. + * CMakeLists.txt (VERSION_PATCH): Set to 1. + + * include/freetype/fterrors.h (FT_Error_String): Fix C++ compilation. + 2019-06-26 Alexei Podtelezhnikov * src/bdf/bdfdrivr.c (bdf_cmap_char_{index,next}): Fix inequality. diff --git a/Jamfile b/Jamfile index 7e3c98226..37b4d58c7 100644 --- a/Jamfile +++ b/Jamfile @@ -210,7 +210,7 @@ actions RefDoc { python -m docwriter --prefix=ft2 - --title=FreeType-2.10.0 + --title=FreeType-2.10.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index f0b07dba1..8f3e2bc03 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - FreeType 2.10.0 + FreeType 2.10.1 =============== Homepage: https://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.10.0.tar.xz - freetype-doc-2.10.0.tar.gz - ftdoc2100.zip + freetype-doc-2.10.1.tar.xz + freetype-doc-2.10.1.tar.gz + ftdoc2101.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index acefa119a..a1a6dbeb2 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='23:0:17' +version_info='23:1:17' 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 c91837153..de556aaf6 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 76f56cf46..16a10625d 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.10.0 sources:

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

      -    freetype2100.lib     - release build; single threaded
-    freetype2100_D.lib   - debug build;   single threaded
-    freetype2100MT.lib   - release build; multi-threaded
-    freetype2100MT_D.lib - debug build;   multi-threaded
      + freetype2101.lib - release build; single threaded + freetype2101_D.lib - debug build; single threaded + freetype2101MT.lib - release build; multi-threaded + freetype2101MT_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 a0ec3185f..f9479daeb 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.10.0 sources:

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

      -    freetype2100.lib     - release build; single threaded
-    freetype2100_D.lib   - debug build;   single threaded
-    freetype2100MT.lib   - release build; multi-threaded
-    freetype2100MT_D.lib - debug build;   multi-threaded
      + freetype2101.lib - release build; single threaded + freetype2101_D.lib - debug build; single threaded + freetype2101MT.lib - release build; multi-threaded + freetype2101MT_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 0fe294d6e..eed4dd330 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.10.0 sources:

    +from the FreeType 2.10.1 sources:

    • freetype.dll using 'Release' or 'Debug' configurations
      • diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html index 52ba9cd04..423244ad3 100644 --- a/builds/windows/visualc/index.html +++ b/builds/windows/visualc/index.html @@ -12,7 +12,7 @@

      This directory contains project files freetype.dsp for Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002 through 2008, which you might need to upgrade automatically. -It compiles the following libraries from the FreeType 2.10.0 sources:

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

      • freetype.dll using 'Release' or 'Debug' configurations
        • diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 2ac17d6b5..cb1205d79 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\freetype2100.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101.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\freetype2100_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101_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\freetype2100_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2101_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT_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\freetype2100.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2101.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101MT.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\freetype2100.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2100ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2101ST.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\freetype2100_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2101_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2101ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index d1ae64b16..96b51e900 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.10.0 sources:

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

        -    freetype2100.lib     - release build; single threaded
-    freetype2100_D.lib   - debug build;   single threaded
-    freetype2100MT.lib   - release build; multi-threaded
-    freetype2100MT_D.lib - debug build;   multi-threaded
        + freetype2101.lib - release build; single threaded + freetype2101_D.lib - debug build; single threaded + freetype2101MT.lib - release build; multi-threaded + freetype2101MT_D.lib - debug build; multi-threaded

      Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT index e8154bc51..5cdf3785c 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.10.1 23.1.17 6.17.1 2.10.0 23.0.17 6.17.0 2.9.1 22.1.16 6.16.1 2.9.0 22.0.16 6.16.0 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 98d1ca115..96ff0f28b 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "March 2019" "FreeType 2.10.0" +.TH FREETYPE-CONFIG 1 "July 2019" "FreeType 2.10.1" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 2f7863c4c..a6bb667e3 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4781,7 +4781,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 10 -#define FREETYPE_PATCH 0 +#define FREETYPE_PATCH 1 /************************************************************************** diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h index 58f5a3ead..2b47eb209 100644 --- a/include/freetype/fterrors.h +++ b/include/freetype/fterrors.h @@ -244,6 +244,8 @@ #define FT_ERR_PROTOS_DEFINED +FT_BEGIN_HEADER + /************************************************************************** * * @function: @@ -274,6 +276,8 @@ FT_EXPORT( const char* ) FT_Error_String( FT_Error error_code ); +FT_END_HEADER + #endif /* FT_ERR_PROTOS_DEFINED */ diff --git a/src/base/ftver.rc b/src/base/ftver.rc index e02a88652..135449742 100644 --- a/src/base/ftver.rc +++ b/src/base/ftver.rc @@ -18,8 +18,8 @@ #include -#define FT_VERSION 2,10,0,0 -#define FT_VERSION_STR "2.10.0" +#define FT_VERSION 2,10,1,0 +#define FT_VERSION_STR "2.10.1" VS_VERSION_INFO VERSIONINFO FILEVERSION FT_VERSION diff --git a/src/gzip/infblock.c b/src/gzip/infblock.c index 64a7da124..2b4f0c2b5 100644 --- a/src/gzip/infblock.c +++ b/src/gzip/infblock.c @@ -235,6 +235,7 @@ int r ) s->sub.trees.index = 0; Tracev((stderr, "inflate: table sizes ok\n")); s->mode = BTREE; + /* fall through */ case BTREE: while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10)) { @@ -260,6 +261,7 @@ int r ) s->sub.trees.index = 0; Tracev((stderr, "inflate: bits tree ok\n")); s->mode = DTREE; + /* fall through */ case DTREE: while (t = s->sub.trees.table, s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))