rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify header file hierarchy. 

This large patch changes the header file directory layout from
`include/freetype/...' to `include/...', effectively removing one
level.  Since the file `ft2build.h' is also located in `include'
(and it stays there even after installation), all FreeType header
files are now in a single directory.

Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler, and
(b) the documented way for header inclusion like

  #include <ft2build.h>
  #include FT_FREETYPE_H
  ...

don't need any change to the source code.

* include/freetype/*: Move up to...
* include/*: ... this directory.

* builds/amiga/include/freetype/*: Move up to...
* builds/amiga/include/*: ... this directory.

*/*: Essentially do `s@/freetype/@/@' where appropriate.

* CMakeList.txt: Simplify.
* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
`--cflags', return a single directory.
* builds/unix/install.mk (install): No longer try to remove `cache'
and `internal' subdirectories; instead, remove the `freetype'
subdirectory.
This commit is contained in:
Werner Lemberg 2013-11-13 08:55:46 +01:00
parent ea5c781afa
commit fae3820764
138 changed files with 511 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -49,7 +49,6 @@ add_definitions(-DFT2_BUILD_LIBRARY)
# Specify library include directories
include_directories("${PROJECT_SOURCE_DIR}/include")
include_directories("${PROJECT_SOURCE_DIR}/include/freetype")
# Create the configuration file
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include.")
@ -129,14 +128,8 @@ include_directories("src/psnames")
add_library(freetype ${BASE_SRCS})
# Installations
install(FILES ${PROJECT_SOURCE_DIR}/include/ft2build.h
DESTINATION include
)
# Is this next needed?
install(FILES ${PROJECT_BINARY_DIR}/include/ftconfig.h
DESTINATION include
)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/freetype
# Note the trailing slash in the argument to the `DIRECTORY' directive
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
DESTINATION include/freetype2
PATTERN "internal" EXCLUDE
)

35
ChangeLog
View File

@ -1,3 +1,38 @@
2013-11-13 Werner Lemberg <wl@gnu.org>
Simplify header file hierarchy.
This large patch changes the header file directory layout from
`include/freetype/...' to `include/...', effectively removing one
level. Since the file `ft2build.h' is also located in `include'
(and it stays there even after installation), all FreeType header
files are now in a single directory.
Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler, and
(b) the documented way for header inclusion like
#include <ft2build.h>
#include FT_FREETYPE_H
...
don't need any change to the source code.
* include/freetype/*: Move up to...
* include/*: ... this directory.
* builds/amiga/include/freetype/*: Move up to...
* builds/amiga/include/*: ... this directory.
*/*: Essentially do `s@/freetype/@/@' where appropriate.
* CMakeList.txt: Simplify.
* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
`--cflags', return a single directory.
* builds/unix/install.mk (install): No longer try to remove `cache'
and `internal' subdirectories; instead, remove the `freetype'
subdirectory.
2013-11-12 Werner Lemberg <wl@gnu.org>
[truetype] Fix last `truetype' commit.

12
Jamfile
View File

@ -1,6 +1,6 @@
# FreeType 2 top Jamfile.
#
# Copyright 2001-2011 by
# Copyright 2001-2011, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -140,9 +140,9 @@ DEFINES += FT2_BUILD_LIBRARY ;
# FT2_MULTI = true ;
# The file <freetype/config/ftheader.h> is used to define macros that are
# later used in #include statements. It needs to be parsed in order to
# record these definitions.
# The file <config/ftheader.h> is used to define macros that are later used
# in #include statements. It needs to be parsed in order to record these
# definitions.
#
HDRMACRO [ FT2_SubDir include freetype config ftheader.h ] ;
HDRMACRO [ FT2_SubDir include freetype internal internal.h ] ;
@ -177,7 +177,7 @@ actions GenExportSymbols1 bind APINAMES
$(APINAMES) $(2) > $(1)
}
GenExportSymbols ftexport.sym : include/freetype include/freetype/cache ;
GenExportSymbols ftexport.sym : include include/cache ;
# Test files (hinter debugging). Only used by FreeType developers.
#
@ -195,7 +195,7 @@ rule RefDoc
actions RefDoc
{
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
}
RefDoc refdoc ;

4
autogen.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
# Copyright 2005-2010, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
check_tool_version $AUTOCONF autoconf AUTOCONF 2.62
# This sets freetype_major, freetype_minor, and freetype_patch.
eval `sed -nf version.sed include/freetype/freetype.h`
eval `sed -nf version.sed include/freetype.h`
# We set freetype-patch to an empty value if it is zero.
if test "$freetype_patch" = ".0"; then

13
builds/amiga/README
View File

@ -1,7 +1,7 @@
README for the builds/amiga subdirectory.
Copyright 2005 by
Copyright 2005, 2013 by
Werner Lemberg and Detlef Würkner.
This file is part of the FreeType project, and may only be used, modified,
@ -51,8 +51,8 @@ directory. The results are:
- ftdebug.o, an object module containing the standard version of the
debugging code which uses vprintf() and exit() (not pure).
Debugging can be turned on in FT:include/freetype/config/ftoption.h
and with FT_SetTraceLevel().
Debugging can be turned on in FT:include/config/ftoption.h and with
FT_SetTraceLevel().
- ftdebugpure.o, an object module containing the pure version of the
debugging code which uses KVPrintf() from lib:debug.lib and no
@ -64,15 +64,14 @@ directory. The results are:
ftsystem.o would force ALL FreeType2 modules to be linked to your
program, I decided to use a different scheme: You must #include
FT:src/base/ftinit.c in your sourcecode and specify with #define
statements which modules you need. See
include/freetype/config/ftmodule.h.
statements which modules you need. See include/config/ftmodule.h.
To use in your own programs:
- Insert the #define and #include statements from top of
include/freetype/config/ftmodule.h in your source code and uncomment
the #define statements for the FreeType2 modules you need.
include/config/ftmodule.h in your source code and uncomment the
#define statements for the FreeType2 modules you need.
- You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
calling the FreeType2 functions, because the link library and the

8
builds/amiga/include/freetype/config/ftconfig.h → builds/amiga/include/config/ftconfig.h
View File

@ -4,7 +4,7 @@
/* */
/* Amiga-specific configuration file (specification only). */
/* */
/* Copyright 2005, 2006, 2007 by */
/* Copyright 2005-2007, 2013 by */
/* Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -34,9 +34,9 @@
/* Now include the original file */
#ifndef __MORPHOS__
#ifdef __SASC
#include "FT:include/freetype/config/ftconfig.h"
#include "FT:include/config/ftconfig.h"
#else
#include "/FT/include/freetype/config/ftconfig.h"
#include "/FT/include/config/ftconfig.h"
#endif
#else
/* We must define that, it seems that
@ -45,7 +45,7 @@
* binaries from http://www.morphos.de)
*/
#define _LIBC_LIMITS_H_
#include "/FT/include/freetype/config/ftconfig.h"
#include "/FT/include/config/ftconfig.h"
#endif
/*

0
builds/amiga/include/freetype/config/ftmodule.h → builds/amiga/include/config/ftmodule.h
View File

4
builds/amiga/makefile
View File

@ -5,7 +5,7 @@
#
# Copyright 2005, 2006, 2007, 2009 by
# Copyright 2005-2007, 2009, 2013 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -43,7 +43,7 @@
#
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
all: libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o

4
builds/amiga/makefile.os4
View File

@ -4,7 +4,7 @@
#
# Copyright 2005, 2006, 2007, 2009 by
# Copyright 2005-2007, 2009, 2013 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -40,7 +40,7 @@
#
# link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
# (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
all: assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o

4
builds/amiga/smakefile
View File

@ -3,7 +3,7 @@
#
# Copyright 2005,2006, 2007, 2009 by
# Copyright 2005-2007, 2009, 2013 by
# Werner Lemberg and Detlef Würkner.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -40,7 +40,7 @@
#
# link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
# (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o \
ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \

4
builds/amiga/src/base/ftdebug.c
View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for amiga (body). */
/* */
/* Copyright 1996-2001, 2002, 2004, 2005, 2013 by */
/* Copyright 1996-2002, 2004, 2005, 2013 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -176,7 +176,7 @@
/* the memory and stream components which are set to 7 and 5, */
/* respectively. */
/* */
/* See the file <include/freetype/internal/fttrace.h> for details of the */
/* See the file <include/internal/fttrace.h> for details of the */
/* available toggle names. */
/* */
/* The level must be between 0 and 7; 0 means quiet (except for serious */

6
builds/detect.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by
# Copyright 1996-2003, 2006, 2008, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -17,8 +17,8 @@
# the following variables:
#
# BUILD_DIR The configuration and system-specific directory. Usually
# `freetype/builds/$(PLATFORM)' but can be different for
# custom builds of the library.
# `builds/$(PLATFORM)' but can be different for custom builds
# of the library.
#
# The following variables must be defined in system specific `detect.mk'
# files:

8
builds/freetype.mk
View File

@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base
# Other derived directories.
#
PUBLIC_DIR := $(TOP_DIR)/include/freetype
PUBLIC_DIR := $(TOP_DIR)/include
INTERNAL_DIR := $(PUBLIC_DIR)/internal
SERVICES_DIR := $(INTERNAL_DIR)/services
CONFIG_DIR := $(PUBLIC_DIR)/config
@ -116,8 +116,8 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
# IMPORTANT NOTE: The architecture-dependent directory must ALWAYS be placed
# before the standard include list. Porters are then able to
# put their own version of some of the FreeType components
# in the `freetype/builds/<system>' directory, as these
# files will override the default sources.
# in the `builds/<system>' directory, as these files will
# override the default sources.
#
INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
$(DEVEL_DIR) \
@ -178,7 +178,7 @@ PUBLIC_H := $(wildcard $(PUBLIC_DIR)/*.h)
INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
$(wildcard $(SERVICES_DIR)/*.h)
CONFIG_H := $(wildcard $(CONFIG_DIR)/*.h) \
$(wildcard $(BUILD_DIR)/freetype/config/*.h) \
$(wildcard $(BUILD_DIR)/config/*.h) \
$(FTMODULE_H) \
$(FTOPTION_H)
DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)

92
builds/symbian/bld.inf
View File

@ -2,7 +2,7 @@
// FreeType 2 project for the symbian platform
//
// Copyright 2008, 2009 by
// Copyright 2008, 2009, 2013 by
// David Turner, Robert Wilhelm, and Werner Lemberg.
//
// This file is part of the FreeType project, and may only be used, modified,
@ -19,48 +19,48 @@ freetype.mmp
PRJ_EXPORTS
../../include/ft2build.h
../../include/freetype/config/ftconfig.h freetype/config/ftconfig.h
../../include/freetype/config/ftheader.h freetype/config/ftheader.h
../../include/freetype/config/ftmodule.h freetype/config/ftmodule.h
../../include/freetype/config/ftoption.h freetype/config/ftoption.h
../../include/freetype/config/ftstdlib.h freetype/config/ftstdlib.h
../../include/freetype/freetype.h freetype/freetype.h
../../include/freetype/ftbbox.h freetype/ftbbox.h
../../include/freetype/ftbdf.h freetype/ftbdf.h
../../include/freetype/ftbitmap.h freetype/ftbitmap.h
../../include/freetype/ftcache.h freetype/ftcache.h
../../include/freetype/ftcid.h freetype/ftcid.h
../../include/freetype/fterrdef.h freetype/fterrdef.h
../../include/freetype/fterrors.h freetype/fterrors.h
../../include/freetype/ftgasp.h freetype/ftgasp.h
../../include/freetype/ftglyph.h freetype/ftglyph.h
../../include/freetype/ftgxval.h freetype/ftgxval.h
../../include/freetype/ftgzip.h freetype/ftgzip.h
../../include/freetype/ftbzip2.h freetype/ftbzip2.h
../../include/freetype/ftimage.h freetype/ftimage.h
../../include/freetype/ftincrem.h freetype/ftincrem.h
../../include/freetype/ftlcdfil.h freetype/ftlcdfil.h
../../include/freetype/ftlist.h freetype/ftlist.h
../../include/freetype/ftlzw.h freetype/ftlzw.h
../../include/freetype/ftmac.h freetype/ftmac.h
../../include/freetype/ftmm.h freetype/ftmm.h
../../include/freetype/ftmodapi.h freetype/ftmodapi.h
../../include/freetype/ftmoderr.h freetype/ftmoderr.h
../../include/freetype/ftotval.h freetype/ftotval.h
../../include/freetype/ftoutln.h freetype/ftoutln.h
../../include/freetype/ftpfr.h freetype/ftpfr.h
../../include/freetype/ftrender.h freetype/ftrender.h
../../include/freetype/ftsizes.h freetype/ftsizes.h
../../include/freetype/ftsnames.h freetype/ftsnames.h
../../include/freetype/ftstroke.h freetype/ftstroke.h
../../include/freetype/ftsynth.h freetype/ftsynth.h
../../include/freetype/ftsystem.h freetype/ftsystem.h
../../include/freetype/fttrigon.h freetype/fttrigon.h
../../include/freetype/fttypes.h freetype/fttypes.h
../../include/freetype/ftwinfnt.h freetype/ftwinfnt.h
../../include/freetype/ftxf86.h freetype/ftxf86.h
../../include/freetype/t1tables.h freetype/t1tables.h
../../include/freetype/ttnameid.h freetype/ttnameid.h
../../include/freetype/tttables.h freetype/tttables.h
../../include/freetype/tttags.h freetype/tttags.h
../../include/freetype/ttunpat.h freetype/ttunpat.h
../../include/config/ftconfig.h config/ftconfig.h
../../include/config/ftheader.h config/ftheader.h
../../include/config/ftmodule.h config/ftmodule.h
../../include/config/ftoption.h config/ftoption.h
../../include/config/ftstdlib.h config/ftstdlib.h
../../include/freetype.h freetype.h
../../include/ftbbox.h ftbbox.h
../../include/ftbdf.h ftbdf.h
../../include/ftbitmap.h ftbitmap.h
../../include/ftcache.h ftcache.h
../../include/ftcid.h ftcid.h
../../include/fterrdef.h fterrdef.h
../../include/fterrors.h fterrors.h
../../include/ftgasp.h ftgasp.h
../../include/ftglyph.h ftglyph.h
../../include/ftgxval.h ftgxval.h
../../include/ftgzip.h ftgzip.h
../../include/ftbzip2.h ftbzip2.h
../../include/ftimage.h ftimage.h
../../include/ftincrem.h ftincrem.h
../../include/ftlcdfil.h ftlcdfil.h
../../include/ftlist.h ftlist.h
../../include/ftlzw.h ftlzw.h
../../include/ftmac.h ftmac.h
../../include/ftmm.h ftmm.h
../../include/ftmodapi.h ftmodapi.h
../../include/ftmoderr.h ftmoderr.h
../../include/ftotval.h ftotval.h
../../include/ftoutln.h ftoutln.h
../../include/ftpfr.h ftpfr.h
../../include/ftrender.h ftrender.h
../../include/ftsizes.h ftsizes.h
../../include/ftsnames.h ftsnames.h
../../include/ftstroke.h ftstroke.h
../../include/ftsynth.h ftsynth.h
../../include/ftsystem.h ftsystem.h
../../include/fttrigon.h fttrigon.h
../../include/fttypes.h fttypes.h
../../include/ftwinfnt.h ftwinfnt.h
../../include/ftxf86.h ftxf86.h
../../include/t1tables.h t1tables.h
../../include/ttnameid.h ttnameid.h
../../include/tttables.h tttables.h
../../include/tttags.h tttags.h
../../include/ttunpat.h ttunpat.h

4
builds/toplevel.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012 by
# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -176,7 +176,7 @@ include $(TOP_DIR)/builds/modules.mk
# we check for `dist', not `distclean'
ifneq ($(findstring distx,$(MAKECMDGOALS)x),)
FT_H := include/freetype/freetype.h
FT_H := include/freetype.h
major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))

12
builds/unix/freetype-config.in
View File

@ -119,13 +119,13 @@ else
fi
if test "$echo_ft_version" = "yes" ; then
major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
| grep FREETYPE_MAJOR \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
| grep FREETYPE_MINOR \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
| grep FREETYPE_PATCH \
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
echo $major.$minor.$patch
@ -133,11 +133,7 @@ fi
if test "$echo_cflags" = "yes" ; then
cflags="-I${SYSROOT}$includedir/freetype2"
if test "${SYSROOT}$includedir" != "/usr/include" ; then
echo $cflags -I${SYSROOT}$includedir
else
echo $cflags
fi
echo $cflags
fi
if test "$echo_libs" = "yes" ; then

4
builds/unix/freetype2.in
View File

@ -1,7 +1,7 @@
prefix="%prefix%"
exec_prefix="%exec_prefix%"
libdir="%libdir%"
includedir="%includedir%"
includedir="%includedir%/freetype2"
Name: FreeType 2
Description: A free, high-quality, and portable font engine.
@ -9,4 +9,4 @@ Version: %ft_version%
Requires:
Libs: -L${libdir} -lfreetype
Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%
Cflags: -I${includedir}/freetype2 -I${includedir}
Cflags: -I${includedir}

23
builds/unix/ft2unix.h
View File

@ -25,27 +25,6 @@
/* returned by the `freetype-config --cflags' or `pkg-config --cflags' */
/* command) is in your compilation include path. */
/* */
/* We don't need to do anything special in this release. However, for */
/* a future FreeType 2 release, the following installation changes will */
/* be performed: */
/* */
/* - The contents of `freetype-2.x/include/freetype' will be installed */
/* to `/usr/local/include/freetype2' instead of */
/* `/usr/local/include/freetype2/freetype'. */
/* */
/* - This file will #include <freetype2/config/ftheader.h>, instead */
/* of <freetype/config/ftheader.h>. */
/* */
/* - The contents of `ftheader.h' will be processed with `sed' to */
/* replace all `<freetype/xxx>' with `<freetype2/xxx>'. */
/* */
/* - Adding `/usr/local/include/freetype2' to your compilation include */
/* path will not be necessary anymore. */
/* */
/* These changes will be transparent to client applications which use */
/* freetype-config (or pkg-config). No modifications will be necessary */
/* to compile with the new scheme. */
/* */
/*************************************************************************/
@ -53,7 +32,7 @@
#define __FT2_BUILD_UNIX_H__
/* `<prefix>/include/freetype2' must be in your current inclusion path */
#include <freetype/config/ftheader.h>
#include <config/ftheader.h>
#endif /* __FT2_BUILD_UNIX_H__ */

10
builds/unix/ftconfig.in
View File

@ -27,9 +27,9 @@
/* Note however that if some specific modifications are needed, we */
/* advise you to place a modified copy in your build directory. */
/* */
/* The build directory is usually `freetype/builds/<system>', and */
/* contains system-specific files that are always included first when */
/* building the library. */
/* The build directory is usually `builds/<system>', and contains */
/* system-specific files that are always included first when building */
/* the library. */
/* */
/*************************************************************************/
@ -52,7 +52,7 @@ FT_BEGIN_HEADER
/* These macros can be toggled to suit a specific system. The current */
/* ones are defaults used to compile FreeType in an ANSI C environment */
/* (16bit compilers are also supported). Copy this file to your own */
/* `freetype/builds/<system>' directory, and edit it to port the engine. */
/* `builds/<system>' directory, and edit it to port the engine. */
/* */
/*************************************************************************/
@ -86,7 +86,7 @@ FT_BEGIN_HEADER
#else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
/* Following cpp computation of the bit length of int and long */
/* is copied from default include/freetype/config/ftconfig.h. */
/* is copied from default include/config/ftconfig.h. */
/* If any improvement is required for this file, it should be */
/* applied to the original header file for the builders that */
/* does not use configure script. */

6
builds/unix/ftsystem.c
View File

@ -268,9 +268,9 @@
/* XXX: TODO -- real 64bit platform support */
/* */
/* `stream->size' is typedef'd to unsigned long (in */
/* freetype/ftsystem.h); `stat_buf.st_size', however, is usually */
/* typedef'd to off_t (in sys/stat.h). */
/* `stream->size' is typedef'd to unsigned long (in `ftsystem.h'); */
/* `stat_buf.st_size', however, is usually typedef'd to off_t */
/* (in sys/stat.h). */
/* On some platforms, the former is 32bit and the latter is 64bit. */
/* To avoid overflow caused by fonts in huge files larger than */
/* 2GB, do a test. Temporary fix proposed by Sean McBride. */

49
builds/unix/install.mk
View File

@ -24,35 +24,36 @@
# Unix installation and deinstallation targets.
#
# Note that we no longer install internal headers, and we remove any
# `internal' subdirectory found in `$(includedir)/freetype2/freetype'.
# Note that we remove any data in the `freetype' subdirectory found in
# `$(includedir)/freetype2', which was the previous location of the header
# files up to version 2.5.0.
#
install: $(PROJECT_LIBRARY)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/freetype/config \
$(DESTDIR)$(bindir) \
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(libdir)/pkgconfig \
$(DESTDIR)$(includedir)/freetype2/config \
$(DESTDIR)$(bindir) \
$(DESTDIR)$(datadir)/aclocal
$(LIBTOOL) --mode=install $(INSTALL) \
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
-for P in $(PUBLIC_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2 ; \
done
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
-for P in $(CONFIG_H) ; do \
$(INSTALL_DATA) \
$$P $(DESTDIR)$(includedir)/freetype2/config ; \
done
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
$(DESTDIR)$(includedir)/ft2build.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
$(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
$(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
$(DESTDIR)$(bindir)/freetype-config
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
@ -63,12 +64,10 @@ install: $(PROJECT_LIBRARY)
uninstall:
-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc

8
builds/vms/ftconfig.h
View File

@ -27,9 +27,9 @@
/* Note however that if some specific modifications are needed, we */
/* advise you to place a modified copy in your build directory. */
/* */
/* The build directory is usually `freetype/builds/<system>', and */
/* contains system-specific files that are always included first when */
/* building the library. */
/* The build directory is usually `builds/<system>', and contains */
/* system-specific files that are always included first when building */
/* the library. */
/* */
/*************************************************************************/
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
/* These macros can be toggled to suit a specific system. The current */
/* ones are defaults used to compile FreeType in an ANSI C environment */
/* (16bit compilers are also supported). Copy this file to your own */
/* `freetype/builds/<system>' directory, and edit it to port the engine. */
/* `builds/<system>' directory, and edit it to port the engine. */
/* */
/*************************************************************************/

6
builds/wince/ftdebug.c
View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for WinCE (body). */
/* */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by */
/* Copyright 1996-2002, 2005, 2008, 2009, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -148,8 +148,8 @@
/* for the memory and stream components which are set to 6 and 5, */
/* respectively. */
/* */
/* See the file <freetype/internal/fttrace.h> for details of the */
/* available toggle names. */
/* See the file <internal/fttrace.h> for details of the available toggle */
/* names. */
/* */
/* The level must be between 0 and 6; 0 means quiet (except for serious */
/* runtime errors), and 6 means _very_ verbose. */

10
builds/wince/vc2005-ce/freetype.vcproj
View File

@ -3822,15 +3822,15 @@
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
<File RelativePath="..\..\..\include\ft2build.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
<File RelativePath="..\..\..\include\config\ftconfig.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftheader.h">
<File RelativePath="..\..\..\include\config\ftheader.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
<File RelativePath="..\..\..\include\config\ftmodule.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftoption.h">
<File RelativePath="..\..\..\include\config\ftoption.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
<File RelativePath="..\..\..\include\config\ftstdlib.h">
</File>
</Filter>
</Files>

10
builds/wince/vc2008-ce/freetype.vcproj
View File

@ -13469,23 +13469,23 @@
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
RelativePath="..\..\..\include\config\ftconfig.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftheader.h"
RelativePath="..\..\..\include\config\ftheader.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
RelativePath="..\..\..\include\config\ftmodule.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftoption.h"
RelativePath="..\..\..\include\config\ftoption.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
RelativePath="..\..\..\include\config\ftstdlib.h"
>
</File>
</Filter>

6
builds/windows/ftdebug.c
View File

@ -4,7 +4,7 @@
/* */
/* Debugging and logging component for Win32 (body). */
/* */
/* Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by */
/* Copyright 1996-2002, 2005, 2008, 2009, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -137,8 +137,8 @@
/* for the memory and stream components which are set to 6 and 5, */
/* respectively. */
/* */
/* See the file <freetype/internal/fttrace.h> for details of the */
/* available toggle names. */
/* See the file <internal/fttrace.h> for details of the available toggle */
/* names. */
/* */
/* The level must be between 0 and 6; 0 means quiet (except for serious */
/* runtime errors), and 6 means _very_ verbose. */

10
builds/windows/vc2005/freetype.vcproj
View File

@ -629,15 +629,15 @@
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
<File RelativePath="..\..\..\include\ft2build.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
<File RelativePath="..\..\..\include\config\ftconfig.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftheader.h">
<File RelativePath="..\..\..\include\config\ftheader.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
<File RelativePath="..\..\..\include\config\ftmodule.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftoption.h">
<File RelativePath="..\..\..\include\config\ftoption.h">
</File>
<File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
<File RelativePath="..\..\..\include\config\ftstdlib.h">
</File>
</Filter>
</Files>

10
builds/windows/vc2008/freetype.vcproj
View File

@ -2154,23 +2154,23 @@
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
RelativePath="..\..\..\include\config\ftconfig.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftheader.h"
RelativePath="..\..\..\include\config\ftheader.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
RelativePath="..\..\..\include\config\ftmodule.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftoption.h"
RelativePath="..\..\..\include\config\ftoption.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
RelativePath="..\..\..\include\config\ftstdlib.h"
>
</File>
</Filter>

10
builds/windows/vc2010/freetype.vcxproj
View File

@ -1565,11 +1565,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\ft2build.h" />
<ClInclude Include="..\..\..\include\freetype\config\ftconfig.h" />
<ClInclude Include="..\..\..\include\freetype\config\ftheader.h" />
<ClInclude Include="..\..\..\include\freetype\config\ftmodule.h" />
<ClInclude Include="..\..\..\include\freetype\config\ftoption.h" />
<ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h" />
<ClInclude Include="..\..\..\include\config\ftconfig.h" />
<ClInclude Include="..\..\..\include\config\ftheader.h" />
<ClInclude Include="..\..\..\include\config\ftmodule.h" />
<ClInclude Include="..\..\..\include\config\ftoption.h" />
<ClInclude Include="..\..\..\include\config\ftstdlib.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

10
builds/windows/vc2010/freetype.vcxproj.filters
View File

@ -136,19 +136,19 @@
<ClInclude Include="..\..\..\include\ft2build.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\freetype\config\ftconfig.h">
<ClInclude Include="..\..\..\include\config\ftconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\freetype\config\ftheader.h">
<ClInclude Include="..\..\..\include\config\ftheader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\freetype\config\ftmodule.h">
<ClInclude Include="..\..\..\include\config\ftmodule.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\freetype\config\ftoption.h">
<ClInclude Include="..\..\..\include\config\ftoption.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h">
<ClInclude Include="..\..\..\include\config\ftstdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

14
builds/windows/visualc/freetype.dsp
View File

@ -92,7 +92,7 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\..\..\objs\debug_mt"
# PROP Intermediate_Dir "..\..\..\objs\debug_mt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
# SUBTRACT BASE CPP /X
# ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
# SUBTRACT CPP /nologo /X /YX
@ -117,7 +117,7 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\..\..\objs\release_mt"
# PROP Intermediate_Dir "..\..\..\objs\release_mt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
# ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
# SUBTRACT CPP /nologo /Z<none> /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftconfig.h
SOURCE=..\..\..\include\config\ftconfig.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftheader.h
SOURCE=..\..\..\include\config\ftheader.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftmodule.h
SOURCE=..\..\..\include\config\ftmodule.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftoption.h
SOURCE=..\..\..\include\config\ftoption.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftstdlib.h
SOURCE=..\..\..\include\config\ftstdlib.h
# End Source File
# End Group
# End Target

10
builds/windows/visualc/freetype.vcproj
View File

@ -2153,23 +2153,23 @@
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
RelativePath="..\..\..\include\config\ftconfig.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftheader.h"
RelativePath="..\..\..\include\config\ftheader.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
RelativePath="..\..\..\include\config\ftmodule.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftoption.h"
RelativePath="..\..\..\include\config\ftoption.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
RelativePath="..\..\..\include\config\ftstdlib.h"
>
</File>
</Filter>

14
builds/windows/visualce/freetype.dsp
View File

@ -92,7 +92,7 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\..\..\objs\debug_mt"
# PROP Intermediate_Dir "..\..\..\objs\debug_mt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
# SUBTRACT BASE CPP /X
# ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
# SUBTRACT CPP /nologo /X /YX
@ -117,7 +117,7 @@ LIB32=link.exe -lib
# PROP Output_Dir "..\..\..\objs\release_mt"
# PROP Intermediate_Dir "..\..\..\objs\release_mt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
# ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
# SUBTRACT CPP /nologo /Z<none> /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftconfig.h
SOURCE=..\..\..\include\config\ftconfig.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftheader.h
SOURCE=..\..\..\include\config\ftheader.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftmodule.h
SOURCE=..\..\..\include\config\ftmodule.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftoption.h
SOURCE=..\..\..\include\config\ftoption.h
# End Source File
# Begin Source File
SOURCE=..\..\..\include\freetype\config\ftstdlib.h
SOURCE=..\..\..\include\config\ftstdlib.h
# End Source File
# End Group
# End Target

10
builds/windows/visualce/freetype.vcproj
View File

@ -13859,23 +13859,23 @@
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftconfig.h"
RelativePath="..\..\..\include\config\ftconfig.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftheader.h"
RelativePath="..\..\..\include\config\ftheader.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftmodule.h"
RelativePath="..\..\..\include\config\ftmodule.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftoption.h"
RelativePath="..\..\..\include\config\ftoption.h"
>
</File>
<File
RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
RelativePath="..\..\..\include\config\ftstdlib.h"
>
</File>
</Filter>

4
devel/ft2build.h
View File

@ -31,9 +31,9 @@
#ifndef __FT2_BUILD_DEVEL_H__
#define __FT2_BUILD_DEVEL_H__
#define FT_CONFIG_OPTIONS_H <ftoption.h>
#define FT_CONFIG_OPTIONS_H <ftoption.h>
#include <freetype/config/ftheader.h>
#include <config/ftheader.h>
#endif /* __FT2_BUILD_DEVEL_H__ */

12
devel/ftoption.h
View File

@ -38,9 +38,9 @@ FT_BEGIN_HEADER
/* library from a single source directory. */
/* */
/* - You can put a copy of this file in your build directory, more */
/* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */
/* is the name of a directory that is included _before_ the FreeType */
/* include path during compilation. */
/* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */
/* name of a directory that is included _before_ the FreeType include */
/* path during compilation. */
/* */
/* The default FreeType Makefiles and Jamfiles use the build */
/* directory `builds/<system>' by default, but you can easily change */
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
/* locate this file during the build. For example, */
/* */
/* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */
/* #include <freetype/config/ftheader.h> */
/* #include <config/ftheader.h> */
/* */
/* will use `$BUILD/myftoptions.h' instead of this file for macro */
/* definitions. */
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
/* Note also that you can similarly pre-define the macro */
/* FT_CONFIG_MODULES_H used to locate the file listing of the modules */
/* that are statically linked to the library at compile time. By */
/* default, this file is <freetype/config/ftmodule.h>. */
/* default, this file is <config/ftmodule.h>. */
/* */
/* We highly recommend using the third method whenever possible. */
/* */
@ -528,7 +528,7 @@ FT_BEGIN_HEADER
/* does not contain any glyph name though. */
/* */
/* Accessing SFNT names is done through the functions declared in */
/* `freetype/ftsnames.h'. */
/* `ftsnames.h'. */
/* */
#define TT_CONFIG_OPTION_SFNT_NAMES

32
docs/CUSTOMIZE
View File

@ -8,10 +8,9 @@ How to customize the compilation of the library
I. Configuration macros
The file found in `include/freetype/config/ftoption.h' contains a
list of commented configuration macros that can be toggled by
developers to indicate which features should be active while
building the library.
The file found in `include/config/ftoption.h' contains a list of
commented configuration macros that can be toggled by developers to
indicate which features should be active while building the library.
These options range from debug level to availability of certain
features, like native TrueType hinting through a bytecode
@ -36,9 +35,9 @@ II. Modules list
can keep the source files `clean'.
If you don't use GNU make you have to manually edit the file
`include/freetype/config/ftmodule.h' (which is *not* used with if
compiled with GNU make) to add or remove the drivers and components
you want to compile into the library. See `INSTALL.ANY' for more
`include/config/ftmodule.h' (which is *not* used with if compiled
with GNU make) to add or remove the drivers and components you want
to compile into the library. See `INSTALL.ANY' for more
information.
@ -96,19 +95,16 @@ IV. Overriding default configuration and module headers
#include FT_CONFIG_OPTIONS_H
#include FT_CONFIG_MODULES_H
are compiled. Their default values being
<freetype/config/ftoption.h> and <freetype/config/ftmodule.h>, you
can do something like:
are compiled. Their default values being <config/ftoption.h> and
<config/ftmodule.h>, you can do something like:
custom/
freetype/
config/
ftoption.h => custom options header
ftmodule.h => custom modules list
config/
ftoption.h => custom options header
ftmodule.h => custom modules list
include/ => normal FreeType 2 include
freetype/
...
...
then change the C include path to always give the path to `custom'
before the FreeType 2 `include'.
@ -126,7 +122,7 @@ IV. Overriding default configuration and module headers
#define FT_CONFIG_OPTIONS_H <custom/my-ftoption.h>
#define FT_CONFIG_MODULES_H <custom/my-ftmodule.h>
#include <freetype/config/ftheader.h>
#include <config/ftheader.h>
#endif /* __FT2_BUILD_MY_PLATFORM_H__ */
@ -142,7 +138,7 @@ IV. Overriding default configuration and module headers
----------------------------------------------------------------------
Copyright 2003, 2005, 2006, 2012 by
Copyright 2003, 2005, 2006, 2012, 2013 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

182
docs/DEBUG
View File

@ -4,63 +4,63 @@ Debugging within the FreeType sources
I. Configuration macros
-----------------------
There are several ways to enable debugging features in a FreeType 2
builds. This is controlled through the definition of special macros
There are several ways to enable debugging features in a FreeType 2
builds. This is controlled through the definition of special macros
located in the file `ftoptions.h'. The macros are:
FT_DEBUG_LEVEL_ERROR
#define this macro if you want to compile the FT_ERROR macro calls
to print error messages during program execution. This will not
stop the program. Very useful to spot invalid fonts during
#define this macro if you want to compile the FT_ERROR macro calls
to print error messages during program execution. This will not
stop the program. Very useful to spot invalid fonts during
development and to code workarounds for them.
FT_DEBUG_LEVEL_TRACE
#define this macro if you want to compile both macros FT_ERROR and
FT_TRACE. This also includes the variants FT_TRACE0, FT_TRACE1,
#define this macro if you want to compile both macros FT_ERROR and
FT_TRACE. This also includes the variants FT_TRACE0, FT_TRACE1,
FT_TRACE2, ..., FT_TRACE7.
The trace macros are used to send debugging messages when an
appropriate `debug level' is configured at runtime through the
The trace macros are used to send debugging messages when an
appropriate `debug level' is configured at runtime through the
FT2_DEBUG environment variable (more on this later).
FT_DEBUG_MEMORY
If this macro is #defined, the FreeType engine is linked with a
small but effective debugging memory manager that tracks all
If this macro is #defined, the FreeType engine is linked with a
small but effective debugging memory manager that tracks all
allocations and frees that are performed within the font engine.
When the FT2_DEBUG_MEMORY environment variable is defined at
runtime, a call to FT_Done_FreeType will dump memory statistics,
including the list of leaked memory blocks with the source locations
where these were allocated. It is always a very good idea to define
this in development builds. This works with _any_ program linked to
FreeType, but requires a big deal of memory (the debugging memory
manager never frees the blocks to the heap in order to detect double
frees).
When the FT2_DEBUG_MEMORY environment variable is defined at
runtime, a call to FT_Done_FreeType will dump memory statistics,
including the list of leaked memory blocks with the source
locations where these were allocated. It is always a very good
idea to define this in development builds. This works with _any_
program linked to FreeType, but requires a big deal of memory (the
debugging memory manager never frees the blocks to the heap in
order to detect double frees).
When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging memory
manager is ignored, and performance is unaffected.
When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging
memory manager is ignored, and performance is unaffected.
II. Debugging macros
--------------------
Several macros can be used within the FreeType sources to help debugging
its code:
Several macros can be used within the FreeType sources to help
debugging its code:
1. FT_ERROR(( ... ))
This macro is used to send debug messages that indicate relatively
serious errors (like broken font files), but will not stop the
execution of the running program. Its code is compiled only when
either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in
This macro is used to send debug messages that indicate relatively
serious errors (like broken font files), but will not stop the
execution of the running program. Its code is compiled only when
either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in
`ftoption.h'.
Note that you have to use a printf-like signature, but with double
Note that you have to use a printf-like signature, but with double
parentheses, like in
FT_ERROR(( "your %s is not %s\n", "foo", "bar" ));
@ -68,128 +68,130 @@ its code:
2. FT_ASSERT( condition )
This macro is used to check strong assertions at runtime. If its
condition isn't TRUE, the program will abort with a panic message.
Its code is compiled when either FT_DEBUG_LEVEL_ERROR or
FT_DEBUG_LEVEL_TRACE are defined. You don't need double parentheses
here. For example
This macro is used to check strong assertions at runtime. If its
condition isn't TRUE, the program will abort with a panic message.
Its code is compiled when either FT_DEBUG_LEVEL_ERROR or
FT_DEBUG_LEVEL_TRACE are defined. You don't need double
parentheses here. For example
FT_ASSERT( ptr != NULL );
3. FT_TRACE( level, (message...) )
The FT_TRACE macro is used to send general-purpose debugging
messages during program execution. This macro uses an *implicit*
macro named FT_COMPONENT used to name the current FreeType component
being run.
The FT_TRACE macro is used to send general-purpose debugging
messages during program execution. This macro uses an *implicit*
macro named FT_COMPONENT used to name the current FreeType
component being run.
The developer should always define FT_COMPONENT as appropriate, for
example as in
The developer should always define FT_COMPONENT as appropriate,
for example as in
#undef FT_COMPONENT
#define FT_COMPONENT trace_io
The value of the FT_COMPONENT macro is an enumeration named
trace_XXXX where XXXX is one of the component names defined in the
internal file `freetype/internal/fttrace.h'. If you modify FreeType
source and insert new trace_XXXX macro, you must register it in
fttrace.h. If you insert or remove many trace macros, you can check
the undefined or the unused trace macro by src/tools/chktrcmp.py.
The value of the FT_COMPONENT macro is an enumeration named
`trace_XXXX' where `XXXX' is one of the component names defined in
the internal file `internal/fttrace.h'. If you modify FreeType
source and insert new `trace_XXXX' macro, you must register it in
`fttrace.h'. If you insert or remove many trace macros, you can
check the undefined or the unused trace macro by
`src/tools/chktrcmp.py'.
Each such component is assigned a `debug level', ranging from 0
to 7, through the use of the FT2_DEBUG environment variable
Each such component is assigned a `debug level', ranging from 0 to
7, through the use of the FT2_DEBUG environment variable
(described below) when a program linked with FreeType starts.
When FT_TRACE is called, its level is compared to the one of the
corresponding component. Messages with trace levels *higher* than
When FT_TRACE is called, its level is compared to the one of the
corresponding component. Messages with trace levels *higher* than
the corresponding component level are filtered and never printed.
This means that trace messages with level 0 are always printed,
those with level 2 are only printed when the component level is *at
least* 2.
This means that trace messages with level 0 are always printed,
those with level 2 are only printed when the component level is
*at least* 2.
The second parameter to FT_TRACE must contain parentheses and
The second parameter to FT_TRACE must contain parentheses and
correspond to a printf-like call, as in
FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) )
The shortcut macros FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., FT_TRACE7
can be used with constant level indices, and are much cleaner to
use, as in
The shortcut macros FT_TRACE0, FT_TRACE1, FT_TRACE2, ...,
FT_TRACE7 can be used with constant level indices, and are much
cleaner to use, as in
FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));
FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));
III. Environment variables
--------------------------
The following environment variables control debugging output and
The following environment variables control debugging output and
behaviour of FreeType at runtime.
FT2_DEBUG
This variable is only used when FreeType is built with
FT_DEBUG_LEVEL_TRACE defined. It contains a list of component level
definitions, following this format:
This variable is only used when FreeType is built with
FT_DEBUG_LEVEL_TRACE defined. It contains a list of component
level definitions, following this format:
component1:level1 component2:level2 component3:level3 ...
component1:level1 component2:level2 component3:level3 ...
where `componentX' is the name of a tracing component, as defined in
`fttrace.h', but without the `trace_' prefix. `levelX' is the
where `componentX' is the name of a tracing component, as defined
in `fttrace.h', but without the `trace_' prefix. `levelX' is the
corresponding level to use at runtime.
`any' is a special component name that will be interpreted as
`any' is a special component name that will be interpreted as
`any/all components'. For example, the following definitions
set FT2_DEBUG=any:2 memory:5 io:4 (on Windows)
export FT2_DEBUG="any:2 memory:5 io:4" (on Linux with bash)
set FT2_DEBUG=any:2 memory:5 io:4 (on Windows)
export FT2_DEBUG="any:2 memory:5 io:4" (on Linux with bash)
both stipulate that all components should have level 2, except for
the memory and io components which will be set to trace levels 5 and
4, respectively.
both stipulate that all components should have level 2, except for
the memory and io components which will be set to trace levels 5
and 4, respectively.
FT2_DEBUG_MEMORY
This environment variable, when defined, tells FreeType to use a
debugging memory manager that will track leaking memory blocks as
well as other common errors like double frees. It is also capable
of reporting _where_ the leaking blocks were allocated, which
considerably saves time when debugging new additions to the library.
This environment variable, when defined, tells FreeType to use a
debugging memory manager that will track leaking memory blocks as
well as other common errors like double frees. It is also capable
of reporting _where_ the leaking blocks were allocated, which
considerably saves time when debugging new additions to the
library.
This code is only compiled when FreeType is built with the
FT_DEBUG_MEMORY macro #defined in `ftoption.h' though, it will be
This code is only compiled when FreeType is built with the
FT_DEBUG_MEMORY macro #defined in `ftoption.h' though, it will be
ignored in other builds.
FT2_ALLOC_TOTAL_MAX
This variable is ignored if FT2_DEBUG_MEMORY is not defined. It
allows you to specify a maximum heap size for all memory allocations
performed by FreeType. This is very useful to test the robustness
of the font engine and programs that use it in tight memory
conditions.
This variable is ignored if FT2_DEBUG_MEMORY is not defined. It
allows you to specify a maximum heap size for all memory
allocations performed by FreeType. This is very useful to test
the robustness of the font engine and programs that use it in
tight memory conditions.
If it is undefined, or if its value is not strictly positive, then
If it is undefined, or if its value is not strictly positive, then
no allocation bounds are checked at runtime.
FT2_ALLOC_COUNT_MAX
This variable is ignored if FT2_DEBUG_MEMORY is not defined. It
allows you to specify a maximum number of memory allocations
performed by FreeType before returning the error
FT_Err_Out_Of_Memory. This is useful for debugging and testing the
engine's robustness.
This variable is ignored if FT2_DEBUG_MEMORY is not defined. It
allows you to specify a maximum number of memory allocations
performed by FreeType before returning the error
FT_Err_Out_Of_Memory. This is useful for debugging and testing
the engine's robustness.
If it is undefined, or if its value is not strictly positive, then
If it is undefined, or if its value is not strictly positive, then
no allocation bounds are checked at runtime.
------------------------------------------------------------------------
Copyright 2002, 2003, 2004, 2005, 2009 by
Copyright 2002-2005, 2009, 2013 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

34
docs/INSTALL.ANY
View File

@ -33,25 +33,25 @@ I. Standard procedure
src/base/ftbase.c
src/base/ftbbox.c -- recommended, see <freetype/ftbbox.h>
src/base/ftglyph.c -- recommended, see <freetype/ftglyph.h>
src/base/ftbbox.c -- recommended, see <ftbbox.h>
src/base/ftglyph.c -- recommended, see <ftglyph.h>
src/base/ftbdf.c -- optional, see <freetype/ftbdf.h>
src/base/ftbitmap.c -- optional, see <freetype/ftbitmap.h>
src/base/ftcid.c -- optional, see <freetype/ftcid.h>
src/base/ftbdf.c -- optional, see <ftbdf.h>
src/base/ftbitmap.c -- optional, see <ftbitmap.h>
src/base/ftcid.c -- optional, see <ftcid.h>
src/base/ftfstype.c -- optional
src/base/ftgasp.c -- optional, see <freetype/ftgasp.h>
src/base/ftgxval.c -- optional, see <freetype/ftgxval.h>
src/base/ftlcdfil.c -- optional, see <freetype/ftlcdfil.h>
src/base/ftmm.c -- optional, see <freetype/ftmm.h>
src/base/ftotval.c -- optional, see <freetype/ftotval.h>
src/base/ftgasp.c -- optional, see <ftgasp.h>
src/base/ftgxval.c -- optional, see <ftgxval.h>
src/base/ftlcdfil.c -- optional, see <ftlcdfil.h>
src/base/ftmm.c -- optional, see <ftmm.h>
src/base/ftotval.c -- optional, see <ftotval.h>
src/base/ftpatent.c -- optional
src/base/ftpfr.c -- optional, see <freetype/ftpfr.h>
src/base/ftstroke.c -- optional, see <freetype/ftstroke.h>
src/base/ftsynth.c -- optional, see <freetype/ftsynth.h>
src/base/fttype1.c -- optional, see <freetype/t1tables.h>
src/base/ftwinfnt.c -- optional, see <freetype/ftwinfnt.h>
src/base/ftxf86.c -- optional, see <freetype/ftxf86.h>
src/base/ftpfr.c -- optional, see <ftpfr.h>
src/base/ftstroke.c -- optional, see <ftstroke.h>
src/base/ftsynth.c -- optional, see <ftsynth.h>
src/base/fttype1.c -- optional, see <t1tables.h>
src/base/ftwinfnt.c -- optional, see <ftwinfnt.h>
src/base/ftxf86.c -- optional, see <ftxf86.h>
src/base/ftmac.c -- only on the Macintosh
@ -143,7 +143,7 @@ II. Support for flat-directory compilation
----------------------------------------------------------------------
Copyright 2003, 2005, 2006, 2009, 2010 by
Copyright 2003, 2005, 2006, 2009, 2010, 2013 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used,

2
docs/release
View File

@ -1,7 +1,7 @@
How to prepare a new release
----------------------------
. include/freetype/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR,
. include/freetype.h: Update FREETYPE_MAJOR, FREETYPE_MINOR,
and FREETYPE_PATCH.
. Update version numbers in all files where necessary (for example, do

10
include/freetype/config/ftconfig.h → include/config/ftconfig.h
View File

@ -27,11 +27,11 @@
/* Note however that if some specific modifications are needed, we */
/* advise you to place a modified copy in your build directory. */
/* */
/* The build directory is usually `freetype/builds/<system>', and */
/* contains system-specific files that are always included first when */
/* building the library. */
/* The build directory is usually `builds/<system>', and contains */
/* system-specific files that are always included first when building */
/* the library. */
/* */
/* This ANSI version should stay in `include/freetype/config'. */
/* This ANSI version should stay in `include/config/'. */
/* */
/*************************************************************************/
@ -53,7 +53,7 @@ FT_BEGIN_HEADER
/* These macros can be toggled to suit a specific system. The current */
/* ones are defaults used to compile FreeType in an ANSI C environment */
/* (16bit compilers are also supported). Copy this file to your own */
/* `freetype/builds/<system>' directory, and edit it to port the engine. */
/* `builds/<system>' directory, and edit it to port the engine. */
/* */
/*************************************************************************/

118
include/freetype/config/ftheader.h → include/config/ftheader.h
View File

@ -107,7 +107,7 @@
*
*/
#ifndef FT_CONFIG_CONFIG_H
#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
#define FT_CONFIG_CONFIG_H <config/ftconfig.h>
#endif
@ -122,7 +122,7 @@
*
*/
#ifndef FT_CONFIG_STANDARD_LIBRARY_H
#define FT_CONFIG_STANDARD_LIBRARY_H <freetype/config/ftstdlib.h>
#define FT_CONFIG_STANDARD_LIBRARY_H <config/ftstdlib.h>
#endif
@ -137,7 +137,7 @@
*
*/
#ifndef FT_CONFIG_OPTIONS_H
#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
#define FT_CONFIG_OPTIONS_H <config/ftoption.h>
#endif
@ -153,7 +153,7 @@
*
*/
#ifndef FT_CONFIG_MODULES_H
#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
#define FT_CONFIG_MODULES_H <config/ftmodule.h>
#endif
/* */
@ -170,7 +170,7 @@
* base FreeType~2 API.
*
*/
#define FT_FREETYPE_H <freetype/freetype.h>
#define FT_FREETYPE_H <freetype.h>
/*************************************************************************
@ -185,7 +185,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_ERRORS_H <freetype/fterrors.h>
#define FT_ERRORS_H <fterrors.h>
/*************************************************************************
@ -198,7 +198,7 @@
* list of FreeType~2 module error offsets (and messages).
*
*/
#define FT_MODULE_ERRORS_H <freetype/ftmoderr.h>
#define FT_MODULE_ERRORS_H <ftmoderr.h>
/*************************************************************************
@ -214,7 +214,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_SYSTEM_H <freetype/ftsystem.h>
#define FT_SYSTEM_H <ftsystem.h>
/*************************************************************************
@ -230,7 +230,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_IMAGE_H <freetype/ftimage.h>
#define FT_IMAGE_H <ftimage.h>
/*************************************************************************
@ -245,7 +245,7 @@
* It is included by @FT_FREETYPE_H.
*
*/
#define FT_TYPES_H <freetype/fttypes.h>
#define FT_TYPES_H <fttypes.h>
/*************************************************************************
@ -260,7 +260,7 @@
* (Most applications will never need to include this file.)
*
*/
#define FT_LIST_H <freetype/ftlist.h>
#define FT_LIST_H <ftlist.h>
/*************************************************************************
@ -273,7 +273,7 @@
* scalable outline management API of FreeType~2.
*
*/
#define FT_OUTLINE_H <freetype/ftoutln.h>
#define FT_OUTLINE_H <ftoutln.h>
/*************************************************************************
@ -286,7 +286,7 @@
* API which manages multiple @FT_Size objects per face.
*
*/
#define FT_SIZES_H <freetype/ftsizes.h>
#define FT_SIZES_H <ftsizes.h>
/*************************************************************************
@ -299,7 +299,7 @@
* module management API of FreeType~2.
*
*/
#define FT_MODULE_H <freetype/ftmodapi.h>
#define FT_MODULE_H <ftmodapi.h>
/*************************************************************************
@ -312,7 +312,7 @@
* renderer module management API of FreeType~2.
*
*/
#define FT_RENDER_H <freetype/ftrender.h>
#define FT_RENDER_H <ftrender.h>
/*************************************************************************
@ -325,7 +325,7 @@
* structures and macros related to the auto-hinting module.
*
*/
#define FT_AUTOHINTER_H <freetype/ftautoh.h>
#define FT_AUTOHINTER_H <ftautoh.h>
/*************************************************************************
@ -338,7 +338,7 @@
* structures and macros related to the CFF driver module.
*
*/
#define FT_CFF_DRIVER_H <freetype/ftcffdrv.h>
#define FT_CFF_DRIVER_H <ftcffdrv.h>
/*************************************************************************
@ -351,7 +351,7 @@
* structures and macros related to the TrueType driver module.
*
*/
#define FT_TRUETYPE_DRIVER_H <freetype/ftttdrv.h>
#define FT_TRUETYPE_DRIVER_H <ftttdrv.h>
/*************************************************************************
@ -364,7 +364,7 @@
* types and API specific to the Type~1 format.
*
*/
#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
#define FT_TYPE1_TABLES_H <t1tables.h>
/*************************************************************************
@ -379,7 +379,7 @@
* definitions, taken from the TrueType and OpenType specifications.
*
*/
#define FT_TRUETYPE_IDS_H <freetype/ttnameid.h>
#define FT_TRUETYPE_IDS_H <ttnameid.h>
/*************************************************************************
@ -392,7 +392,7 @@
* types and API specific to the TrueType (as well as OpenType) format.
*
*/
#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
#define FT_TRUETYPE_TABLES_H <tttables.h>
/*************************************************************************
@ -406,7 +406,7 @@
* SFNT-based font formats (i.e., TrueType and OpenType).
*
*/
#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
#define FT_TRUETYPE_TAGS_H <tttags.h>
/*************************************************************************
@ -420,7 +420,7 @@
* face.
*
*/
#define FT_BDF_H <freetype/ftbdf.h>
#define FT_BDF_H <ftbdf.h>
/*************************************************************************
@ -434,7 +434,7 @@
* face.
*
*/
#define FT_CID_H <freetype/ftcid.h>
#define FT_CID_H <ftcid.h>
/*************************************************************************
@ -447,7 +447,7 @@
* definitions of an API which supports gzip-compressed files.
*
*/
#define FT_GZIP_H <freetype/ftgzip.h>
#define FT_GZIP_H <ftgzip.h>
/*************************************************************************
@ -460,7 +460,7 @@
* definitions of an API which supports LZW-compressed files.
*
*/
#define FT_LZW_H <freetype/ftlzw.h>
#define FT_LZW_H <ftlzw.h>
/*************************************************************************
@ -473,7 +473,7 @@
* definitions of an API which supports bzip2-compressed files.
*
*/
#define FT_BZIP2_H <freetype/ftbzip2.h>
#define FT_BZIP2_H <ftbzip2.h>
/*************************************************************************
@ -486,7 +486,7 @@
* definitions of an API which supports Windows FNT files.
*
*/
#define FT_WINFONTS_H <freetype/ftwinfnt.h>
#define FT_WINFONTS_H <ftwinfnt.h>
/*************************************************************************
@ -499,7 +499,7 @@
* API of the optional glyph management component.
*
*/
#define FT_GLYPH_H <freetype/ftglyph.h>
#define FT_GLYPH_H <ftglyph.h>
/*************************************************************************
@ -512,7 +512,7 @@
* API of the optional bitmap conversion component.
*
*/
#define FT_BITMAP_H <freetype/ftbitmap.h>
#define FT_BITMAP_H <ftbitmap.h>
/*************************************************************************
@ -525,7 +525,7 @@
* API of the optional exact bounding box computation routines.
*
*/
#define FT_BBOX_H <freetype/ftbbox.h>
#define FT_BBOX_H <ftbbox.h>
/*************************************************************************
@ -538,7 +538,7 @@
* API of the optional FreeType~2 cache sub-system.
*
*/
#define FT_CACHE_H <freetype/ftcache.h>
#define FT_CACHE_H <ftcache.h>
/*************************************************************************
@ -612,7 +612,7 @@
* compiled on the Mac (note that the base API still works though).
*
*/
#define FT_MAC_H <freetype/ftmac.h>
#define FT_MAC_H <ftmac.h>
/*************************************************************************
@ -625,7 +625,7 @@
* optional multiple-masters management API of FreeType~2.
*
*/
#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
#define FT_MULTIPLE_MASTERS_H <ftmm.h>
/*************************************************************************
@ -639,7 +639,7 @@
* SFNT-based font formats (i.e., TrueType and OpenType).
*
*/
#define FT_SFNT_NAMES_H <freetype/ftsnames.h>
#define FT_SFNT_NAMES_H <ftsnames.h>
/*************************************************************************
@ -653,7 +653,7 @@
* GPOS, GSUB, JSTF).
*
*/
#define FT_OPENTYPE_VALIDATE_H <freetype/ftotval.h>
#define FT_OPENTYPE_VALIDATE_H <ftotval.h>
/*************************************************************************
@ -667,7 +667,7 @@
* mort, morx, bsln, just, kern, opbd, trak, prop).
*
*/
#define FT_GX_VALIDATE_H <freetype/ftgxval.h>
#define FT_GX_VALIDATE_H <ftgxval.h>
/*************************************************************************
@ -680,7 +680,7 @@
* FreeType~2 API which accesses PFR-specific data.
*
*/
#define FT_PFR_H <freetype/ftpfr.h>
#define FT_PFR_H <ftpfr.h>
/*************************************************************************
@ -692,7 +692,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which provides functions to stroke outline paths.
*/
#define FT_STROKER_H <freetype/ftstroke.h>
#define FT_STROKER_H <ftstroke.h>
/*************************************************************************
@ -704,7 +704,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs artificial obliquing and emboldening.
*/
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_SYNTHESIS_H <ftsynth.h>
/*************************************************************************
@ -717,7 +717,7 @@
* FreeType~2 API which provides functions specific to the XFree86 and
* X.Org X11 servers.
*/
#define FT_XFREE86_H <freetype/ftxf86.h>
#define FT_XFREE86_H <ftxf86.h>
/*************************************************************************
@ -730,7 +730,7 @@
* FreeType~2 API which performs trigonometric computations (e.g.,
* cosines and arc tangents).
*/
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
#define FT_TRIGONOMETRY_H <fttrigon.h>
/*************************************************************************
@ -742,7 +742,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_LCD_FILTER_H <freetype/ftlcdfil.h>
#define FT_LCD_FILTER_H <ftlcdfil.h>
/*************************************************************************
@ -754,7 +754,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_UNPATENTED_HINTING_H <freetype/ttunpat.h>
#define FT_UNPATENTED_HINTING_H <ttunpat.h>
/*************************************************************************
@ -766,7 +766,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which performs color filtering for subpixel rendering.
*/
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
#define FT_INCREMENTAL_H <ftincrem.h>
/*************************************************************************
@ -778,7 +778,7 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which returns entries from the TrueType GASP table.
*/
#define FT_GASP_H <freetype/ftgasp.h>
#define FT_GASP_H <ftgasp.h>
/*************************************************************************
@ -790,38 +790,38 @@
* A macro used in #include statements to name the file containing the
* FreeType~2 API which returns individual and ranged glyph advances.
*/
#define FT_ADVANCES_H <freetype/ftadvanc.h>
#define FT_ADVANCES_H <ftadvanc.h>
/* */
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
#define FT_ERROR_DEFINITIONS_H <fterrdef.h>
/* The internals of the cache sub-system are no longer exposed. We */
/* default to FT_CACHE_H at the moment just in case, but we know of */
/* no rogue client that uses them. */
/* */
#define FT_CACHE_MANAGER_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MRU_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_MANAGER_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_CACHE_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_GLYPH_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_IMAGE_H <freetype/ftcache.h>
#define FT_CACHE_INTERNAL_SBITS_H <freetype/ftcache.h>
#define FT_CACHE_MANAGER_H <ftcache.h>
#define FT_CACHE_INTERNAL_MRU_H <ftcache.h>
#define FT_CACHE_INTERNAL_MANAGER_H <ftcache.h>
#define FT_CACHE_INTERNAL_CACHE_H <ftcache.h>
#define FT_CACHE_INTERNAL_GLYPH_H <ftcache.h>
#define FT_CACHE_INTERNAL_IMAGE_H <ftcache.h>
#define FT_CACHE_INTERNAL_SBITS_H <ftcache.h>
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
#define FT_INCREMENTAL_H <ftincrem.h>
#define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
#define FT_TRUETYPE_UNPATENTED_H <ttunpat.h>
/*
* Include internal headers definitions from <freetype/internal/...>
* Include internal headers definitions from <internal/...>
* only when building the library.
*/
#ifdef FT2_BUILD_LIBRARY
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#define FT_INTERNAL_INTERNAL_H <internal/internal.h>
#include FT_INTERNAL_INTERNAL_H
#endif /* FT2_BUILD_LIBRARY */

0
include/freetype/config/ftmodule.h → include/config/ftmodule.h
View File

12
include/freetype/config/ftoption.h → include/config/ftoption.h
View File

@ -38,9 +38,9 @@ FT_BEGIN_HEADER
/* library from a single source directory. */
/* */
/* - You can put a copy of this file in your build directory, more */
/* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */
/* is the name of a directory that is included _before_ the FreeType */
/* include path during compilation. */
/* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */
/* name of a directory that is included _before_ the FreeType include */
/* path during compilation. */
/* */
/* The default FreeType Makefiles and Jamfiles use the build */
/* directory `builds/<system>' by default, but you can easily change */
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
/* locate this file during the build. For example, */
/* */
/* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */
/* #include <freetype/config/ftheader.h> */
/* #include <config/ftheader.h> */
/* */
/* will use `$BUILD/myftoptions.h' instead of this file for macro */
/* definitions. */
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
/* Note also that you can similarly pre-define the macro */
/* FT_CONFIG_MODULES_H used to locate the file listing of the modules */
/* that are statically linked to the library at compile time. By */
/* default, this file is <freetype/config/ftmodule.h>. */
/* default, this file is <config/ftmodule.h>. */
/* */
/* We highly recommend using the third method whenever possible. */
/* */
@ -528,7 +528,7 @@ FT_BEGIN_HEADER
/* does not contain any glyph name though. */
/* */
/* Accessing SFNT names is done through the functions declared in */
/* `freetype/ftsnames.h'. */
/* `ftsnames.h'. */
/* */
#define TT_CONFIG_OPTION_SFNT_NAMES

0
include/freetype/config/ftstdlib.h → include/config/ftstdlib.h
View File

2
include/freetype/freetype.h → include/freetype.h
View File

@ -3027,7 +3027,7 @@ FT_BEGIN_HEADER
/* */
/* This function is not compiled within the library if the config */
/* macro `FT_CONFIG_OPTION_NO_GLYPH_NAMES' is defined in */
/* `include/freetype/config/ftoptions.h'. */
/* `ftoptions.h'. */
/* */
FT_EXPORT( FT_Error )
FT_Get_Glyph_Name( FT_Face face,

4
include/ft2build.h
View File

@ -5,7 +5,7 @@
/* FreeType 2 build and setup macros. */
/* (Generic version) */
/* */
/* Copyright 1996-2001, 2006 by */
/* Copyright 1996-2001, 2006, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -31,7 +31,7 @@
#ifndef __FT2_BUILD_GENERIC_H__
#define __FT2_BUILD_GENERIC_H__
#include <freetype/config/ftheader.h>
#include <config/ftheader.h>
#endif /* __FT2_BUILD_GENERIC_H__ */

0
include/freetype/ftadvanc.h → include/ftadvanc.h
View File

0
include/freetype/ftautoh.h → include/ftautoh.h
View File

0
include/freetype/ftbbox.h → include/ftbbox.h
View File

0
include/freetype/ftbdf.h → include/ftbdf.h
View File

0
include/freetype/ftbitmap.h → include/ftbitmap.h
View File

0
include/freetype/ftbzip2.h → include/ftbzip2.h
View File

0
include/freetype/ftcache.h → include/ftcache.h
View File

0
include/freetype/ftcffdrv.h → include/ftcffdrv.h
View File

0
include/freetype/ftchapters.h → include/ftchapters.h
View File

0
include/freetype/ftcid.h → include/ftcid.h
View File

0
include/freetype/fterrdef.h → include/fterrdef.h
View File

0
include/freetype/fterrors.h → include/fterrors.h
View File

0
include/freetype/ftgasp.h → include/ftgasp.h
View File

0
include/freetype/ftglyph.h → include/ftglyph.h
View File

0
include/freetype/ftgxval.h → include/ftgxval.h
View File

0
include/freetype/ftgzip.h → include/ftgzip.h
View File

4
include/freetype/ftimage.h → include/ftimage.h
View File

@ -836,8 +836,8 @@ FT_BEGIN_HEADER
/* a a bitmap. This section contains the public API for rasters. */
/* */
/* Note that in FreeType 2, all rasters are now encapsulated within */
/* specific modules called `renderers'. See `freetype/ftrender.h' for */
/* more details on renderers. */
/* specific modules called `renderers'. See `ftrender.h' for more */
/* details on renderers. */
/* */
/*************************************************************************/

0
include/freetype/ftincrem.h → include/ftincrem.h
View File

0
include/freetype/ftlcdfil.h → include/ftlcdfil.h
View File

0
include/freetype/ftlist.h → include/ftlist.h
View File

0
include/freetype/ftlzw.h → include/ftlzw.h
View File

2
include/freetype/ftmac.h → include/ftmac.h
View File

@ -18,7 +18,7 @@
/***************************************************************************/
/* */
/* NOTE: Include this file after <freetype/freetype.h> and after any */
/* NOTE: Include this file after FT_FREETYPE_H and after any */
/* Mac-specific headers (because this header uses Mac types such as */
/* Handle, FSSpec, FSRef, etc.) */
/* */

0
include/freetype/ftmm.h → include/ftmm.h
View File

0
include/freetype/ftmodapi.h → include/ftmodapi.h
View File

0
include/freetype/ftmoderr.h → include/ftmoderr.h
View File

0
include/freetype/ftotval.h → include/ftotval.h
View File

0
include/freetype/ftoutln.h → include/ftoutln.h
View File

0
include/freetype/ftpfr.h → include/ftpfr.h
View File

0
include/freetype/ftrender.h → include/ftrender.h
View File

0
include/freetype/ftsizes.h → include/ftsizes.h
View File

0
include/freetype/ftsnames.h → include/ftsnames.h
View File

0
include/freetype/ftstroke.h → include/ftstroke.h
View File

0
include/freetype/ftsynth.h → include/ftsynth.h
View File

0
include/freetype/ftsystem.h → include/ftsystem.h
View File

0
include/freetype/fttrigon.h → include/fttrigon.h
View File

0
include/freetype/ftttdrv.h → include/ftttdrv.h
View File

0
include/freetype/fttypes.h → include/fttypes.h
View File

0
include/freetype/ftwinfnt.h → include/ftwinfnt.h
View File

0
include/freetype/ftxf86.h → include/ftxf86.h
View File

0
include/freetype/internal/autohint.h → include/internal/autohint.h
View File

0
include/freetype/internal/ftcalc.h → include/internal/ftcalc.h
View File

0
include/freetype/internal/ftdebug.h → include/internal/ftdebug.h
View File

0
include/freetype/internal/ftdriver.h → include/internal/ftdriver.h
View File

0
include/freetype/internal/ftgloadr.h → include/internal/ftgloadr.h
View File

0
include/freetype/internal/ftmemory.h → include/internal/ftmemory.h
View File

0
include/freetype/internal/ftobjs.h → include/internal/ftobjs.h
View File

0
include/freetype/internal/ftpic.h → include/internal/ftpic.h
View File

0
include/freetype/internal/ftrfork.h → include/internal/ftrfork.h
View File

36
include/freetype/internal/ftserv.h → include/internal/ftserv.h
View File

@ -734,24 +734,24 @@ FT_BEGIN_HEADER
* The header files containing the services.
*/
#define FT_SERVICE_BDF_H <freetype/internal/services/svbdf.h>
#define FT_SERVICE_CID_H <freetype/internal/services/svcid.h>
#define FT_SERVICE_GLYPH_DICT_H <freetype/internal/services/svgldict.h>
#define FT_SERVICE_GX_VALIDATE_H <freetype/internal/services/svgxval.h>
#define FT_SERVICE_KERNING_H <freetype/internal/services/svkern.h>
#define FT_SERVICE_MULTIPLE_MASTERS_H <freetype/internal/services/svmm.h>
#define FT_SERVICE_OPENTYPE_VALIDATE_H <freetype/internal/services/svotval.h>
#define FT_SERVICE_PFR_H <freetype/internal/services/svpfr.h>
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <freetype/internal/services/svpscmap.h>
#define FT_SERVICE_POSTSCRIPT_INFO_H <freetype/internal/services/svpsinfo.h>
#define FT_SERVICE_POSTSCRIPT_NAME_H <freetype/internal/services/svpostnm.h>
#define FT_SERVICE_PROPERTIES_H <freetype/internal/services/svprop.h>
#define FT_SERVICE_SFNT_H <freetype/internal/services/svsfnt.h>
#define FT_SERVICE_TRUETYPE_ENGINE_H <freetype/internal/services/svtteng.h>
#define FT_SERVICE_TT_CMAP_H <freetype/internal/services/svttcmap.h>
#define FT_SERVICE_WINFNT_H <freetype/internal/services/svwinfnt.h>
#define FT_SERVICE_XFREE86_NAME_H <freetype/internal/services/svxf86nm.h>
#define FT_SERVICE_TRUETYPE_GLYF_H <freetype/internal/services/svttglyf.h>
#define FT_SERVICE_BDF_H <internal/services/svbdf.h>
#define FT_SERVICE_CID_H <internal/services/svcid.h>
#define FT_SERVICE_GLYPH_DICT_H <internal/services/svgldict.h>
#define FT_SERVICE_GX_VALIDATE_H <internal/services/svgxval.h>
#define FT_SERVICE_KERNING_H <internal/services/svkern.h>
#define FT_SERVICE_MULTIPLE_MASTERS_H <internal/services/svmm.h>
#define FT_SERVICE_OPENTYPE_VALIDATE_H <internal/services/svotval.h>
#define FT_SERVICE_PFR_H <internal/services/svpfr.h>
#define FT_SERVICE_POSTSCRIPT_CMAPS_H <internal/services/svpscmap.h>
#define FT_SERVICE_POSTSCRIPT_INFO_H <internal/services/svpsinfo.h>
#define FT_SERVICE_POSTSCRIPT_NAME_H <internal/services/svpostnm.h>
#define FT_SERVICE_PROPERTIES_H <internal/services/svprop.h>
#define FT_SERVICE_SFNT_H <internal/services/svsfnt.h>
#define FT_SERVICE_TRUETYPE_ENGINE_H <internal/services/svtteng.h>
#define FT_SERVICE_TT_CMAP_H <internal/services/svttcmap.h>
#define FT_SERVICE_WINFNT_H <internal/services/svwinfnt.h>
#define FT_SERVICE_XFREE86_NAME_H <internal/services/svxf86nm.h>
#define FT_SERVICE_TRUETYPE_GLYF_H <internal/services/svttglyf.h>
/* */

0
include/freetype/internal/ftstream.h → include/internal/ftstream.h
View File

0
include/freetype/internal/fttrace.h → include/internal/fttrace.h
View File

0
include/freetype/internal/ftvalid.h → include/internal/ftvalid.h
View File

38
include/freetype/internal/internal.h → include/internal/internal.h
View File

@ -24,28 +24,28 @@
/*************************************************************************/
#define FT_INTERNAL_OBJECTS_H <freetype/internal/ftobjs.h>
#define FT_INTERNAL_PIC_H <freetype/internal/ftpic.h>
#define FT_INTERNAL_STREAM_H <freetype/internal/ftstream.h>
#define FT_INTERNAL_MEMORY_H <freetype/internal/ftmemory.h>
#define FT_INTERNAL_DEBUG_H <freetype/internal/ftdebug.h>
#define FT_INTERNAL_CALC_H <freetype/internal/ftcalc.h>
#define FT_INTERNAL_DRIVER_H <freetype/internal/ftdriver.h>
#define FT_INTERNAL_TRACE_H <freetype/internal/fttrace.h>
#define FT_INTERNAL_GLYPH_LOADER_H <freetype/internal/ftgloadr.h>
#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h>
#define FT_INTERNAL_SERVICE_H <freetype/internal/ftserv.h>
#define FT_INTERNAL_RFORK_H <freetype/internal/ftrfork.h>
#define FT_INTERNAL_VALIDATE_H <freetype/internal/ftvalid.h>
#define FT_INTERNAL_OBJECTS_H <internal/ftobjs.h>
#define FT_INTERNAL_PIC_H <internal/ftpic.h>
#define FT_INTERNAL_STREAM_H <internal/ftstream.h>
#define FT_INTERNAL_MEMORY_H <internal/ftmemory.h>
#define FT_INTERNAL_DEBUG_H <internal/ftdebug.h>
#define FT_INTERNAL_CALC_H <internal/ftcalc.h>
#define FT_INTERNAL_DRIVER_H <internal/ftdriver.h>
#define FT_INTERNAL_TRACE_H <internal/fttrace.h>
#define FT_INTERNAL_GLYPH_LOADER_H <internal/ftgloadr.h>
#define FT_INTERNAL_SFNT_H <internal/sfnt.h>
#define FT_INTERNAL_SERVICE_H <internal/ftserv.h>
#define FT_INTERNAL_RFORK_H <internal/ftrfork.h>
#define FT_INTERNAL_VALIDATE_H <internal/ftvalid.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h>
#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H <internal/tttypes.h>
#define FT_INTERNAL_TYPE1_TYPES_H <internal/t1types.h>
#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype/internal/psaux.h>
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <freetype/internal/pshints.h>
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <freetype/internal/psglobal.h>
#define FT_INTERNAL_POSTSCRIPT_AUX_H <internal/psaux.h>
#define FT_INTERNAL_POSTSCRIPT_HINTS_H <internal/pshints.h>
#define FT_INTERNAL_POSTSCRIPT_GLOBALS_H <internal/psglobal.h>
#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h>
#define FT_INTERNAL_AUTOHINT_H <internal/autohint.h>
#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */

Some files were not shown because too many files have changed in this diff Show More