From 3b0e500601a91fa0e8819176f05379c2f8fbbf0f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 3 Jul 2007 04:48:19 +0000 Subject: [PATCH] * src/autofit/aflatin.c (af_latin_metrics_init_blues): Initialize `round' to pacify compiler. Really commit changes which have been used to build release 2.3.5. --- ChangeLog | 31 ++++++++++ Jamfile | 2 +- README | 8 +-- builds/unix/configure.raw | 2 +- 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 ++-- docs/VERSION.DLL | 1 + include/freetype/freetype.h | 2 +- src/autofit/aflatin.c | 2 +- 13 files changed, 118 insertions(+), 86 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bf87f2bc..f8bce0b17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2007-07-03 Werner Lemberg + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Initialize + `round' to pacify compiler. + +2007-07-02 Werner Lemberg + + + * Version 2.3.5 released. + ========================= + + + Tag sources with `VER-2-3-5'. + + * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump + version number to 2.3.5. + + * README, Jamfile (RefDoc), builds/win32/visualc/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualce/index.html, + builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj: s/2.3.4/2.3.5/, s/234/235/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. + + * builds/unix/configure.raw (version_info): Set to 9:16:3. + 2007-07-01 David Turner * include/freetype/freetype.h, src/base/ftpatent.c @@ -553,6 +581,7 @@ 2007-04-09 Werner Lemberg + * Version 2.3.4 released. ========================= @@ -583,6 +612,7 @@ 2007-04-04 Werner Lemberg + * Version 2.3.3 released. ========================= @@ -695,6 +725,7 @@ 2007-03-09 Werner Lemberg + * Version 2.3.2 released. ========================= diff --git a/Jamfile b/Jamfile index 7097a3273..ad1341ed3 100644 --- a/Jamfile +++ b/Jamfile @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.4 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index 59b42ceb0..82d000337 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.3.4 + FreeType 2.3.5 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.3.4.tar.bz2 - freetype-doc-2.3.4.tar.gz - ftdoc234.zip + freetype-doc-2.3.5.tar.bz2 + freetype-doc-2.3.5.tar.gz + ftdoc235.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 1400d741a..413d980c5 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='9:15:3' +version_info='9:16:3' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index 6c3b75063..4d83de346 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\freetype234.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235.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\freetype234_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235_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\freetype234_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype235_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT_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\freetype234.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype235.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT.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\freetype234.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype234ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype235ST.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\freetype234_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index 25f75e949..20455cebe 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.3.4 sources:

+compiles the following libraries from the FreeType 2.3.5 sources:

    -    freetype234.lib     - release build; single threaded
-    freetype234_D.lib   - debug build;   single threaded
-    freetype234MT.lib   - release build; multi-threaded
-    freetype234MT_D.lib - debug build;   multi-threaded
    + freetype235.lib - release build; single threaded + freetype235_D.lib - debug build; single threaded + freetype235MT.lib - release build; multi-threaded + freetype235MT_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 6c3b75063..4d83de346 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\freetype234.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235.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\freetype234_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235_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\freetype234_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype235_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT_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\freetype234.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype235.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT.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\freetype234.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype234ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype235ST.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\freetype234_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype234ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 653be715c..c9c176750 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.3.4 sources:

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

    -    freetype234.lib     - release build; single threaded
-    freetype234_D.lib   - debug build;   single threaded
-    freetype234MT.lib   - release build; multi-threaded
-    freetype234MT_D.lib - debug build;   multi-threaded
    + freetype235.lib - release build; single threaded + freetype235_D.lib - debug build; single threaded + freetype235MT.lib - release build; multi-threaded + freetype235MT_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 4f6f8f92f..db8de0e89 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 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 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 499c913c7..dbca087e5 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3329,7 +3329,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 3 -#define FREETYPE_PATCH 4 +#define FREETYPE_PATCH 5 /*************************************************************************/ diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 2ae9ec5a1..52e952d98 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -197,7 +197,7 @@ FT_UInt glyph_index; FT_Int best_point, best_y, best_first, best_last; FT_Vector* points; - FT_Bool round; + FT_Bool round = 0; AF_LOG(( "'%c'", *p ));