From d783adea42f29bd7917929597ca1031b70587e1d Mon Sep 17 00:00:00 2001
From: marha
Date: Thu, 10 Nov 2011 15:49:48 +0100
Subject: Updated to freetype 2.4.7
---
freetype/ChangeLog | 229 +
freetype/Jamfile | 2 +-
freetype/README | 19 +-
freetype/builds/unix/config.guess | 12 +-
freetype/builds/unix/config.sub | 13 +-
freetype/builds/unix/configure | 20 +-
freetype/builds/unix/configure.ac | 4 +-
freetype/builds/unix/configure.raw | 2 +-
freetype/builds/unix/ftconfig.in | 4 -
freetype/builds/vms/ftconfig.h | 4 -
freetype/builds/win32/vc2005/freetype.vcproj | 12 +-
freetype/builds/win32/vc2005/index.html | 10 +-
freetype/builds/win32/vc2008/freetype.vcproj | 12 +-
freetype/builds/win32/vc2008/index.html | 10 +-
freetype/builds/win32/vc2010/freetype.vcxproj | 12 +-
freetype/builds/win32/vc2010/index.html | 10 +-
freetype/builds/win32/visualc/freetype.dsp | 20 +-
freetype/builds/win32/visualc/freetype.vcproj | 12 +-
freetype/builds/win32/visualc/index.html | 10 +-
freetype/builds/win32/visualce/freetype.dsp | 20 +-
freetype/builds/win32/visualce/freetype.vcproj | 84 +-
freetype/builds/win32/visualce/index.html | 10 +-
freetype/builds/wince/vc2005-ce/freetype.vcproj | 76 +-
freetype/builds/wince/vc2005-ce/index.html | 10 +-
freetype/builds/wince/vc2008-ce/freetype.vcproj | 76 +-
freetype/builds/wince/vc2008-ce/index.html | 10 +-
freetype/docs/CHANGES | 16 +
freetype/docs/INSTALL | 10 +-
freetype/docs/UPGRADE.UNIX | 137 -
freetype/docs/VERSION.DLL | 1 +
freetype/docs/reference/ft2-base_interface.html | 4 +-
freetype/docs/reference/ft2-basic_types.html | 4 +-
freetype/docs/reference/ft2-bdf_fonts.html | 4 +-
freetype/docs/reference/ft2-bitmap_handling.html | 4 +-
freetype/docs/reference/ft2-bzip2.html | 4 +-
freetype/docs/reference/ft2-cache_subsystem.html | 4 +-
freetype/docs/reference/ft2-cid_fonts.html | 4 +-
freetype/docs/reference/ft2-computations.html | 4 +-
freetype/docs/reference/ft2-font_formats.html | 4 +-
freetype/docs/reference/ft2-gasp_table.html | 4 +-
freetype/docs/reference/ft2-glyph_management.html | 4 +-
freetype/docs/reference/ft2-glyph_stroker.html | 4 +-
freetype/docs/reference/ft2-glyph_variants.html | 4 +-
freetype/docs/reference/ft2-gx_validation.html | 4 +-
freetype/docs/reference/ft2-gzip.html | 4 +-
.../docs/reference/ft2-header_file_macros.html | 4 +-
freetype/docs/reference/ft2-incremental.html | 4 +-
freetype/docs/reference/ft2-index.html | 6 +-
freetype/docs/reference/ft2-lcd_filtering.html | 4 +-
freetype/docs/reference/ft2-list_processing.html | 4 +-
freetype/docs/reference/ft2-lzw.html | 4 +-
freetype/docs/reference/ft2-mac_specific.html | 4 +-
freetype/docs/reference/ft2-module_management.html | 4 +-
freetype/docs/reference/ft2-multiple_masters.html | 4 +-
freetype/docs/reference/ft2-ot_validation.html | 4 +-
.../docs/reference/ft2-outline_processing.html | 4 +-
freetype/docs/reference/ft2-pfr_fonts.html | 4 +-
freetype/docs/reference/ft2-quick_advance.html | 4 +-
freetype/docs/reference/ft2-raster.html | 4 +-
freetype/docs/reference/ft2-sfnt_names.html | 4 +-
freetype/docs/reference/ft2-sizes_management.html | 4 +-
freetype/docs/reference/ft2-system_interface.html | 4 +-
freetype/docs/reference/ft2-toc.html | 6 +-
freetype/docs/reference/ft2-truetype_engine.html | 4 +-
freetype/docs/reference/ft2-truetype_tables.html | 4 +-
freetype/docs/reference/ft2-type1_tables.html | 4 +-
freetype/docs/reference/ft2-user_allocation.html | 4 +-
freetype/docs/reference/ft2-version.html | 6 +-
freetype/docs/reference/ft2-winfnt_fonts.html | 4 +-
freetype/include/freetype/config/ftconfig.h | 4 -
freetype/include/freetype/config/ftstdlib.h | 13 +-
freetype/include/freetype/freetype.h | 2 +-
freetype/src/base/ftbitmap.c | 6 +-
freetype/src/base/ftobjs.c | 87 +-
freetype/src/base/ftstroke.c | 10 +-
freetype/src/cff/cffload.c | 9 +-
freetype/src/cff/cffobjs.c | 68 +-
freetype/src/cff/cffparse.c | 353 +-
freetype/src/cff/cffparse.h | 6 +-
freetype/src/cff/cfftoken.h | 114 +-
freetype/src/cff/cfftypes.h | 1 +
freetype/src/gxvalid/gxvmorx2.c | 10 +-
freetype/src/lzw/ftzopen.c | 26 +-
freetype/src/psaux/t1decode.c | 7 +
freetype/src/psnames/pstables.h | 5787 ++++++++++----------
freetype/src/raster/ftrend1.c | 9 +-
freetype/src/smooth/ftgrays.c | 89 +-
freetype/src/tools/glnames.py | 207 +-
freetype/src/truetype/ttgxvar.c | 5 +-
freetype/src/truetype/ttinterp.c | 108 +-
freetype/src/type1/t1load.c | 6 +-
packages.txt | 4 +-
92 files changed, 4333 insertions(+), 3627 deletions(-)
delete mode 100644 freetype/docs/UPGRADE.UNIX
diff --git a/freetype/ChangeLog b/freetype/ChangeLog
index 04394f9ca..d2eb4d3ef 100644
--- a/freetype/ChangeLog
+++ b/freetype/ChangeLog
@@ -1,3 +1,232 @@
+2011-10-18 Werner Lemberg
+
+ * Version 2.4.7 released.
+ =========================
+
+
+ Tag sources with `VER-2-4-7'.
+
+ * docs/CHANGES: Updated.
+
+ * docs/VERSION.DLL: Update documentation and bump version number to
+ 2.4.7.
+
+ * 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.6/2.4.7/, s/246/247/.
+
+ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6.
+
+ * builds/unix/configure.raw (version_info): Set to 13:2:7.
+
+2011-10-15 Kal Conley
+
+ Fix handling of transformations if no renderer is present.
+
+ * src/base/ftobjs.c (FT_Load_Glyph): Thinko.
+
+2011-10-15 Kal Conley
+
+ Fix conditions for autohinting.
+
+ * src/base/ftobjs.c (FT_Load_Glyph): Handle
+ FT_LOAD_IGNORE_TRANSFORM.
+
+2011-10-07 suzuki toshiya
+
+ [gxvalid] Fix a bug to detect too large offset in morx table.
+
+ * src/gxvalid/gxvmorx2.c
+ (gxv_morx_subtable_type2_ligActionIndex_validate): Fix a bug
+ that too large positive offset cannot be detected.
+
+2011-10-01 Braden Thomas
+
+ Handle some border cases.
+
+ * include/freetype/config/ftstdlib.h (FT_USHORT_MAX): New macro.
+
+ * src/base/ftbitmap.c (FT_Bitmap_Convert): Protect against invalid
+ value of `target->rows'.
+
+ * src/psaux/t1decode.c (t1_decoder_parse_charstrings): Add check for
+ flex start.
+
+ * src/raster/ftrend1.c (ft_raster1_render): Check `width' and
+ `height'.
+
+ * src/truetype/ttgxvar.c (TT_Vary_Get_Glyph_Deltas): Protect against
+ invalid values in `localpoints' array.
+
+2011-10-01 Werner Lemberg
+
+ [psnames] Handle zapfdingbats.
+ Problem reported by Nicolas Rougier .
+
+ * src/tools/glnames.py (adobe_glyph_list): Add data from AGL's
+ `zapfdingbats.txt' file.
+
+ * src/psnames/pstables.h: Regenerated.
+
+2011-09-27 Simon Bünzli
+
+ Fix Savannah bug #34189.
+
+ * src/type1/t1load.c (T1_Open_Face): Initialize
+ `face->len_buildchar'.
+
+2011-09-26 Werner Lemberg
+
+ [cff] Dump SIDs while tracing.
+
+ * src/cff/cffobjs.c (cff_face_init): Do it.
+
+ * src/cff/cffparse.c (cff_parser_run) [FT_DEBUG_LEVEL_TRACE]
+ : Identify as SID.
+
+2011-09-17 Werner Lemberg
+
+ Remove unused FT_ALIGNMENT macro.
+
+ * builds/unix/ftconfig.in, builds/vms/ftconfig.h,
+ include/freetype/config/ftconfig.h: Do it.
+
+2011-09-17 Alexei Podtelezhnikov
+
+ [smooth] Slightly optimize conic and cubic flatterners.
+
+ * src/smooth/ftgrays.c (gray_render_conic, gray_render_cubic): Move
+ out some code from the main loop to speed it up.
+
+2011-09-11 Tomas Hoger
+
+ Slightly improve LZW_CLEAR handling.
+
+ * src/lzw/ftzopen.c (ft_lzwstate_io) :
+ Ensure that subsequent (modulo garbage byte(s)) LZW_CLEAR codes are
+ handled as clear codes. This also re-sets old_code and old_char to
+ predictable values, which is a little better than using `random'
+ ones if the code following LZW_CLEAR is invalid.
+
+2011-09-11 Tomas Hoger
+
+ Add explicit LZW decompression stack size limit.
+
+ Stack larger than 1<prefix[code - 256]
+ when traversing prefix table. Such check is less efficient and
+ should not be required if prefix table is constructed correctly in
+ the first place.
+
+ * src/lzw/ftzopen.c (ft_lzwstate_stack_grow): Implement it.
+
+2011-09-11 Tomas Hoger
+
+ Protect against loops in the prefix table.
+
+ LZW decompressor did not sufficiently check codes read from the
+ input LZW stream. A specially-crafted or corrupted input could
+ create a loop in the prefix table, which leads to memory usage
+ spikes, as there's no decompression stack size limit.
+
+ * src/lzw/ftzopen.c (ft_lzwstate_io) : First
+ code in valid LZW stream must be 0..255.
+ : In the special KwKwK case, code == free_ent,
+ code > free_ent is invalid.
+
+2011-09-09 Werner Lemberg
+
+ Better tracing of metrics.
+
+ * src/base/ftobjs.c (FT_Request_Size, FT_Select_Size): Decorate with
+ FT_TRACE.
+
+2011-09-07 Werner Lemberg
+
+ Fix Savannah bug #33816.
+
+ * src/cff/cfftypes.h (CFF_FontRecDictRec): New member
+ `has_font_matrix'.
+ * src/cff/cffparse.c (cff_parse_font_matrix): Set it.
+ Update tracing output.
+ * src/cff/cffobjs.c (cff_face_init): Use it so that the heuristics
+ can be removed.
+
+2011-08-30 Werner Lemberg
+
+ Better tracing of metrics.
+
+ * src/base/ftobjs.c (FT_Select_Metrics, FT_Request_Metrics):
+ Decorate with FT_TRACE.
+
+2011-08-25 Werner Lemberg
+
+ [cff] Better tracing of the parsing process.
+
+ * src/cff/cffload.c (cff_subfont_load, cff_font_load): Decorate with
+ FT_TRACE.
+
+ * src/cff/cffparse.c (cff_parse_font_matrix, cff_parse_font_bbox,
+ cff_parse_private_dict, cff_parse_cid_ros): Updated.
+ (CFF_FIELD_NUM, CFF_FIELD_FIXED, CFF_FIELD_FIXED_1000,
+ CFF_FIELD_STRING, CFF_FIELD_BOOL, CFF_FIELD_CALLBACK, CFF_FIELD,
+ CFF_FIELD_DELTA): Add argument for ID.
+ (cff_parser_run): Decorate with FT_TRACE.
+
+ * src/cff/cffparse.h (CFF_Field_Handler) [FT_DEBUG_LEVEL_TRACE]: Add
+ `id' member.
+
+ * src/cff/cfftoken.h: Add IDs to all fields.
+
+2011-08-16 Werner Lemberg
+
+ Fix Savannah bug #34022.
+
+ * README, docs/INSTALL: Remove references to UPGRADE.UNIX.
+
+2011-08-15 Werner Lemberg
+
+ Fix Savannah bug #34018.
+
+ * docs/UPGRADE.UNIX: Removed. Obsolete.
+
+2011-08-15 David Bevan
+
+ Fix Savannah bug #33992.
+
+ * src/base/ftstroke.c (FT_Stroker_ParseOutline): Fix border case.
+
+2011-08-12 Werner Lemberg
+
+ Fix Savannah bug #33975.
+
+ * src/cff/cffparse.c (cff_parse_font_matrix): Fix typo.
+
2011-07-29 Werner Lemberg
* Version 2.4.6 released.
diff --git a/freetype/Jamfile b/freetype/Jamfile
index 3f4cd5b75..5614bc75c 100644
--- a/freetype/Jamfile
+++ b/freetype/Jamfile
@@ -195,7 +195,7 @@ rule RefDoc
actions RefDoc
{
- python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.6 --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.7 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
}
RefDoc refdoc ;
diff --git a/freetype/README b/freetype/README
index e8cb48057..d538f1e56 100644
--- a/freetype/README
+++ b/freetype/README
@@ -1,15 +1,4 @@
- Special notes to Unix users
- ===========================
-
- Please read the file `docs/UPGRADE.UNIX'. It contains important
- information regarding the installation of FreeType on Unix systems,
- especially GNU based operating systems like GNU/Linux.
-
- FreeType 2's library is called `libfreetype', FreeType 1's library
- is called `libttf'. They are *not* compatible!
-
-
- FreeType 2.4.6
+ FreeType 2.4.7
==============
Please read the docs/CHANGES file, it contains IMPORTANT
@@ -26,9 +15,9 @@
and download one of the following files.
- freetype-doc-2.4.6.tar.bz2
- freetype-doc-2.4.6.tar.gz
- ftdoc246.zip
+ freetype-doc-2.4.7.tar.bz2
+ freetype-doc-2.4.7.tar.gz
+ ftdoc247.zip
Bugs
diff --git a/freetype/builds/unix/config.guess b/freetype/builds/unix/config.guess
index b02565c7b..43f0cdbcf 100644
--- a/freetype/builds/unix/config.guess
+++ b/freetype/builds/unix/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
-timestamp='2011-06-03'
+timestamp='2011-10-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -792,13 +792,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -903,6 +902,9 @@ EOF
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ hexagon:Linux:*:*)
+ echo hexagon-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
LIBC=gnu
eval $set_cc_for_build
diff --git a/freetype/builds/unix/config.sub b/freetype/builds/unix/config.sub
index f9fcdc879..5b8736823 100644
--- a/freetype/builds/unix/config.sub
+++ b/freetype/builds/unix/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011 Free Software Foundation, Inc.
-timestamp='2011-06-03'
+timestamp='2011-10-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -251,13 +251,17 @@ case $basic_machine in
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -357,6 +361,7 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +370,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -813,6 +820,10 @@ case $basic_machine in
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
diff --git a/freetype/builds/unix/configure b/freetype/builds/unix/configure
index 29e99b18d..4368548c7 100644
--- a/freetype/builds/unix/configure
+++ b/freetype/builds/unix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for FreeType 2.4.6.
+# Generated by GNU Autoconf 2.68 for FreeType 2.4.7.
#
# Report bugs to .
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.4.6'
-PACKAGE_STRING='FreeType 2.4.6'
+PACKAGE_VERSION='2.4.7'
+PACKAGE_STRING='FreeType 2.4.7'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -1285,7 +1285,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType 2.4.6 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1350,7 +1350,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.4.6:";;
+ short | recursive ) echo "Configuration of FreeType 2.4.7:";;
esac
cat <<\_ACEOF
@@ -1465,7 +1465,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.4.6
+FreeType configure 2.4.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2058,7 +2058,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.4.6, which was
+It was created by FreeType $as_me 2.4.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2414,7 +2414,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update docs/VERSION.DLL!
-version_info='13:1:7'
+version_info='13:2:7'
ft_version=`echo $version_info | tr : .`
@@ -13247,7 +13247,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType $as_me 2.4.6, which was
+This file was extended by FreeType $as_me 2.4.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13313,7 +13313,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeType config.status 2.4.6
+FreeType config.status 2.4.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/freetype/builds/unix/configure.ac b/freetype/builds/unix/configure.ac
index 24571e8af..f86818d52 100644
--- a/freetype/builds/unix/configure.ac
+++ b/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.6], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.4.7], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
-version_info='13:1:7'
+version_info='13:2:7'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/freetype/builds/unix/configure.raw b/freetype/builds/unix/configure.raw
index 0f4db1523..1e96c91d0 100644
--- a/freetype/builds/unix/configure.raw
+++ b/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:1:7'
+version_info='13:2:7'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/freetype/builds/unix/ftconfig.in b/freetype/builds/unix/ftconfig.in
index 46ef6e1da..fd4a5cd4f 100644
--- a/freetype/builds/unix/ftconfig.in
+++ b/freetype/builds/unix/ftconfig.in
@@ -117,10 +117,6 @@ FT_BEGIN_HEADER
#endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
- /* Preferred alignment of data */
-#define FT_ALIGNMENT 8
-
-
/* FT_UNUSED is a macro used to indicate that a given parameter is not */
/* used -- this is only used to get rid of unpleasant compiler warnings */
#ifndef FT_UNUSED
diff --git a/freetype/builds/vms/ftconfig.h b/freetype/builds/vms/ftconfig.h
index aefb54483..99c37db39 100644
--- a/freetype/builds/vms/ftconfig.h
+++ b/freetype/builds/vms/ftconfig.h
@@ -70,10 +70,6 @@ FT_BEGIN_HEADER
#define FT_CHAR_BIT 8
- /* Preferred alignment of data */
-#define FT_ALIGNMENT 8
-
-
/* FT_UNUSED is a macro used to indicate that a given parameter is not */
/* used -- this is only used to get rid of unpleasant compiler warnings */
#ifndef FT_UNUSED
diff --git a/freetype/builds/win32/vc2005/freetype.vcproj b/freetype/builds/win32/vc2005/freetype.vcproj
index 4728f0320..a4784f526 100644
--- a/freetype/builds/win32/vc2005/freetype.vcproj
+++ b/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/freetype/builds/win32/vc2005/index.html b/freetype/builds/win32/vc2005/index.html
index 7a315b801..133502b31 100644
--- a/freetype/builds/win32/vc2005/index.html
+++ b/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.6 sources:
+compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/win32/vc2008/freetype.vcproj b/freetype/builds/win32/vc2008/freetype.vcproj
index 7dad23118..c8221e511 100644
--- a/freetype/builds/win32/vc2008/freetype.vcproj
+++ b/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.6 sources:
+compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/win32/vc2010/freetype.vcxproj b/freetype/builds/win32/vc2010/freetype.vcxproj
index 15e701589..bca681393 100644
--- a/freetype/builds/win32/vc2010/freetype.vcxproj
+++ b/freetype/builds/win32/vc2010/freetype.vcxproj
@@ -95,12 +95,12 @@
AllRules.ruleset
- freetype246_D
- freetype246MT_D
- freetype246ST_D
- freetype246
- freetype246MT
- freetype246ST
+ freetype247_D
+ freetype247MT_D
+ freetype247ST_D
+ freetype247
+ freetype247MT
+ freetype247ST
diff --git a/freetype/builds/win32/vc2010/index.html b/freetype/builds/win32/vc2010/index.html
index b90836622..7d428ae6f 100644
--- a/freetype/builds/win32/vc2010/index.html
+++ b/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.6 sources:
+compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/win32/visualc/freetype.dsp b/freetype/builds/win32/visualc/freetype.dsp
index 268696760..d887dba4b 100644
--- a/freetype/builds/win32/visualc/freetype.dsp
+++ b/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\freetype246.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247.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\freetype246_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247_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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_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\freetype246.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.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\freetype246.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype246ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype247ST.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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj
index 8ec4df665..f442e9bb3 100644
--- a/freetype/builds/win32/visualc/freetype.vcproj
+++ b/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.6 sources:
+compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/win32/visualce/freetype.dsp b/freetype/builds/win32/visualce/freetype.dsp
index 268696760..d887dba4b 100644
--- a/freetype/builds/win32/visualce/freetype.dsp
+++ b/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\freetype246.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247.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\freetype246_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247_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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_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\freetype246.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.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\freetype246.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype246ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype247ST.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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualce/freetype.vcproj b/freetype/builds/win32/visualce/freetype.vcproj
index 46426866d..3c08b0c61 100644
--- a/freetype/builds/win32/visualce/freetype.vcproj
+++ b/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.6 sources:
+It compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/wince/vc2005-ce/freetype.vcproj b/freetype/builds/wince/vc2005-ce/freetype.vcproj
index 4267cc20c..c8bba48d4 100644
--- a/freetype/builds/wince/vc2005-ce/freetype.vcproj
+++ b/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/freetype/builds/wince/vc2005-ce/index.html b/freetype/builds/wince/vc2005-ce/index.html
index 04e3c4bdf..963c7c9e1 100644
--- a/freetype/builds/wince/vc2005-ce/index.html
+++ b/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.6 sources:
+It compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/builds/wince/vc2008-ce/freetype.vcproj b/freetype/builds/wince/vc2008-ce/freetype.vcproj
index 85b5c114a..228d77889 100644
--- a/freetype/builds/wince/vc2008-ce/freetype.vcproj
+++ b/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.6 sources:
+It compiles the following libraries from the FreeType 2.4.7 sources:
- freetype246.lib - release build; single threaded
- freetype246_D.lib - debug build; single threaded
- freetype246MT.lib - release build; multi-threaded
- freetype246MT_D.lib - debug build; multi-threaded
+ 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
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/freetype/docs/CHANGES b/freetype/docs/CHANGES
index 70ce80081..4cb3cf60c 100644
--- a/freetype/docs/CHANGES
+++ b/freetype/docs/CHANGES
@@ -1,3 +1,19 @@
+CHANGES BETWEEN 2.4.6 and 2.4.7
+
+ I. IMPORTANT BUG FIXES
+
+ - Some vulnerabilities in handling Type 1 fonts have been fixed;
+ see CVE-2011-3256.
+
+ II. MISCELLANEOUS
+
+ - FreeType now properly handles ZapfDingbats glyph names while
+ constructing a Unicode character map (for fonts which don't have
+ one).
+
+
+======================================================================
+
CHANGES BETWEEN 2.4.5 and 2.4.6
I. IMPORTANT BUG FIXES
diff --git a/freetype/docs/INSTALL b/freetype/docs/INSTALL
index 50f80517c..fc699a8d5 100644
--- a/freetype/docs/INSTALL
+++ b/freetype/docs/INSTALL
@@ -9,10 +9,10 @@ I. Normal installation and upgrades
1. Unix Systems (including Mac OS X, Cygwin, and MSys on Windows)
- Please read *both* `UPGRADE.UNIX' and `INSTALL.UNIX' to install or
- upgrade FreeType 2 on a Unix system. Note that you *need* GNU
- Make for automatic compilation, since other make tools won't work
- (this includes BSD Make).
+ Please read `INSTALL.UNIX' to install or upgrade FreeType 2 on a
+ Unix system. Note that you *need* GNU Make for automatic
+ compilation, since other make tools won't work (this includes BSD
+ Make).
GNU Make VERSION 3.80 OR NEWER IS NEEDED!
@@ -70,7 +70,7 @@ II. Custom builds of the library
----------------------------------------------------------------------
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
+Copyright 2000-2008, 2010-2011
by David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,
diff --git a/freetype/docs/UPGRADE.UNIX b/freetype/docs/UPGRADE.UNIX
deleted file mode 100644
index 48c746d70..000000000
--- a/freetype/docs/UPGRADE.UNIX
+++ /dev/null
@@ -1,137 +0,0 @@
-
-SPECIAL NOTE FOR UNIX USERS
-===========================
-
- If you are installing this release of FreeType on a system that
- already uses release 2.0.5 (or even an older version), you have to
- perform a few special steps to ensure that everything goes well.
-
-
- 1. Enable the TrueType bytecode hinter if you need it
- -----------------------------------------------------
-
- See the instructions in the file `TRUETYPE' of this directory.
-
- Note that FreeType supports TrueType fonts without the bytecode
- interpreter through its auto-hinter, which now generates relatively
- good results with most fonts.
-
-
- 2. Determine the correct installation path
- ------------------------------------------
-
- By default, the configure script installs the library in
- `/usr/local'. However, many Unix distributions now install the
- library in `/usr', since FreeType is becoming a critical system
- component.
-
- If FreeType is already installed on your system, type
-
- freetype-config --prefix
-
- on the command line. This should return the installation path
- (e.g., `/usr' or `/usr/local'). To avoid problems of parallel
- FreeType versions, use this path for the --prefix option of the
- configure script.
-
- Otherwise, simply use `/usr' (or whatever you think is adequate for
- your installation).
-
-
- 3. Ensure that you are using GNU Make
- -------------------------------------
-
- The FreeType build system _exclusively_ works with GNU Make (as an
- exception you can use make++ which emulates GNU Make sufficiently;
- see http://makepp.sourceforge.net). You will not be able to compile
- the library with the instructions below using any other alternative
- (including BSD Make).
-
- Trying to compile the library with a different Make tool prints a
- message like:
-
- Sorry, GNU make is required to build FreeType2.
-
- and the build process is aborted. If this happens, install GNU Make
- on your system, and use the GNUMAKE environment variable to name it.
-
-
- 4. Build and install the library
- --------------------------------
-
- The following should work on all Unix systems where the `make'
- command invokes GNU Make:
-
- ./configure --prefix=
- make
- make install (as root)
-
- where `' must be replaced by the prefix returned by the
- `freetype-config' command.
-
- When using a different command to invoke GNU Make, use the GNUMAKE
- variable. For example, if `gmake' is the command to use on your
- system, do something like:
-
- GNUMAKE=gmake ./configure --prefix=
- gmake
- gmake install (as root)
-
-
- 5. Take care of XFree86 version 4
- ---------------------------------
-
- Certain Linux distributions install _several_ versions of FreeType
- on your system. For example, on a fresh Mandrake 8.1 system, you
- can find the following files:
-
- /usr/lib/libfreetype.so which links to
- /usr/lib/libfreetype.6.1.0.so
-
- and
-
- /usr/X11R6/lib/libfreetype.so which links to
- /usr/X11R6/lib/libfreetype.6.0.so
-
- Note that these files correspond to two distinct versions of the
- library! It seems that this surprising issue is due to the install
- scripts of recent XFree86 servers (from 4.1.0) which install their
- own (dated) version of the library in `/usr/X11R6/lib'.
-
- In certain _rare_ cases you may experience minor problems if you
- install this release of the library in `/usr' only, namely, that
- certain applications do not benefit from the bug fixes and rendering
- improvements you would expect.
-
- There are two good ways to deal with this situation:
-
- - Install the library _twice_, in `/usr' and in `/usr/X11R6' (you
- have to do that each time you install a new FreeType release
- though).
-
- - Change the link in /usr/X11R6/lib/libfreetype.so to point to
-
- /usr/lib/libfreetype.so,
-
- and get rid of
-
- /usr/X11R6/lib/libfreetype.6.0.so
-
- The FreeType Team is not responsible for this problem, so please
- contact either the XFree86 development team or your Linux
- distributor to help clear this issue in case the information given
- here doesn't help.
-
-------------------------------------------------------------------------
-
-Copyright 2003, 2005 by
-David Turner, Robert Wilhelm, and Werner Lemberg.
-
-This file is part of the FreeType project, and may only be used,
-modified, and distributed under the terms of the FreeType project
-license, LICENSE.TXT. By continuing to use, modify, or distribute this
-file you indicate that you have read the license and understand and
-accept it fully.
-
-
----- end of UPGRADE.UNIX ---
diff --git a/freetype/docs/VERSION.DLL b/freetype/docs/VERSION.DLL
index 36bede99f..2dd8eadb3 100644
--- a/freetype/docs/VERSION.DLL
+++ b/freetype/docs/VERSION.DLL
@@ -53,6 +53,7 @@ systems, but not all of them:
release libtool so
-------------------------------
+ 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
2.4.4 12.2.6 6.6.2
diff --git a/freetype/docs/reference/ft2-base_interface.html b/freetype/docs/reference/ft2-base_interface.html
index 7af3eea20..6721d7825 100644
--- a/freetype/docs/reference/ft2-base_interface.html
+++ b/freetype/docs/reference/ft2-base_interface.html
@@ -3,7 +3,7 @@
-FreeType-2.4.6 API Reference
+FreeType-2.4.7 API Reference