diff --git a/CMakeLists.txt b/CMakeLists.txt index edb116bbb..6631fdeb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,8 @@ if (BUILD_FRAMEWORK) endif () set(VERSION_MAJOR "2") -set(VERSION_MINOR "5") -set(VERSION_PATCH "5") +set(VERSION_MINOR "6") +set(VERSION_PATCH "0") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) # Compiler definitions for building the library diff --git a/ChangeLog b/ChangeLog index 97456dce4..fea19b939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +2015-06-07 Werner Lemberg + + * Version 2.6 released. + ======================= + + + Tag sources with `VER-2-6'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.6. + + * 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.5.5/2.6/, s/255/26/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 6. + (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. + + * src/autofit/afmodule.c [!FT_MAKE_OPTION_SINGLE_OBJECT]: Add + declarations for dumping functions. + + * src/truetype/ttinterp.c (TT_New_Context): Pacify compiler. + + * builds/toplevel.mk: Use `freetype.mk's code to compute the version + string. + Don't include a zero patch level in version string. + * builds/freetype.mk: Remove code for computing the version string. + 2015-06-06 Ashish Azad Fix Savannah bug #45260. diff --git a/Jamfile b/Jamfile index e96bedee5..61fa01838 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.5.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.6 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h } RefDoc refdoc ; diff --git a/README b/README index 706cd9a3f..ff2074514 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.5.5 - ============== + FreeType 2.6 + ============ Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.5.5.tar.bz2 - freetype-doc-2.5.5.tar.gz - ftdoc255.zip + freetype-doc-2.6.tar.bz2 + freetype-doc-2.6.tar.gz + ftdoc26.zip To view the documentation online, go to diff --git a/builds/freetype.mk b/builds/freetype.mk index 8c2f3535d..5ea13f058 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -271,29 +271,6 @@ objects: $(OBJECTS_LIST) library: $(PROJECT_LIBRARY) -ifneq ($(findstring refdoc,$(MAKECMDGOALS)),) - # poor man's `sed' emulation with make's built-in string functions - work := $(strip $(shell $(CAT) $(PUBLIC_DIR)/freetype.h)) - work := $(subst |,x,$(work)) - work := $(subst $(space),|,$(work)) - work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) - work := $(word 2,$(work)) - major := $(subst |,$(space),$(work)) - major := $(firstword $(major)) - - work := $(subst \#define|FREETYPE_MINOR|,$(space),$(work)) - work := $(word 2,$(work)) - minor := $(subst |,$(space),$(work)) - minor := $(firstword $(minor)) - - work := $(subst \#define|FREETYPE_PATCH|,$(space),$(work)) - work := $(word 2,$(work)) - patch := $(subst |,$(space),$(work)) - patch := $(firstword $(patch)) - - version := $(major).$(minor).$(patch) -endif - # Option `-B' disables generation of .pyc files (available since python 2.6) # refdoc: diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 7716068a5..9fe364db5 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -169,23 +169,41 @@ modules: include $(TOP_DIR)/builds/modules.mk +# get FreeType version string, using a +# poor man's `sed' emulation with make's built-in string functions +# +work := $(strip $(shell $(CAT) $(TOP_DIR)/include/freetype.h)) +work := $(subst |,x,$(work)) +work := $(subst $(space),|,$(work)) +work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work)) +work := $(word 2,$(work)) +major := $(subst |,$(space),$(work)) +major := $(firstword $(major)) + +work := $(subst \#define|FREETYPE_MINOR|,$(space),$(work)) +work := $(word 2,$(work)) +minor := $(subst |,$(space),$(work)) +minor := $(firstword $(minor)) + +work := $(subst \#define|FREETYPE_PATCH|,$(space),$(work)) +work := $(word 2,$(work)) +patch := $(subst |,$(space),$(work)) +patch := $(firstword $(patch)) + +ifneq ($(findstring x0x,x$(patch)x),) + version := $(major).$(minor) + winversion := $(major)$(minor) +else + version := $(major).$(minor).$(patch) + winversion := $(major)$(minor)$(patch) +endif + + # This target builds the tarballs. # # Not to be run by a normal user -- there are no attempts to make it # generic. -# we check for `dist', not `distclean' -ifneq ($(findstring distx,$(MAKECMDGOALS)x),) - FT_H := include/freetype.h - - major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) - minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) - patch := $(shell sed -n 's/.*FREETYPE_PATCH[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H)) - - version := $(major).$(minor).$(patch) - winversion := $(major)$(minor)$(patch) -endif - dist: -rm -rf tmp rm -f freetype-$(version).tar.gz diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 5d11598ab..b828bf095 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='17:4:11' +version_info='18:0:12' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index b037ab494..f6d459f2e 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -351,8 +351,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /*
*/ - /* miscellaneous */ + /* miscellaneous */ /* */ /*************************************************************************/ diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index c809be614..eff898f36 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -294,8 +294,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /*
*/ - /* miscellaneous */ + /* miscellaneous */ /* */ /*************************************************************************/ diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index 2345df47b..a1993b4e6 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 e2160f687..a8e92d700 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.5.5 sources:

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

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    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 ad0e695a0..4faf5b400 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.5.5 sources:

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

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    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 b57965ca8..eb52ab556 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 4929dcdd0..7d47e39a4 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.5.5 sources:

    +compiles the following libraries from the FreeType 2.6 sources:

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    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 8ce4316f9..738fe7ccf 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.5.5 sources:

    +compiles the following libraries from the FreeType 2.6 sources:

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 640b4a080..3fa8cd2d0 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype255d - freetype255d - freetype255MTd - freetype255MTd - freetype255STd - freetype255STd - freetype255 - freetype255 - freetype255MT - freetype255MT - freetype255ST - freetype255ST + freetype26d + freetype26d + freetype26MTd + freetype26MTd + freetype26STd + freetype26STd + freetype26 + freetype26 + freetype26MT + freetype26MT + freetype26ST + freetype26ST diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index cb205aa70..37e642d3f 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.5.5 sources:

    +FreeType 2.6 sources:

      -freetype255.lib     - release build
-freetype255d.lib    - debug build
-freetype255ST.lib   - release build; single threaded
-freetype255STd.lib  - debug build;   single threaded
-freetype255MT.lib   - release build; multi-threaded
-freetype255MTd.lib  - debug build;   multi-threaded
      +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

    Both Win32 and x64 builds are supported.

    diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index fa5c52b5a..6f0310538 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\freetype255.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26.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\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26_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\freetype255_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_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\freetype255.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype26.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.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\freetype255.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype26ST.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\freetype255_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 8edb3ad67..f43496494 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.5.5 sources:

    +compiles the following libraries from the FreeType 2.6 sources:

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    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 fa5c52b5a..6f0310538 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\freetype255.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26.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\freetype255_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26_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\freetype255_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_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\freetype255.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype26.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.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\freetype255.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype255ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype26ST.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\freetype255_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype255ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index 137a02281..69a9e97e8 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.5.5 sources:

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

      -    freetype255.lib     - release build; single threaded
-    freetype255_D.lib   - debug build;   single threaded
-    freetype255MT.lib   - release build; multi-threaded
-    freetype255MT_D.lib - debug build;   multi-threaded
      + 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

    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 dcc457921..f219c9ac9 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.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 2.5.3 17.2.11 6.11.2 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 7b4a118f3..cdab34b51 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.5" +.TH FREETYPE-CONFIG 1 "June 2015" "FreeType 2.6" . . .SH NAME diff --git a/include/config/ftconfig.h b/include/config/ftconfig.h index c89f709b3..086db76ab 100644 --- a/include/config/ftconfig.h +++ b/include/config/ftconfig.h @@ -321,8 +321,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /*

    */ - /* miscellaneous */ + /* miscellaneous */ /* */ /*************************************************************************/ diff --git a/include/freetype.h b/include/freetype.h index 807868595..bca93e5b8 100644 --- a/include/freetype.h +++ b/include/freetype.h @@ -3957,8 +3957,8 @@ FT_BEGIN_HEADER * */ #define FREETYPE_MAJOR 2 -#define FREETYPE_MINOR 5 -#define FREETYPE_PATCH 5 +#define FREETYPE_MINOR 6 +#define FREETYPE_PATCH 0 /*************************************************************************/ diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index e0cf99440..8ae425c00 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -23,6 +23,19 @@ #include "afpic.h" #ifdef FT_DEBUG_AUTOFIT + +#ifndef FT_MAKE_OPTION_SINGLE_OBJECT + extern void + af_glyph_hints_dump_segments( AF_GlyphHints hints, + FT_Bool to_stdout ); + extern void + af_glyph_hints_dump_points( AF_GlyphHints hints, + FT_Bool to_stdout ); + extern void + af_glyph_hints_dump_edges( AF_GlyphHints hints, + FT_Bool to_stdout ); +#endif + int _af_debug_disable_horz_hints; int _af_debug_disable_vert_hints; int _af_debug_disable_blue_hints; diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 06e96c883..089f604b5 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -611,7 +611,7 @@ FT_Memory memory; FT_Error error; - TT_ExecContext exec; + TT_ExecContext exec = NULL; if ( !driver )