* Version 2.3.6 released.
=========================
Tag sources with `VER-2-3-6'.
* docs/CHANGES, docs/VERSION.DLL: Update documentation and bump
version number to 2.3.6.
* 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.5/2.3.6/, s/235/236/.
* include/freetype/freetype.h (FREETYPE_PATCH): Set to 6.
* builds/unix/configure.raw (version_info): Set to 9:17:3.
* include/freetype/internal/psaux.h (T1_BuilderRec): Remove `scale_x'
and `scale_y'.
* src/cff/cffgload.h (CFF_Builder): Remove `scale_x' and `scale_y'.
* src/cff/cffparse.c: Include FT_INTERNAL_DEBUG_H.
* src/cff/cffobjs.h: Include FT_INTERNAL_POSTSCRIPT_HINTS_H.
diff --git a/ChangeLog b/ChangeLog
index 671862c..8096136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
2008-06-10 Werner Lemberg <wl@gnu.org>
+ * Version 2.3.6 released.
+ =========================
+
+
+ Tag sources with `VER-2-3-6'.
+
+ * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump
+ version number to 2.3.6.
+
+ * 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.5/2.3.6/, s/235/236/.
+
+ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6.
+
+ * builds/unix/configure.raw (version_info): Set to 9:17:3.
+
+
+ * include/freetype/internal/psaux.h (T1_BuilderRec): Remove `scale_x'
+ and `scale_y'.
+ * src/cff/cffgload.h (CFF_Builder): Remove `scale_x' and `scale_y'.
+
+
+ * src/cff/cffparse.c: Include FT_INTERNAL_DEBUG_H.
+ * src/cff/cffobjs.h: Include FT_INTERNAL_POSTSCRIPT_HINTS_H.
+
+2008-06-10 Werner Lemberg <wl@gnu.org>
+
* src/base/ftobjs.c (open_face): Check `clazz->init_face' and
`clazz->done_face'.
@@ -532,7 +563,7 @@
2007-11-20 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
- Fix MacOS legacy font support by Masatake Yamato on Mac OS X. It is
+ Fix MacOS legacy font support by Masatake Yamato on Mac OS X. It is
not working since 2.3.5. In FT_Open_New(), if FT_New_Stream()
cannot mmap() the specified file and cannot seek to head of the
specified file, it returns NULL stream and FT_Open_New() returns the
diff --git a/Jamfile b/Jamfile
index ad1341e..eeaad3f 100644
--- a/Jamfile
+++ b/Jamfile
@@ -1,6 +1,6 @@
# FreeType 2 top Jamfile.
#
-# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007 by
+# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -194,7 +194,7 @@
actions RefDoc
{
- 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
+ python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.6 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
}
RefDoc refdoc ;
diff --git a/README b/README
index 82d0003..a6ab092 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@
is called `libttf'. They are *not* compatible!
- FreeType 2.3.5
+ FreeType 2.3.6
==============
Please read the docs/CHANGES file, it contains IMPORTANT
@@ -26,9 +26,9 @@
and download one of the following files.
- freetype-doc-2.3.5.tar.bz2
- freetype-doc-2.3.5.tar.gz
- ftdoc235.zip
+ freetype-doc-2.3.6.tar.bz2
+ freetype-doc-2.3.6.tar.gz
+ ftdoc236.zip
Bugs
@@ -51,7 +51,7 @@
----------------------------------------------------------------------
-Copyright 2006, 2007 by
+Copyright 2006, 2007, 2008 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 1d8a513..26a63c7 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -17,7 +17,7 @@
# Don't forget to update docs/VERSION.DLL!
-version_info='9:16:3'
+version_info='9:17: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 4d83de3..c8b76e8 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@@ -102,8 +102,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype235_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@@ -126,8 +126,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype235.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype236.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@@ -151,8 +151,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype235ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 20455ce..8089110 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -364,7 +364,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html
index d15f60f..d7a6f38 100644
--- a/builds/win32/visualc/index.html
+++ b/builds/win32/visualc/index.html
@@ -11,14 +11,14 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
-compiles the following libraries from the FreeType 2.3.5 sources:</p>
+compiles the following libraries from the FreeType 2.3.6 sources:</p>
<ul>
<pre>
- 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</pre>
+ freetype236.lib - release build; single threaded
+ freetype236_D.lib - debug build; single threaded
+ freetype236MT.lib - release build; multi-threaded
+ freetype236MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>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 4d83de3..c8b76e8 100644
--- a/builds/win32/visualce/freetype.dsp
+++ b/builds/win32/visualce/freetype.dsp
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@@ -102,8 +102,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype235_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@@ -126,8 +126,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype235.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype236.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@@ -151,8 +151,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype235ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib"
# SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@@ -177,8 +177,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype235_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype235ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype236_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj
index c9c1767..109542f 100644
--- a/builds/win32/visualce/freetype.vcproj
+++ b/builds/win32/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -162,7 +162,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -237,7 +237,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -309,7 +309,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -382,7 +382,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -456,7 +456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -534,7 +534,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -619,7 +619,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -704,7 +704,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -785,7 +785,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -867,7 +867,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -950,7 +950,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1036,7 +1036,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1121,7 +1121,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1206,7 +1206,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1369,7 +1369,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1452,7 +1452,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1538,7 +1538,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1623,7 +1623,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1708,7 +1708,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1871,7 +1871,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1954,7 +1954,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2040,7 +2040,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2125,7 +2125,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2210,7 +2210,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2373,7 +2373,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2456,7 +2456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2542,7 +2542,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2627,7 +2627,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2712,7 +2712,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2875,7 +2875,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2958,7 +2958,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3044,7 +3044,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235.lib"
+ OutputFile="..\..\..\objs\freetype236.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3129,7 +3129,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT.lib"
+ OutputFile="..\..\..\objs\freetype236MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3214,7 +3214,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST.lib"
+ OutputFile="..\..\..\objs\freetype236ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235_D.lib"
+ OutputFile="..\..\..\objs\freetype236_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3377,7 +3377,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235ST_D.lib"
+ OutputFile="..\..\..\objs\freetype236ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3460,7 +3460,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype235MT_D.lib"
+ OutputFile="..\..\..\objs\freetype236MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/builds/win32/visualce/index.html b/builds/win32/visualce/index.html
index e133309..39a2ba5 100644
--- a/builds/win32/visualce/index.html
+++ b/builds/win32/visualce/index.html
@@ -21,14 +21,14 @@
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.3.5 sources:</p>
+It compiles the following libraries from the FreeType 2.3.6 sources:</p>
<ul>
<pre>
- 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</pre>
+ freetype236.lib - release build; single threaded
+ freetype236_D.lib - debug build; single threaded
+ freetype236MT.lib - release build; multi-threaded
+ freetype236MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/docs/CHANGES b/docs/CHANGES
index f163b43..8129ec7 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -3,6 +3,9 @@
I. IMPORTANT BUG FIXES
+ - A bunch of potential security problems have been found. All
+ users should update.
+
- Microsoft Unicode cmaps in TrueType fonts are now always
preferred over Apple cmaps. This is not a bug per se, but there
exist some buggy fonts created for MS which have broken Apple
@@ -50,6 +53,11 @@
- Debugging output of the various FT_TRACEX macros is now sent to
stderr.
+ - The `ftview' demo program now provides artificial slanting too.
+
+ - The `ftvalid' demo program has a new option `-f' to select the
+ font index.
+
======================================================================
diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index db8de0e..5275431 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@@ -53,6 +53,7 @@
release libtool so
-------------------------------
+ 2.3.6 9.17.3 6.3.17
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
@@ -118,7 +119,7 @@
------------------------------------------------------------------------
-Copyright 2002, 2003, 2004, 2005, 2006, 2007 by
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index ec28d24..32d5319 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -3601,7 +3601,7 @@
*/
#define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 3
-#define FREETYPE_PATCH 5
+#define FREETYPE_PATCH 6
/*************************************************************************/
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 0e33709..67b7a42 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -564,9 +564,6 @@
FT_Vector last;
- FT_Fixed scale_x; /* obsolete */
- FT_Fixed scale_y; /* obsolete */
-
FT_Pos pos_x;
FT_Pos pos_y;
diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h
index f4f7740..d661f9e 100644
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -90,9 +90,6 @@
FT_Vector last;
- FT_Fixed scale_x; /* obsolete */
- FT_Fixed scale_y; /* obsolete */
-
FT_Pos pos_x;
FT_Pos pos_y;
diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h
index 87bd767..3c81cee 100644
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -25,6 +25,7 @@
#include "cfftypes.h"
#include FT_INTERNAL_TRUETYPE_TYPES_H
#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+#include FT_INTERNAL_POSTSCRIPT_HINTS_H
FT_BEGIN_HEADER
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index ce207bc..d6d77dd 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -19,6 +19,7 @@
#include <ft2build.h>
#include "cffparse.h"
#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_DEBUG_H
#include "cfferrs.h"
