minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. 

* builds/unix/configure.ac (version_info): Set to 9:10:3.

* builds/win32/visualc/index.html,
builds/win32/visualc/freetype.dsp,
builds/win32/visualc/freetype.vcproj, builds/freetype.mk (refdoc),
Jamfile (RefDoc), README: s/220/221/, s/2.2.0/2.2.1/.
Minor updates.

* docs/CHANGES, docs/VERSION.DLL, docs/PROBLEMS, README.CVS:
Updated.

* builds/unix/install-sh: Updated from `texinfo' CVS module at
savannah.gnu.org.

* devel/ftoption.h: Synchronize with
include/freetype/config/ftoption.h.
This commit is contained in:
Werner Lemberg 2006-05-06 16:44:58 +00:00
parent 4f3b5bbd95
commit 1639c79482
16 changed files with 120 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2006-05-06 Werner Lemberg <wl@gnu.org>
* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
* builds/unix/configure.ac (version_info): Set to 9:10:3.
* builds/win32/visualc/index.html,
builds/win32/visualc/freetype.dsp,
builds/win32/visualc/freetype.vcproj, builds/freetype.mk (refdoc),
Jamfile (RefDoc), README: s/220/221/, s/2.2.0/2.2.1/.
Minor updates.
* docs/CHANGES, docs/VERSION.DLL, docs/PROBLEMS, README.CVS:
Updated.
* builds/unix/install-sh: Updated from `texinfo' CVS module at
savannah.gnu.org.
* devel/ftoption.h: Synchronize with
include/freetype/config/ftoption.h.
2006-05-04 Werner Lemberg <wl@gnu.org> 2006-05-04 Werner Lemberg <wl@gnu.org>
* src/lzw/ftlzw2.c: Renamed to... * src/lzw/ftlzw2.c: Renamed to...

2
Jamfile
View File

@ -193,7 +193,7 @@ rule RefDoc
actions RefDoc actions RefDoc
{ {
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.2 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h $(FT2_INCLUDE)/freetype/cache/*.h python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.2.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
} }
RefDoc refdoc ; RefDoc refdoc ;

10
README
View File

@ -9,8 +9,8 @@
is called `libttf'. They are *not* compatible! is called `libttf'. They are *not* compatible!
FreeType 2.2 FreeType 2.2.1
============ ==============
Please read the docs/CHANGES file, it contains IMPORTANT Please read the docs/CHANGES file, it contains IMPORTANT
INFORMATION. INFORMATION.
@ -24,9 +24,9 @@
and download one of the following files. and download one of the following files.
freetype-doc-2.2.tar.bz2 freetype-doc-2.2.1.tar.bz2
freetype-doc-2.2.tar.gz freetype-doc-2.2.1.tar.gz
ftdoc22.zip ftdoc221.zip
Bugs Bugs

16
README.CVS
View File

@ -1,19 +1,19 @@
The CVS archive doesn't contain pre-built configuration scripts for The CVS archive doesn't contain pre-built configuration scripts for
UNIXish platforms. To generate them say UNIXish platforms. To generate them say
sh autogen.sh sh autogen.sh
which in turn depends on the following packages: which in turn depends on the following packages:
automake (1.9.4) automake (1.9.6)
libtool (1.5.16) libtool (1.5.22)
autoconf (2.59b) autoconf (2.59c)
The versions given in parentheses are known to work. Note that autogen.sh The versions given in parentheses are known to work. Note that
also sets up proper file permissions for the configure and auxiliary autogen.sh also sets up proper file permissions for the configure and
scripts. auxiliary scripts.
For static builds which don't use platform specific optimizations no For static builds which don't use platform specific optimizations, no
configure script is necessary at all; saying configure script is necessary at all; saying
make setup ansi make setup ansi

2
builds/freetype.mk
View File

@ -270,7 +270,7 @@ dll: $(PROJECT_LIBRARY) exported_symbols
refdoc: refdoc:
python $(SRC_DIR)/tools/docmaker/docmaker.py \ python $(SRC_DIR)/tools/docmaker/docmaker.py \
--prefix=ft2 \ --prefix=ft2 \
--title=FreeType-2.2 \ --title=FreeType-2.2.1 \
--output=$(DOC_DIR) \ --output=$(DOC_DIR) \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/config/*.h \

22
builds/toplevel.mk
View File

@ -17,18 +17,18 @@
# #
# It works as follows: # It works as follows:
# #
# - When invoked for the first time, this Makefile will include the rules # - When invoked for the first time, this Makefile includes the rules found
# found in `PROJECT/builds/detect.mk'. They are in charge of detecting # in `PROJECT/builds/detect.mk'. They are in charge of detecting the
# the current platform. # current platform.
# #
# A summary of the detection will be displayed, and the file `config.mk' # A summary of the detection is displayed, and the file `config.mk' is
# will be created in the current directory. # created in the current directory.
# #
# - When invoked later, this Makefile will include the rules found in # - When invoked later, this Makefile includes the rules found in
# `config.mk'. This sub-Makefile will define some system-specific # `config.mk'. This sub-Makefile defines some system-specific variables
# variables (like compiler, compilation flags, object suffix, etc.), then # (like compiler, compilation flags, object suffix, etc.), then includes
# include the rules found in `PROJECT/builds/PROJECT.mk', used to build # the rules found in `PROJECT/builds/PROJECT.mk', used to build the
# the library. # library.
# #
# See the comments in `builds/detect.mk' and `builds/PROJECT.mk' for more # See the comments in `builds/detect.mk' and `builds/PROJECT.mk' for more
# details on host platform detection and library builds. # details on host platform detection and library builds.
@ -56,7 +56,7 @@ endif
# FTMODULE_H, as its name suggests, indicates where the FreeType module # FTMODULE_H, as its name suggests, indicates where the FreeType module
# classes resides. # class file resides.
# #
FTMODULE_H ?= $(OBJ_DIR)/ftmodule.h FTMODULE_H ?= $(OBJ_DIR)/ftmodule.h

2
builds/unix/configure.ac
View File

@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL! # Don't forget to update docs/VERSION.DLL!
version_info='9:9:3' version_info='9:10:3'
AC_SUBST([version_info]) AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version]) AC_SUBST([ft_version])

45
builds/unix/install-sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# install - install a program, script, or datafile # install - install a program, script, or datafile
scriptversion=2006-01-12.21 scriptversion=2006-04-25.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was # This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the # later released in X11R6 (xc/config/util/install.sh) with the
@ -109,7 +109,7 @@ Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
" "
while test -n "$1"; do while test $# -ne 0; do
case $1 in case $1 in
-c) shift -c) shift
continue;; continue;;
@ -150,25 +150,33 @@ while test -n "$1"; do
--version) echo "$0 $scriptversion"; exit $?;; --version) echo "$0 $scriptversion"; exit $?;;
*) # When -d is used, all remaining arguments are directories to create. --) shift
# When -t is used, the destination is already specified.
test -n "$dir_arg$dstarg" && break
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
dstarg=$arg
done
break;; break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac esac
done done
if test -z "$1"; then if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
dstarg=$arg
done
fi
if test $# -eq 0; then
if test -z "$dir_arg"; then if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2 echo "$0: no input file specified." >&2
exit 1 exit 1
@ -230,8 +238,7 @@ do
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \ X"$dst" : 'X\(//\)[^/]' \| \
X"$dst" : 'X\(//\)$' \| \ X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| \ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
. : '\(.\)' 2>/dev/null ||
echo X"$dst" | echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/ s//\1/

12
builds/win32/visualc/freetype.dsp
View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype220.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype221.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug" !ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@ -78,7 +78,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype220_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype221_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@ -103,7 +103,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.lib" # ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype220MT_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype221MT_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded"
@ -127,7 +127,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"lib\freetype200b8.lib" # ADD BASE LIB32 /nologo /out:"lib\freetype200b8.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype220MT.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype221MT.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded"
@ -152,7 +152,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib" # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206.lib"
# ADD LIB32 /out:"..\..\..\objs\freetype220ST.lib" # ADD LIB32 /out:"..\..\..\objs\freetype221ST.lib"
# SUBTRACT LIB32 /nologo # SUBTRACT LIB32 /nologo
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -178,7 +178,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206_D.lib" # ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype206_D.lib"
# ADD LIB32 /nologo /out:"..\..\..\objs\freetype220ST_D.lib" # ADD LIB32 /nologo /out:"..\..\..\objs\freetype221ST_D.lib"
!ENDIF !ENDIF

12
builds/win32/visualc/freetype.vcproj
View File

@ -41,7 +41,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220.lib" OutputFile="..\..\..\objs\freetype221.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -94,7 +94,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220MT.lib" OutputFile="..\..\..\objs\freetype221MT.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -147,7 +147,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220ST.lib"/> OutputFile="..\..\..\objs\freetype221ST.lib"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
<Tool <Tool
@ -197,7 +197,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220_D.lib" OutputFile="..\..\..\objs\freetype221_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -248,7 +248,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220ST_D.lib" OutputFile="..\..\..\objs\freetype221ST_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -300,7 +300,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\..\..\objs\freetype220MT_D.lib" OutputFile="..\..\..\objs\freetype221MT_D.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>

10
builds/win32/visualc/index.html
View File

@ -12,14 +12,14 @@
<p>This directory contains project files for Visual C++, named <p>This directory contains project files for Visual C++, named
<tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
will compile the following libraries from the FreeType 2.2.0 sources:</p> will compile the following libraries from the FreeType 2.2.1 sources:</p>
<ul> <ul>
<pre> <pre>
freetype220.lib - release build; single threaded freetype221.lib - release build; single threaded
freetype220_D.lib - debug build; single threaded freetype221_D.lib - debug build; single threaded
freetype220MT.lib - release build; multi-threaded freetype221MT.lib - release build; multi-threaded
freetype220MT_D.lib - debug build; multi-threaded</pre> freetype221MT_D.lib - debug build; multi-threaded</pre>
</ul> </ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP

14
devel/ftoption.h
View File

@ -581,20 +581,6 @@ FT_BEGIN_HEADER
#define FT_OPTIMIZE_MEMORY #define FT_OPTIMIZE_MEMORY
/*
* This temporary macro is used to control whether we are going to compile
* certain functions like ft_mem_alloc in a way that prevents recent GCC
* releases from emitting zillions of `strict aliasing' warning messages
* each time a memory-management function is called.
*
* Note that it shouldn't be activated when building the library with
* a C++ compiler.
*/
#ifndef __cplusplus
#define FT_STRICT_ALIASING
#endif
/* /*
* Define this variable if you want to keep the layout of internal * Define this variable if you want to keep the layout of internal
* structures that was used prior to FreeType 2.2. This also compiles in * structures that was used prior to FreeType 2.2. This also compiles in

17
docs/CHANGES
View File

@ -1,5 +1,19 @@
LATEST CHANGES BETWEEN 2.2.1 and 2.2
I. IMPORTANT BUG FIXES
- Various integer overflows have been fixed.
- PFB fonts with MacOS resource fork weren't handled correctly on
non-MacOS platforms.
======================================================================
LATEST CHANGES BETWEEN 2.2 and 2.1.10 LATEST CHANGES BETWEEN 2.2 and 2.1.10
(not released officially)
I. IMPORTANT BUG FIXES I. IMPORTANT BUG FIXES
- Vertical metrics for SFNT fonts were incorrect sometimes. - Vertical metrics for SFNT fonts were incorrect sometimes.
@ -128,7 +142,8 @@ LATEST CHANGES BETWEEN 2.2 and 2.1.10
the face. the face.
- The demo programs `ftview' and `ftstring' have been rewritten - The demo programs `ftview' and `ftstring' have been rewritten
for better readability. for better readability. `ftview' has a new switch `-p' to test
FT_New_Memory_Face (instead of FT_New_Face).
- FreeType now honours bit 1 in the `head' table of TrueType fonts - FreeType now honours bit 1 in the `head' table of TrueType fonts
(meaning `left sidebearing point at x=0'). This helps with some (meaning `left sidebearing point at x=0'). This helps with some

14
docs/PROBLEMS
View File

@ -1,16 +1,16 @@
This file describes various problems that have been encountered in This file describes various problems that have been encountered in
compiling, installing and running FreeType 2. Suggestions for additions or compiling, installing and running FreeType 2. Suggestions for
other improvements to this file are welcome. additions or other improvements to this file are welcome.
--------------------------------------------------------------------------- ----------------------------------------------------------------------
Compilation Problems Compilation Problems
==================== ====================
* I get an `internal compilation error' (ICE) while compiling FreeType 2.2.0 * I get an `internal compilation error' (ICE) while compiling FreeType
with Intel C++. 2.2.1 with Intel C++.
This has been reported for the following compiler version: This has been reported for the following compiler version:
@ -33,4 +33,4 @@ A solution to this problem is to apply the following patch.
ftc_inode_new, ftc_inode_new,
--------------------------------------------------------------------------- ----------------------------------------------------------------------

9
docs/VERSION.DLL
View File

@ -13,7 +13,7 @@ FreeType on Unix.
For each new public release of FreeType 2, there are generally *three* For each new public release of FreeType 2, there are generally *three*
distinct `version' numbers to consider: distinct `version' numbers to consider:
* The official FT2 release number, like 2.0.9, or 2.1.3. * The official FreeType 2 release number, like 2.0.9 or 2.1.3.
* The libtool (and Unix) specific version number, like 9.2.3. This is * The libtool (and Unix) specific version number, like 9.2.3. This is
what `freetype-config --version' returns. what `freetype-config --version' returns.
@ -53,6 +53,7 @@ systems, but not all of them:
release libtool so release libtool so
------------------------------- -------------------------------
2.2.1 9.10.3 6.3.10
2.2.0 9.9.3 6.3.9 2.2.0 9.9.3 6.3.9
2.1.10 9.8.3 6.3.8 2.1.10 9.8.3 6.3.8
2.1.9 9.7.3 6.3.7 2.1.9 9.7.3 6.3.7
@ -78,8 +79,8 @@ The libtool numbers are a bit inconsistent due to the library's history:
- 2.0.9 was a bug-fix release of the `stable' branch, and we - 2.0.9 was a bug-fix release of the `stable' branch, and we
incorrectly increased its libtool number. incorrectly increased its libtool number.
- 2.1.4 is still in the `development' branch, however it is stable - 2.1.4 was a development version, however it was stable enough to be
enough to be the basis of an upcoming 2.2.0 release. the basis of the 2.2.0 release.
3. Autoconf Code Fragment 3. Autoconf Code Fragment
@ -111,7 +112,7 @@ other release numbers.
------------------------------------------------------------------------ ------------------------------------------------------------------------
Copyright 2002, 2003, 2004, 2005 by Copyright 2002, 2003, 2004, 2005, 2006 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

2
include/freetype/freetype.h
View File

@ -44,7 +44,7 @@
/* */ /* */
#define FREETYPE_MAJOR 2 #define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 2 #define FREETYPE_MINOR 2
#define FREETYPE_PATCH 0 #define FREETYPE_PATCH 1
#include <ft2build.h> #include <ft2build.h>