From 25b7da5348829cd2bee26543c981d56a7960d756 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 19 Jun 2013 10:23:36 +0200 Subject: [PATCH] * Version 2.5.0 released. ========================= Tag sources with `VER-2-5-0'. * docs/VERSION.DLL: Update documentation and bump version number to 2.5.0. * README, Jamfile (RefDoc), builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj, builds/win32/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.4.12/2.5.0/, s/2412/250/. * include/freetype/freetype.h (FREETYPE_MINOR): Set to 5. (FREETYPE_PATCH): Set to 0. * builds/unix/configure.raw (version_info): Set to 16:2:10. * src/base/ftobjs.c (FT_Open_Face): Pacify compiler. * src/truetype/ttinterp.c (Ins_MSIRP, Ins_MIRP): Ditto. --- ChangeLog | 33 ++++++++++ Jamfile | 2 +- README | 10 +-- builds/unix/configure.raw | 2 +- builds/win32/vc2005/freetype.vcproj | 12 ++-- builds/win32/vc2005/index.html | 10 +-- builds/win32/vc2008/freetype.vcproj | 12 ++-- builds/win32/vc2008/index.html | 10 +-- builds/win32/vc2010/freetype.vcxproj | 12 ++-- builds/win32/vc2010/index.html | 10 +-- builds/win32/visualc/freetype.dsp | 20 +++--- builds/win32/visualc/freetype.vcproj | 12 ++-- builds/win32/visualc/index.html | 10 +-- builds/win32/visualce/freetype.dsp | 20 +++--- builds/win32/visualce/freetype.vcproj | 84 +++++++++++++------------- builds/win32/visualce/index.html | 10 +-- builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2005-ce/index.html | 10 +-- builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2008-ce/index.html | 10 +-- docs/VERSION.DLL | 1 + include/freetype/freetype.h | 4 +- src/base/ftobjs.c | 4 +- src/truetype/ttinterp.c | 6 +- 24 files changed, 245 insertions(+), 211 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05ee1cbce..162b274f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2013-06-19 Werner Lemberg + + * Version 2.5.0 released. + ========================= + + + Tag sources with `VER-2-5-0'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.5.0. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/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.4.12/2.5.0/, s/2412/250/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 5. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 16:2:10. + + * src/base/ftobjs.c (FT_Open_Face): Pacify compiler. + * src/truetype/ttinterp.c (Ins_MSIRP, Ins_MIRP): Ditto. + 2013-06-18 Werner Lemberg Fix Savannah bug #39269. diff --git a/Jamfile b/Jamfile index 716ee596c..2fec5f106 100644 --- a/Jamfile +++ b/Jamfile @@ -195,7 +195,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.12 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index c4feb1a24..798715a41 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.4.12 - =============== + FreeType 2.5.0 + ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.4.12.tar.bz2 - freetype-doc-2.4.12.tar.gz - ftdoc2412.zip + freetype-doc-2.5.0.tar.bz2 + freetype-doc-2.5.0.tar.gz + ftdoc250.zip To view the documentation online, go to diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 51e0c360a..6a6edc715 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='16:1:10' +version_info='16:2:10' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj index 43f81c887..a7da85a46 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/builds/win32/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/win32/vc2005/index.html b/builds/win32/vc2005/index.html index 236055c78..788b83020 100644 --- a/builds/win32/vc2005/index.html +++ b/builds/win32/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.4.12 sources:

+compiles the following libraries from the FreeType 2.5.0 sources:

    -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
    + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj index a4c7d855a..bd76a2968 100644 --- a/builds/win32/vc2008/freetype.vcproj +++ b/builds/win32/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.4.12 sources:

+compiles the following libraries from the FreeType 2.5.0 sources:

    -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
    + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/win32/vc2010/freetype.vcxproj index 30c8a2490..5c85da932 100644 --- a/builds/win32/vc2010/freetype.vcxproj +++ b/builds/win32/vc2010/freetype.vcxproj @@ -95,12 +95,12 @@ AllRules.ruleset - freetype2412_D - freetype2412MT_D - freetype2412ST_D - freetype2412 - freetype2412MT - freetype2412ST + freetype250_D + freetype250MT_D + freetype250ST_D + freetype250 + freetype250MT + freetype250ST diff --git a/builds/win32/vc2010/index.html b/builds/win32/vc2010/index.html index a7f4dbd4b..caceac116 100644 --- a/builds/win32/vc2010/index.html +++ b/builds/win32/vc2010/index.html @@ -11,14 +11,14 @@

This directory contains a project file for Visual C++, named freetype.vcxproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.12 sources:

+compiles the following libraries from the FreeType 2.5.0 sources:

    -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
    + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index cd1ca72bf..516e47f3c 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/win32/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\freetype2412.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.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\freetype2412_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_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\freetype2412_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_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\freetype2412.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.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\freetype2412.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2412ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype250ST.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\freetype2412_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index d150f0c25..dc5e67ad4 100644 --- a/builds/win32/visualc/freetype.vcproj +++ b/builds/win32/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.4.12 sources:

+compiles the following libraries from the FreeType 2.5.0 sources:

    -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
    + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp index cd1ca72bf..516e47f3c 100644 --- a/builds/win32/visualce/freetype.dsp +++ b/builds/win32/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\freetype2412.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.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\freetype2412_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_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\freetype2412_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_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\freetype2412.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.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\freetype2412.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype2412ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype250ST.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\freetype2412_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2412ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 95c9afb7d..88f51679b 100644 --- a/builds/win32/visualce/freetype.vcproj +++ b/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.12 sources:

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

    -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
    + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_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/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index 4521b82b7..f7e022e77 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 533ce0416..db5385356 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.4.12 sources:

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

      -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
      + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_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 54981a010..7920751a3 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.4.12 sources:

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

      -    freetype2412.lib     - release build; single threaded
-    freetype2412_D.lib   - debug build;   single threaded
-    freetype2412MT.lib   - release build; multi-threaded
-    freetype2412MT_D.lib - debug build;   multi-threaded
      + freetype250.lib - release build; single threaded + freetype250_D.lib - debug build; single threaded + freetype250MT.lib - release build; multi-threaded + freetype250MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index e119d4243..2d1cc9acf 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.5.0 16.2.10 6.10.2 2.4.12 16.1.10 6.10.1 2.4.11 16.0.10 6.10.0 2.4.10 15.0.9 6.9.0 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 28aef9762..fe46d2297 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3900,8 +3900,8 @@ FT_BEGIN_HEADER * */ #define FREETYPE_MAJOR 2 -#define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 12 +#define FREETYPE_MINOR 5 +#define FREETYPE_PATCH 0 /*************************************************************************/ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index e9a2981b4..157bf4563 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2024,8 +2024,8 @@ FT_Face *aface ) { FT_Error error; - FT_Driver driver; - FT_Memory memory; + FT_Driver driver = NULL; + FT_Memory memory = NULL; FT_Stream stream = NULL; FT_Face face = NULL; FT_ListNode node = NULL; diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 798d4a9b3..e7ffb987c 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -6173,7 +6173,7 @@ FT_F26Dot6 distance; #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING - FT_F26Dot6 control_value_cutin; + FT_F26Dot6 control_value_cutin = 0; /* pacify compiler */ if ( SUBPIXEL_HINTING ) @@ -6542,8 +6542,8 @@ control_value_cutin, minimum_distance; #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING - FT_Int B1; - FT_Int B2; + FT_Int B1 = 0; /* pacify compiler */ + FT_Int B2 = 0; FT_Bool reverse_move = FALSE; #endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */