From a617fb6de7fec88861bd54ae13f52ad50f38d72f Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 19 Nov 2011 11:32:47 +0000 Subject: Update to freetype 2.4.8. Security update fixing CVE-2011-3439 --- lib/freetype/ChangeLog | 106 ++++- lib/freetype/Jamfile | 2 +- lib/freetype/Makefile | 4 +- lib/freetype/README | 12 +- lib/freetype/builds/unix/configure.ac | 4 +- lib/freetype/builds/unix/configure.raw | 2 +- lib/freetype/builds/win32/vc2005/freetype.vcproj | 12 +- lib/freetype/builds/win32/vc2005/index.html | 10 +- lib/freetype/builds/win32/vc2008/freetype.vcproj | 12 +- lib/freetype/builds/win32/vc2008/index.html | 10 +- lib/freetype/builds/win32/vc2010/freetype.vcxproj | 12 +- lib/freetype/builds/win32/vc2010/index.html | 10 +- lib/freetype/builds/win32/visualc/freetype.dsp | 20 +- lib/freetype/builds/win32/visualc/freetype.vcproj | 12 +- lib/freetype/builds/win32/visualc/index.html | 10 +- lib/freetype/builds/win32/visualce/freetype.dsp | 20 +- lib/freetype/builds/win32/visualce/freetype.vcproj | 84 ++-- lib/freetype/builds/win32/visualce/index.html | 10 +- .../builds/wince/vc2005-ce/freetype.vcproj | 76 ++-- lib/freetype/builds/wince/vc2005-ce/index.html | 10 +- .../builds/wince/vc2008-ce/freetype.vcproj | 76 ++-- lib/freetype/builds/wince/vc2008-ce/index.html | 10 +- lib/freetype/docs/CHANGES | 18 + lib/freetype/docs/VERSION.DLL | 1 + .../docs/reference/ft2-base_interface.html | 4 +- lib/freetype/docs/reference/ft2-basic_types.html | 4 +- lib/freetype/docs/reference/ft2-bdf_fonts.html | 4 +- .../docs/reference/ft2-bitmap_handling.html | 4 +- lib/freetype/docs/reference/ft2-bzip2.html | 4 +- .../docs/reference/ft2-cache_subsystem.html | 4 +- lib/freetype/docs/reference/ft2-cid_fonts.html | 4 +- lib/freetype/docs/reference/ft2-computations.html | 4 +- lib/freetype/docs/reference/ft2-font_formats.html | 4 +- lib/freetype/docs/reference/ft2-gasp_table.html | 4 +- .../docs/reference/ft2-glyph_management.html | 4 +- lib/freetype/docs/reference/ft2-glyph_stroker.html | 4 +- .../docs/reference/ft2-glyph_variants.html | 4 +- lib/freetype/docs/reference/ft2-gx_validation.html | 4 +- lib/freetype/docs/reference/ft2-gzip.html | 4 +- .../docs/reference/ft2-header_file_macros.html | 4 +- lib/freetype/docs/reference/ft2-incremental.html | 4 +- lib/freetype/docs/reference/ft2-index.html | 491 +++++++++++---------- lib/freetype/docs/reference/ft2-lcd_filtering.html | 4 +- .../docs/reference/ft2-list_processing.html | 4 +- lib/freetype/docs/reference/ft2-lzw.html | 4 +- lib/freetype/docs/reference/ft2-mac_specific.html | 4 +- .../docs/reference/ft2-module_management.html | 4 +- .../docs/reference/ft2-multiple_masters.html | 4 +- lib/freetype/docs/reference/ft2-ot_validation.html | 4 +- .../docs/reference/ft2-outline_processing.html | 4 +- lib/freetype/docs/reference/ft2-pfr_fonts.html | 4 +- lib/freetype/docs/reference/ft2-quick_advance.html | 4 +- lib/freetype/docs/reference/ft2-raster.html | 4 +- lib/freetype/docs/reference/ft2-sfnt_names.html | 4 +- .../docs/reference/ft2-sizes_management.html | 4 +- .../docs/reference/ft2-system_interface.html | 4 +- lib/freetype/docs/reference/ft2-toc.html | 6 +- .../docs/reference/ft2-truetype_engine.html | 4 +- .../docs/reference/ft2-truetype_tables.html | 4 +- lib/freetype/docs/reference/ft2-type1_tables.html | 181 +++++++- .../docs/reference/ft2-user_allocation.html | 4 +- lib/freetype/docs/reference/ft2-version.html | 6 +- lib/freetype/docs/reference/ft2-winfnt_fonts.html | 4 +- lib/freetype/include/freetype/freetype.h | 2 +- .../include/freetype/internal/services/svpsinfo.h | 19 +- lib/freetype/include/freetype/internal/t1types.h | 13 +- lib/freetype/include/freetype/t1tables.h | 162 ++++++- lib/freetype/shlib_version | 2 +- lib/freetype/src/base/ftbase.h | 5 +- lib/freetype/src/base/ftbitmap.c | 4 +- lib/freetype/src/base/ftrfork.c | 2 + lib/freetype/src/base/fttype1.c | 28 +- lib/freetype/src/cff/cffdrivr.c | 6 +- lib/freetype/src/cid/cidload.c | 26 +- lib/freetype/src/cid/cidriver.c | 5 +- lib/freetype/src/truetype/ttinterp.c | 33 +- lib/freetype/src/type1/t1driver.c | 398 ++++++++++++++++- lib/freetype/src/type42/t42drivr.c | 7 +- 78 files changed, 1495 insertions(+), 584 deletions(-) (limited to 'lib') diff --git a/lib/freetype/ChangeLog b/lib/freetype/ChangeLog index d2eb4d3ef..2aae63dfd 100644 --- a/lib/freetype/ChangeLog +++ b/lib/freetype/ChangeLog @@ -1,3 +1,107 @@ +2011-11-15 Werner Lemberg + + * Version 2.4.8 released. + ========================= + + + Tag sources with `VER-2-4-8'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.8. + + * 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.7/2.4.8/, s/247/248/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 8. + + * builds/unix/configure.raw (version_info): Set to 14:0:8. + +2011-11-13 Chris Liddell + + Add FT_Get_PS_Font_Value() API. + + This allows a Type 1 font face to be interrogated to retrieve most + of the dictionary keys (keys not relevant to FreeType's Type 1 + interpreter are not available). + + * include/freetype/internal/services/svpsinfo.h + (PS_GetFontValueFunc): New typedef. + (PSInfo): Add `ps_get_font_value'. + (FT_DEFINE_SERVICE_PSINFOREC): Updated. + + * include/freetype/internal/t1types.h (T1_EncodingType): Moved to... + * include/freetype/t1tables.h: Here. + (PS_Dict_Keys): New enumeration. + (FT_Get_PS_Font_Value): New declaration. + + * src/base/fttype1.c (FT_Get_PS_Font_Value): New function. + + * src/type1/t1driver.c (t1_ps_get_font_value): This new function + does the real job. + (t1_service_ps_info): Add it. + + * src/cff/cffdrivr.c (cff_service_ps_info), src/cid/cidriver.c + (cid_service_ps_info), src/type42/t42drivr.c (t42_service_ps_info): + Updated. + +2011-11-08 Braden Thomas + + [cid] Various loading fixes. + + * src/cid/cidload.c (cid_load_keyword) , + (parse_font_matrix, parse_expansion_factor): Correctly check number + of dictionaries. + (cid_read_subrs): Protect against invalid values of `num_subrs'. + Assure that the elements of the `offsets' array are ascending. + +2011-11-05 Werner Lemberg + + * README: We use copyright ranges also. + + According to + + http://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html + + this should be mentioned explicitly. + +2011-10-30 suzuki toshiya + + [raccess] Supplement for previous fix. + + * src/base/ftbase.h (raccess_rule_by_darwin_vfs): Do not declare + it on native Mac OS X. + * src/base/ftrfork.c (raccess_get_rule_type_from_rule_index): + Hide raccess_get_rule_type_from_rule_index() on native Mac OS X + too. + +2011-10-30 suzuki toshiya + + [raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X. + + * src/base/ftrfork.c (raccess_rule_by_darwin_vfs): Do not + compile on native Mac OS X because it is not used. + +2011-10-25 Werner Lemberg + + [truetype] Fix MD instruction for twilight zone. + + * src/truetype/ttinterp.c (Ins_MD): Without this fix, the MD + instruction applied to original coordinates of twilight points + always returns zero. + 2011-10-18 Werner Lemberg * Version 2.4.7 released. @@ -25,7 +129,7 @@ builds/wince/vc2008-ce/freetype.vcproj, builds/wince/vc2008-ce/index.html: s/2.4.6/2.4.7/, s/246/247/. - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7. * builds/unix/configure.raw (version_info): Set to 13:2:7. diff --git a/lib/freetype/Jamfile b/lib/freetype/Jamfile index 5614bc75c..eb000d659 100644 --- a/lib/freetype/Jamfile +++ b/lib/freetype/Jamfile @@ -195,7 +195,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.7 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.8 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/lib/freetype/Makefile b/lib/freetype/Makefile index 5f8d61cb3..70b4af7c0 100644 --- a/lib/freetype/Makefile +++ b/lib/freetype/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2011/11/13 22:34:37 matthieu Exp $ +# $OpenBSD: Makefile,v 1.23 2011/11/19 11:32:45 matthieu Exp $ FREETYPESRC= ${.CURDIR}/src -FT_VERSION_INFO= 13.2.7 # Get it from builds/unix/configure.ac +FT_VERSION_INFO= 14.0.8 # Get it from builds/unix/configure.ac .ifmake includes SUBDIR= include diff --git a/lib/freetype/README b/lib/freetype/README index d538f1e56..fdc5e902d 100644 --- a/lib/freetype/README +++ b/lib/freetype/README @@ -1,4 +1,4 @@ - FreeType 2.4.7 + FreeType 2.4.8 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -6,6 +6,10 @@ Read the files `docs/INSTALL' for installation instructions. + See the file `docs/LICENSE.TXT' for the available licenses. Note + that we use ranges (`2008-2010') for copyright years also instead of + listing individual years (`2008, 2009, 2010'). + The FreeType 2 API reference is located in `docs/reference'; use the file `ft2-doc.html' as the top entry point. Additional documentation is available as a separate package from our sites. Go @@ -15,9 +19,9 @@ and download one of the following files. - freetype-doc-2.4.7.tar.bz2 - freetype-doc-2.4.7.tar.gz - ftdoc247.zip + freetype-doc-2.4.8.tar.bz2 + freetype-doc-2.4.8.tar.gz + ftdoc248.zip Bugs diff --git a/lib/freetype/builds/unix/configure.ac b/lib/freetype/builds/unix/configure.ac index f86818d52..e6cdb8e43 100644 --- a/lib/freetype/builds/unix/configure.ac +++ b/lib/freetype/builds/unix/configure.ac @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.4.7], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.4.8], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='13:2:7' +version_info='14:0:8' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/lib/freetype/builds/unix/configure.raw b/lib/freetype/builds/unix/configure.raw index 1e96c91d0..c55748095 100644 --- a/lib/freetype/builds/unix/configure.raw +++ b/lib/freetype/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='13:2:7' +version_info='14:0:8' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/lib/freetype/builds/win32/vc2005/freetype.vcproj b/lib/freetype/builds/win32/vc2005/freetype.vcproj index a4784f526..2319c5a96 100644 --- a/lib/freetype/builds/win32/vc2005/freetype.vcproj +++ b/lib/freetype/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/lib/freetype/builds/win32/vc2005/index.html b/lib/freetype/builds/win32/vc2005/index.html index 133502b31..d21bebd7b 100644 --- a/lib/freetype/builds/win32/vc2005/index.html +++ b/lib/freetype/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.7 sources:

+compiles the following libraries from the FreeType 2.4.8 sources:

    -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
    + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

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

+compiles the following libraries from the FreeType 2.4.8 sources:

    -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
    + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/win32/vc2010/freetype.vcxproj b/lib/freetype/builds/win32/vc2010/freetype.vcxproj index bca681393..d2af831be 100644 --- a/lib/freetype/builds/win32/vc2010/freetype.vcxproj +++ b/lib/freetype/builds/win32/vc2010/freetype.vcxproj @@ -95,12 +95,12 @@ AllRules.ruleset - freetype247_D - freetype247MT_D - freetype247ST_D - freetype247 - freetype247MT - freetype247ST + freetype248_D + freetype248MT_D + freetype248ST_D + freetype248 + freetype248MT + freetype248ST diff --git a/lib/freetype/builds/win32/vc2010/index.html b/lib/freetype/builds/win32/vc2010/index.html index 7d428ae6f..b8e332116 100644 --- a/lib/freetype/builds/win32/vc2010/index.html +++ b/lib/freetype/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.7 sources:

+compiles the following libraries from the FreeType 2.4.8 sources:

    -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
    + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/win32/visualc/freetype.dsp b/lib/freetype/builds/win32/visualc/freetype.dsp index d887dba4b..aae60ef5d 100644 --- a/lib/freetype/builds/win32/visualc/freetype.dsp +++ b/lib/freetype/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\freetype247.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248.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\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248_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\freetype247_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype248_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT_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\freetype247.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype248.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT.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\freetype247.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype247ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype248ST.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\freetype247_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248ST_D.lib" !ENDIF diff --git a/lib/freetype/builds/win32/visualc/freetype.vcproj b/lib/freetype/builds/win32/visualc/freetype.vcproj index f442e9bb3..aae1477ff 100644 --- a/lib/freetype/builds/win32/visualc/freetype.vcproj +++ b/lib/freetype/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.7 sources:

+compiles the following libraries from the FreeType 2.4.8 sources:

    -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
    + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/win32/visualce/freetype.dsp b/lib/freetype/builds/win32/visualce/freetype.dsp index d887dba4b..aae60ef5d 100644 --- a/lib/freetype/builds/win32/visualce/freetype.dsp +++ b/lib/freetype/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\freetype247.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248.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\freetype247_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248_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\freetype247_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype248_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT_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\freetype247.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype248.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248MT.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\freetype247.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype247ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype248ST.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\freetype247_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype248_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype248ST_D.lib" !ENDIF diff --git a/lib/freetype/builds/win32/visualce/freetype.vcproj b/lib/freetype/builds/win32/visualce/freetype.vcproj index 3c08b0c61..04e236f6b 100644 --- a/lib/freetype/builds/win32/visualce/freetype.vcproj +++ b/lib/freetype/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.7 sources:

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

    -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
    + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj b/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj index c8bba48d4..44757e8ea 100644 --- a/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj +++ b/lib/freetype/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/lib/freetype/builds/wince/vc2005-ce/index.html b/lib/freetype/builds/wince/vc2005-ce/index.html index 963c7c9e1..2731c1c99 100644 --- a/lib/freetype/builds/wince/vc2005-ce/index.html +++ b/lib/freetype/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.7 sources:

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

      -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
      + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj b/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj index 228d77889..53b4707ea 100644 --- a/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj +++ b/lib/freetype/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.7 sources:

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

      -    freetype247.lib     - release build; single threaded
-    freetype247_D.lib   - debug build;   single threaded
-    freetype247MT.lib   - release build; multi-threaded
-    freetype247MT_D.lib - debug build;   multi-threaded
      + freetype248.lib - release build; single threaded + freetype248_D.lib - debug build; single threaded + freetype248MT.lib - release build; multi-threaded + freetype248MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/docs/CHANGES b/lib/freetype/docs/CHANGES index 4cb3cf60c..a63061e11 100644 --- a/lib/freetype/docs/CHANGES +++ b/lib/freetype/docs/CHANGES @@ -1,3 +1,20 @@ + +CHANGES BETWEEN 2.4.7 and 2.4.8 + + I. IMPORTANT BUG FIXES + + - Some vulnerabilities in handling CID-keyed PostScript fonts have + been fixed; see CVE-2011-3439. + + + II. MISCELLANEOUS + + - Chris Liddell contributed a new API, `FT_Get_PS_Font_Value', to + retrieve most of the dictionary keys in Type 1 fonts. + + +====================================================================== + CHANGES BETWEEN 2.4.6 and 2.4.7 I. IMPORTANT BUG FIXES @@ -5,6 +22,7 @@ CHANGES BETWEEN 2.4.6 and 2.4.7 - Some vulnerabilities in handling Type 1 fonts have been fixed; see CVE-2011-3256. + II. MISCELLANEOUS - FreeType now properly handles ZapfDingbats glyph names while diff --git a/lib/freetype/docs/VERSION.DLL b/lib/freetype/docs/VERSION.DLL index 2dd8eadb3..044f6b87d 100644 --- a/lib/freetype/docs/VERSION.DLL +++ b/lib/freetype/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.4.8 14.0.8 6.8.0 2.4.7 13.2.7 6.7.2 2.4.6 13.1.7 6.7.1 2.4.5 13.0.7 6.7.0 diff --git a/lib/freetype/docs/reference/ft2-base_interface.html b/lib/freetype/docs/reference/ft2-base_interface.html index 6721d7825..ab5540c9d 100644 --- a/lib/freetype/docs/reference/ft2-base_interface.html +++ b/lib/freetype/docs/reference/ft2-base_interface.html @@ -3,7 +3,7 @@ -FreeType-2.4.7 API Reference +FreeType-2.4.8 API Reference