* include/freetype/config/ft2build.h,

include/freetype/internal/internal.h: fixed header inclusion macros
	to use direct definitions. This is the only way to do these things
	in a portable way :-( The rest of the code should follow shortly
	though everything compiles now..

	* builds/compiler/intelc.mk, builds/compiler/watcom.mk,
	builds/win32/detect.mk: added support for the Intel C/C++ compiler,
	as well as _preliminary_ (read: doesn't work !!) support for Watcom.
	Also added a new setup target. Type "make setup list" for a list
	of supported command-line compilers on Win32..
This commit is contained in:
David Turner 2000-12-13 19:55:11 +00:00
parent b8eca20757
commit 1003866897
80 changed files with 827 additions and 279 deletions

View File

@ -1,3 +1,17 @@
2000-12-13 David Turner <david.turner@freetype.org>
* include/freetype/config/ft2build.h,
include/freetype/internal/internal.h: fixed header inclusion macros
to use direct definitions. This is the only way to do these things
in a portable way :-( The rest of the code should follow shortly
though everything compiles now..
* builds/compiler/intelc.mk, builds/compiler/watcom.mk,
builds/win32/detect.mk: added support for the Intel C/C++ compiler,
as well as _preliminary_ (read: doesn't work !!) support for Watcom.
Also added a new setup target. Type "make setup list" for a list
of supported command-line compilers on Win32..
2000-12-13 Werner Lemberg <wl@gnu.org>
* builds/unix/ftsystem.c: Fixed typos. Fixed inclusion of wrong

84
builds/compiler/intelc.mk Normal file
View File

@ -0,0 +1,84 @@
#
# FreeType 2 Intel C/C++ definitions (VC++ compatibility mode)
#
# Copyright 1996-2000 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
# compiler command line name
#
CC := icl
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
A := lib
SA := lib
# Path inclusion flag. Some compilers use a different flag than `-I' to
# specify an additional include path. Examples are `/i=' or `-J'.
#
I := /I
# C flag used to define a macro before the compilation of a given source
# object. Usually it is `-D' like in `-DDEBUG'.
#
D := /D
# The link flag used to specify a given library file on link. Note that
# this is only used to compile the demo programs, not the library itself.
#
L := /Fl
# Target flag.
#
T := /Fo
# C flags
#
# These should concern: debug output, optimization & warnings.
#
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
# ANSI compliance.
#
# Note that the Intel C/C++ compiler version 4.5 complains about
# the use of FT_FIELD_OFFSET with "value must be arithmetic type !!"
# this really looks like a bug in the compiler because the macro
# _does_ compute an arithmetic value, so we disable this warning
# with "/Qwd32" !!
#
ifndef CFLAGS
CFLAGS := /nologo /c /Ox /G5 /W3 /Qwd32
endif
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
#
ANSIFLAGS := /Qansi /Za
# Library linking
#
#CLEAN_LIBRARY =
LINK_LIBRARY = lib /nologo /out:$@ $(OBJECTS_LIST)
# EOF

80
builds/compiler/watcom.mk Normal file
View File

@ -0,0 +1,80 @@
#
# FreeType 2 Watcom-specific definitions
#
# Copyright 1996-2000 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
# Compiler command line name
#
CC := wcc386
# The object file extension (for standard and static libraries). This can be
# .o, .tco, .obj, etc., depending on the platform.
#
O := obj
SO := obj
# The library file extension (for standard and static libraries). This can
# be .a, .lib, etc., depending on the platform.
#
A := lib
SA := lib
# Path inclusion flag. Some compilers use a different flag than `-I' to
# specify an additional include path. Examples are `/i=' or `-J'.
#
I := -I=
# C flag used to define a macro before the compilation of a given source
# object. Usually it is `-D' like in `-DDEBUG'.
#
D := -D
# The link flag used to specify a given library file on link. Note that
# this is only used to compile the demo programs, not the library itself.
#
L := -l
# Target flag.
#
T := -FO=
# C flags
#
# These should concern: debug output, optimization & warnings.
#
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
# ANSI compliance.
#
ifndef CFLAGS
CFLAGS := -zq
endif
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
#
ANSIFLAGS := -za
# Library linking
#
ifndef CLEAN_LIBRARY
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) \
$(NO_OUTPUT)
endif
LINK_LIBRARY = wlib -q -o = $@ $(OBJECTS_LIST)
# EOF

View File

@ -42,76 +42,110 @@ ifeq ($(PLATFORM),ansi)
ifdef is_windows
PLATFORM := win32
DELETE := del
COPY := copy
PLATFORM := win32
DELETE := del
COPY := copy
CONFIG_FILE := none
# gcc Makefile by default
CONFIG_FILE := w32-gcc.mk
SEP := /
ifeq ($(firstword $(CC)),cc)
CC := gcc
endif
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
# additionally, we provide hooks for various other compilers
#
ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
CONFIG_FILE := w32-vcc.mk
SEP := $(BACKSLASH)
CC := cl
visualc: setup
endif
.PHONY: dump_target_list setup list
dump_target_list:
@echo ÿ
@echo $(PROJECT_TITLE) build system -- supported compilers
@echo ÿ
@echo Several command-line compilers are supported on Win32:
@echo ÿ
@echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
@echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
@echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
@echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
@echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
@echo ÿ
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk
SEP := $(BACKSLASH)
CC := wcc386
watcom: setup
endif
setup: dump_target_list
else # test "list"
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := w32-icc.mk
SEP := $(BACKSLASH)
CC := icc
visualage: setup
endif
ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
CONFIG_FILE := w32-lcc.mk
SEP := $(BACKSLASH)
CC := lcc
lcc: setup
endif
ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32
CONFIG_FILE := w32-mingw32.mk
SEP := $(BACKSLASH)
CC := gcc
mingw32: setup
endif
ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
CONFIG_FILE := w32-bcc.mk
SEP := $(BACKSLASH)
CC := bcc32
bcc32: setup
endif
ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-bccd.mk
CC := bcc32
# gcc Makefile by default
CONFIG_FILE := w32-gcc.mk
SEP := /
devel: setup
endif
ifeq ($(firstword $(CC)),cc)
CC := gcc
endif
# additionally, we provide hooks for various other compilers
#
ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
CONFIG_FILE := w32-vcc.mk
SEP := $(BACKSLASH)
CC := cl
visualc: setup
endif
ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
CONFIG_FILE := w32-bcc.mk
SEP := $(BACKSLASH)
CC := bcc32
bcc32: setup
endif
ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
CONFIG_FILE := w32-lcc.mk
SEP := $(BACKSLASH)
CC := lcc
lcc: setup
endif
ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
CONFIG_FILE := w32-intl.mk
SEP := $(BACKSLASH)
CC := icl
intelc: setup
endif
#
# The following build targets are not officialy supported for now
#
ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-dev.mk
CC := gcc
SEP := /
devel: setup
endif
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := w32-icc.mk
SEP := $(BACKSLASH)
CC := icc
visualage: setup
endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk
SEP := $(BACKSLASH)
CC := wcc386
watcom: setup
endif
ifneq ($(findstring cygwin,$(MAKECMDGOALS)),) # Cygwin
CONFIG_FILE := w32-cygw.mk
SEP := $(BACKSLASH)
CC := gcc
cygwin: setup
endif
ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-bccd.mk
CC := bcc32
SEP := /
devel: setup
endif
ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-dev.mk
CC := gcc
SEP := /
devel: setup
endif
setup: dos_setup
setup: dos_setup
endif # test "list"
endif # test is_windows
endif # test PLATFORM

23
builds/win32/w32-intl.mk Normal file
View File

@ -0,0 +1,23 @@
#
# FreeType 2 Intel C/C++ on Win32
#
# Copyright 1996-2000 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
SEP := /
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/intelc.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
# EOF

26
builds/win32/w32-wat.mk Normal file
View File

@ -0,0 +1,26 @@
#
# FreeType 2 configuration rules for Watcom C/C++
#
# Copyright 1996-2000 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
SEP := /
ISEP := $(strip \ )
include $(TOP)/builds/win32/win32-def.mk
include $(TOP)/builds/compiler/watcom.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
# EOF

View File

@ -29,9 +29,8 @@
/* #ifndef __FT2_BUILD_UNIX_H__ */
/* #define __FT2_BUILD_UNIX_H__ */
/* */
/* #define FT2_PUBLIC_FILE( x ) <freetype2/ ## x ## > */
/* #define FT2_CONFIG_FILE( x ) <freetype2/config/ ## x ## > */
/* #define FT2_INTERNAL_FILE( x ) <freetype2/internal/ ## x ## > */
/* #define FT2_ROOT freetype2 */
/* #include <freetype2/config/ft2build.h> */
/* */
/* #include FT2_CONFIG_FILE( ft2build.h ) */
/* */
@ -47,41 +46,77 @@
#define __FT2_BUILD_H__
/* We use `##' around some arguments to eliminate leading and trailing */
/* spaces. */
/* this macro is used to enclose its argument in brackets */
#define FT2_ENCLOSE(x) <x>
/* this macro is used to join a path and a file name */
#define FT2_JOINPATH(d,x) d/x
/* this macro is used to format a path in "<d/x>" format easily */
#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
/*************************************************************************/
/* */
/* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public */
/* file. Its parameter is the file pathname, relative to the public */
/* root of a given header file. */
/* The macro FT2_ROOT is used to define the root of all public header */
/* files for FreeType 2. By default, it is set to "freetype", which */
/* means that all public files should be included with a line like: */
/* */
#ifndef FT2_PUBLIC_FILE
#define FT2_PUBLIC_FILE( x ) <freetype/ ## x ## >
/* #include <freetype/...> */
/* */
/* Redefine it to something different if necessary, depending where the */
/* library is installed on the particular system. */
/* */
#ifndef FT2_ROOT
#define FT2_ROOT freetype
#endif
/*************************************************************************/
/* */
/* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config */
/* file. Its parameter is the file pathname, relative to the */
/* configuration root directory of a given header file. */
/* The macro FT2_CONFIG_ROOT is used to define the root of all */
/* configuration header files for FreeType 2. By default, it is set to */
/* "freetype/config", which means that all config files should be */
/* include with a line like: */
/* */
#ifndef FT2_CONFIG_FILE
#define FT2_CONFIG_FILE( x ) <freetype/config/ ## x ## >
/* #include <freetype/config/...> */
/* */
/* Redefine it to something different, depending where the library is */
/* installed on the particular system. */
/* */
#ifndef FT2_CONFIG_ROOT
#define FT2_CONFIG_ROOT FT2_JOINPATH(FT2_ROOT,config)
#endif
#define FT2_INTERNAL_ROOT FT2_JOINPATH(FT2_ROOT,internal)
/*************************************************************************/
/* */
/* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/
/* Its parameter is the file pathname, relative to the public root of a */
/* given header file. */
/* */
#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_PATH(FT2_ROOT,x)
/*************************************************************************/
/* */
/* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/
/* Its parameter is the file pathname, relative to the configuration */
/* root directory of a given header file. */
/* */
#define FT2_CONFIG_FILE( x ) FT2_PUBLIC_PATH(FT2_CONFIG_ROOT,x)
/*************************************************************************/
/* */
/* The macro FT2_INTERNAL_FILE is used to include a FreeType 2 internal */
/* file. Its parameter is the file pathname, relative to the */
/* configuration root directory of a given header file. */
/* */
#ifndef FT2_INTERNAL_FILE
#define FT2_INTERNAL_FILE( x ) <freetype/internal/ ## x ## >
#endif
#define FT2_INTERNAL_FILE( x ) FT2_ENCLOSE(FT2_ROOT/internal/x)
/*************************************************************************/
@ -103,7 +138,7 @@
#ifdef FT_FLAT_COMPILATION
#define FT_SOURCE_FILE( d, x ) #x
#else
#define FT_SOURCE_FILE( d, x ) < ## d ## / ## x ## >
#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x)
#endif
#endif /* !FT_SOURCE_FILE */
@ -153,44 +188,44 @@
/* configuration files */
#ifndef FT_CONFIG_CONFIG_H
#define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE( ftconfig.h )
#define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h>
#endif
#ifndef FT_CONFIG_OPTIONS_H
#define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE( ftoption.h )
#define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h>
#endif
#ifndef FT_CONFIG_MODULES_H
#define FT_CONFIG_MODULES_H FT2_CONFIG_FILE( ftmodule.h )
#define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h>
#endif
/* public headers */
#define FT_ERRORS_H FT2_PUBLIC_FILE( fterrors.h )
#define FT_SYSTEM_H FT2_PUBLIC_FILE( ftsystem.h )
#define FT_IMAGE_H FT2_PUBLIC_FILE( ftimage.h )
#define FT_ERRORS_H <freetype/fterrors.h>
#define FT_SYSTEM_H <freetype/ftsystem.h>
#define FT_IMAGE_H <freetype/ftimage.h>
#define FT_TYPES_H FT2_PUBLIC_FILE( fttypes.h )
#define FT_FREETYPE_H FT2_PUBLIC_FILE( freetype.h )
#define FT_GLYPH_H FT2_PUBLIC_FILE( ftglyph.h )
#define FT_BBOX_H FT2_PUBLIC_FILE( ftbbox.h )
#define FT_CACHE_H FT2_PUBLIC_FILE( ftcache.h )
#define FT_LIST_H FT2_PUBLIC_FILE( ftlist.h )
#define FT_MAC_H FT2_PUBLIC_FILE( ftmac.h )
#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE( ftmm.h )
#define FT_MODULE_H FT2_PUBLIC_FILE( ftmodule.h )
#define FT_NAMES_H FT2_PUBLIC_FILE( ftnames.h )
#define FT_OUTLINE_H FT2_PUBLIC_FILE( ftoutln.h )
#define FT_RENDER_H FT2_PUBLIC_FILE( ftrender.h )
#define FT_SYNTHESIS_H FT2_PUBLIC_FILE( ftsynth.h )
#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE( t1tables.h )
#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE( ttnameid.h )
#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE( tttables.h )
#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE( tttags.h )
#define FT_TYPES_H <freetype/fttypes.h>
#define FT_FREETYPE_H <freetype/freetype.h>
#define FT_GLYPH_H <freetype/ftglyph.h>
#define FT_BBOX_H <freetype/ftbbox.h>
#define FT_CACHE_H <freetype/ftcache.h>
#define FT_LIST_H <freetype/ftlist.h>
#define FT_MAC_H <freetype/ftmac.h>
#define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h>
#define FT_MODULE_H <freetype/ftmodule.h>
#define FT_NAMES_H <freetype/ftnames.h>
#define FT_OUTLINE_H <freetype/ftoutln.h>
#define FT_RENDER_H <freetype/ftrender.h>
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_TYPE1_TABLES_H <freetype/t1tables.h>
#define FT_TRUETYPE_NAMES_H <freetype/ttnameid.h>
#define FT_TRUETYPE_TABLES_H <freetype/tttables.h>
#define FT_TRUETYPE_TAGS_H <freetype/tttags.h>
/* now include internal headers definitions from <freetype/internal/...> */
#include FT2_INTERNAL_FILE( internal.h )
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#include FT_INTERNAL_INTERNAL_H
#endif /* __FT2_BUILD_H__ */

View File

@ -0,0 +1,247 @@
/***************************************************************************/
/* */
/* cfftypes.h */
/* */
/* Basic OpenType/CFF type definitions and interface (specification */
/* only). */
/* */
/* Copyright 1996-2000 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/***************************************************************************/
#ifndef __CFFTYPES_H__
#define __CFFTYPES_H__
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Struct> */
/* CFF_Index */
/* */
/* <Description> */
/* A structure used to model a CFF Index table. */
/* */
/* <Fields> */
/* stream :: source input stream */
/* */
/* count :: The number of elements in the index. */
/* */
/* off_size :: The size in bytes of object offsets in index. */
/* */
/* data_offset :: The position of first data byte in the index's */
/* bytes. */
/* */
/* offsets :: table of element offsets in the index */
/* */
/* bytes :: If the index is loaded in memory, its bytes. */
/* */
typedef struct CFF_Index_
{
FT_Stream stream;
FT_UInt count;
FT_Byte off_size;
FT_ULong data_offset;
FT_ULong* offsets;
FT_Byte* bytes;
} CFF_Index;
/* a compact CFF Charset table */
typedef struct CFF_Charset_
{
FT_ULong offset;
FT_UInt size;
FT_UInt format;
FT_Byte* bytes;
} CFF_Charset;
/* a compact CFF Encoding table */
typedef struct CFF_Encoding_
{
FT_ULong offset;
FT_UInt size;
FT_UInt format;
FT_Byte* bytes;
} CFF_Encoding;
typedef struct CFF_Font_Dict_
{
FT_UInt version;
FT_UInt notice;
FT_UInt copyright;
FT_UInt full_name;
FT_UInt family_name;
FT_UInt weight;
FT_Bool is_fixed_pitch;
FT_Fixed italic_angle;
FT_Pos underline_position;
FT_Pos underline_thickness;
FT_Int paint_type;
FT_Int charstring_type;
FT_Matrix font_matrix;
FT_Vector font_offset;
FT_ULong unique_id;
FT_BBox font_bbox;
FT_Pos stroke_width;
FT_ULong charset_offset;
FT_ULong encoding_offset;
FT_ULong charstrings_offset;
FT_ULong private_offset;
FT_ULong private_size;
FT_Long synthetic_base;
FT_UInt embedded_postscript;
FT_UInt base_font_name;
FT_UInt postscript;
CFF_Charset charset;
CFF_Encoding encoding;
/* these should only be used for the top-level font dictionary */
FT_UInt cid_registry;
FT_UInt cid_ordering;
FT_ULong cid_supplement;
FT_Long cid_font_version;
FT_Long cid_font_revision;
FT_Long cid_font_type;
FT_Long cid_count;
FT_ULong cid_uid_base;
FT_ULong cid_fd_array_offset;
FT_ULong cid_fd_select_offset;
FT_UInt cid_font_name;
} CFF_Font_Dict;
typedef struct CFF_Private_
{
FT_Byte num_blue_values;
FT_Byte num_other_blues;
FT_Byte num_family_blues;
FT_Byte num_family_other_blues;
FT_Pos blue_values[14];
FT_Pos other_blues[10];
FT_Pos family_blues[14];
FT_Pos family_other_blues[10];
FT_Fixed blue_scale;
FT_Pos blue_shift;
FT_Pos blue_fuzz;
FT_Pos standard_width;
FT_Pos standard_height;
FT_Byte num_snap_widths;
FT_Byte num_snap_heights;
FT_Pos snap_widths[13];
FT_Pos snap_heights[13];
FT_Bool force_bold;
FT_Fixed force_bold_threshold;
FT_Int lenIV;
FT_Int language_group;
FT_Fixed expansion_factor;
FT_Long initial_random_seed;
FT_ULong local_subrs_offset;
FT_Pos default_width;
FT_Pos nominal_width;
} CFF_Private;
typedef struct CFF_FD_Select_
{
FT_Byte format;
FT_UInt range_count;
/* that's the table, taken from the file `as is' */
FT_Byte* data;
FT_UInt data_size;
/* small cache for format 3 only */
FT_UInt cache_first;
FT_UInt cache_count;
FT_Byte cache_fd;
} CFF_FD_Select;
/* A SubFont packs a font dict and a private dict together. They are */
/* needed to support CID-keyed CFF fonts. */
typedef struct CFF_SubFont_
{
CFF_Font_Dict font_dict;
CFF_Private private_dict;
CFF_Index local_subrs_index;
FT_UInt num_local_subrs;
FT_Byte** local_subrs;
} CFF_SubFont;
/* maximum number of sub-fonts in a CID-keyed file */
#define CFF_MAX_CID_FONTS 16
typedef struct CFF_Font_
{
FT_Stream stream;
FT_Memory memory;
FT_UInt num_faces;
FT_UInt num_glyphs;
FT_Byte version_major;
FT_Byte version_minor;
FT_Byte header_size;
FT_Byte absolute_offsize;
CFF_Index name_index;
CFF_Index top_dict_index;
CFF_Index string_index;
CFF_Index global_subrs_index;
/* we don't load the Encoding and CharSet tables */
CFF_Index charstrings_index;
CFF_Index font_dict_index;
CFF_Index private_index;
CFF_Index local_subrs_index;
FT_String* font_name;
FT_UInt num_global_subrs;
FT_Byte** global_subrs;
CFF_SubFont top_font;
FT_UInt num_subfonts;
CFF_SubFont* subfonts[CFF_MAX_CID_FONTS];
CFF_FD_Select fd_select;
} CFF_Font;
FT_END_HEADER
#endif /* __CFFTYPES_H__ */
/* END */

View File

@ -63,13 +63,13 @@ FT_BEGIN_HEADER
ft_frame_short_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_SHORT, 1, 1 ),
ft_frame_ulong_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 0 ),
ft_frame_ulong_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
ft_frame_long_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
ft_frame_long_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 0, 1 ),
ft_frame_ulong_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 0 ),
ft_frame_long_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_LONG, 1, 1 ),
ft_frame_uoff3_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 0 ),
ft_frame_uoff3_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
ft_frame_off3_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
ft_frame_off3_be = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 0, 1 ),
ft_frame_uoff3_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 0 ),
ft_frame_off3_le = FT_MAKE_FRAME_OP( FT_FRAME_OP_OFF3, 1, 1 ),
ft_frame_bytes = FT_MAKE_FRAME_OP( FT_FRAME_OP_BYTES, 0, 0 ),
@ -80,7 +80,7 @@ FT_BEGIN_HEADER
typedef struct FT_Frame_Field_
{
FT_Frame_Op value;
FT_Byte value;
FT_Byte size;
FT_UShort offset;
@ -92,8 +92,10 @@ FT_BEGIN_HEADER
/* calling the FT_FRAME_START() macro. */
#define FT_FIELD_SIZE( f ) \
(FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f )
#define FT_FIELD_SIZE_DELTA( f ) \
(FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f[0] )
#define FT_FIELD_OFFSET( f ) \
(FT_UShort)( offsetof( FT_STRUCTURE, f ) )
@ -131,6 +133,7 @@ FT_BEGIN_HEADER
count, \
FT_FIELD_OFFSET( field ) \
}
#define FT_FRAME_SKIP_BYTES( count ) { ft_frame_skip, count, 0 }

View File

@ -24,31 +24,31 @@
/*************************************************************************/
#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE( ftobjs.h )
#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE( ftstream.h )
#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE( ftmemory.h )
#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE( ftextend.h )
#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE( ftdebug.h )
#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE( ftcalc.h )
#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE( ftdriver.h )
#define FT_INTERNAL_EXTEND_H FT2_INTERNAL_FILE( ftextend.h )
#define FT_INTERNAL_OBJECTS_H <freetype/internal/ftobjs.h>
#define FT_INTERNAL_STREAM_H <freetype/internal/ftstream.h>
#define FT_INTERNAL_MEMORY_H <freetype/internal/ftmemory.h>
#define FT_INTERNAL_EXTENSION_H <freetype/internal/ftextend.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_EXTEND_H <freetype/internal/ftextend.h>
#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE( sfnt.h )
#define FT_INTERNAL_SFNT_H <freetype/internal/sfnt.h>
#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE( tttypes.h )
#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE( tterrors.h )
#define FT_INTERNAL_TRUETYPE_TYPES_H <freetype/internal/tttypes.h>
#define FT_INTERNAL_TRUETYPE_ERRORS_H <freetype/internal/tterrors.h>
#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE( t1errors.h )
#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE( t1types.h )
#define FT_INTERNAL_TYPE1_ERRORS_H <freetype/internal/t1errors.h>
#define FT_INTERNAL_TYPE1_TYPES_H <freetype/internal/t1types.h>
#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE( t2errors.h )
#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE( t2types.h )
#define FT_INTERNAL_CFF_ERRORS_H <freetype/internal/t2errors.h>
#define FT_INTERNAL_CFF_TYPES_H <freetype/internal/t2types.h>
#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE( psnames.h )
#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE( psaux.h )
#define FT_INTERNAL_POSTSCRIPT_NAMES_H <freetype/internal/psnames.h>
#define FT_INTERNAL_POSTSCRIPT_AUX_H <freetype/internal/psaux.h>
#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE( autohint.h )
#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE( fnttypes.h )
#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h>
#define FT_INTERNAL_FNT_TYPES_H <freetype/internal/fnttypes.h>
/* END */

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahangles.h )
#include FT_SOURCE_FILE(autohint,ahangles.h)
/* the following table has been automatically generated with */

View File

@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE( autohint, ahtypes.h )
#include FT_SOURCE_FILE(autohint,ahtypes.h)
FT_BEGIN_HEADER

View File

@ -20,8 +20,8 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahglobal.h )
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#define MAX_TEST_CHARACTERS 12

View File

@ -25,7 +25,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahtypes.h )
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_INTERNAL_OBJECTS_H

View File

@ -21,9 +21,9 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#include FT_SOURCE_FILE( autohint, ahangles.h )
#include FT_SOURCE_FILE( autohint, ahglobal.h )
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#include FT_SOURCE_FILE(autohint,ahangles.h)
#include FT_SOURCE_FILE(autohint,ahglobal.h)
#include <stdio.h>

View File

@ -25,7 +25,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahtypes.h )
#include FT_SOURCE_FILE(autohint,ahtypes.h)
FT_BEGIN_HEADER

View File

@ -20,9 +20,9 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahhint.h )
#include FT_SOURCE_FILE( autohint, ahglyph.h )
#include FT_SOURCE_FILE( autohint, ahangles.h )
#include FT_SOURCE_FILE(autohint,ahhint.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h)
#include FT_SOURCE_FILE(autohint,ahangles.h)
#include FT_OUTLINE_H

View File

@ -24,7 +24,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahglobal.h )
#include FT_SOURCE_FILE(autohint,ahglobal.h)
FT_BEGIN_HEADER

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_MODULE_H
#include FT_SOURCE_FILE( autohint, ahhint.h )
#include FT_SOURCE_FILE(autohint,ahhint.h)
typedef struct FT_AutoHinterRec_

View File

@ -33,7 +33,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H /* for ALLOC_ARRAY() and FREE() */
#include FT_SOURCE_FILE( autohint, ahoptim.h )
#include FT_SOURCE_FILE(autohint,ahoptim.h)
/* define this macro to use brute force optimisation -- this is slow, */

View File

@ -24,7 +24,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahtypes.h )
#include FT_SOURCE_FILE(autohint,ahtypes.h)
FT_BEGIN_HEADER

View File

@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE( autohint, ahloader.h )
#include FT_SOURCE_FILE(autohint,ahloader.h)
#define xxAH_DEBUG

View File

@ -22,11 +22,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( autohint, ahangles.c )
#include FT_SOURCE_FILE( autohint, ahglyph.c )
#include FT_SOURCE_FILE( autohint, ahglobal.c )
#include FT_SOURCE_FILE( autohint, ahhint.c )
#include FT_SOURCE_FILE( autohint, ahmodule.c )
#include FT_SOURCE_FILE(autohint,ahangles.c)
#include FT_SOURCE_FILE(autohint,ahglyph.c)
#include FT_SOURCE_FILE(autohint,ahglobal.c)
#include FT_SOURCE_FILE(autohint,ahhint.c)
#include FT_SOURCE_FILE(autohint,ahmodule.c)
/* END */

View File

@ -17,13 +17,13 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( base, ftcalc.c )
#include FT_SOURCE_FILE( base, ftobjs.c )
#include FT_SOURCE_FILE( base, ftstream.c )
#include FT_SOURCE_FILE( base, ftlist.c )
#include FT_SOURCE_FILE( base, ftoutln.c )
#include FT_SOURCE_FILE( base, ftextend.c )
#include FT_SOURCE_FILE( base, ftnames.c )
#include FT_SOURCE_FILE(base,ftcalc.c)
#include FT_SOURCE_FILE(base,ftobjs.c)
#include FT_SOURCE_FILE(base,ftstream.c)
#include FT_SOURCE_FILE(base,ftlist.c)
#include FT_SOURCE_FILE(base,ftoutln.c)
#include FT_SOURCE_FILE(base,ftextend.c)
#include FT_SOURCE_FILE(base,ftnames.c)
/* END */

View File

@ -107,5 +107,7 @@
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
/* needed by pedantic ANSI compilers */
extern const int ft_debug_dummy;
/* END */

12
src/cache/ftcache.c vendored
View File

@ -19,12 +19,12 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( cache, ftlru.c )
#include FT_SOURCE_FILE( cache, ftcmanag.c )
#include FT_SOURCE_FILE( cache, ftcglyph.c )
#include FT_SOURCE_FILE( cache, ftcchunk.c )
#include FT_SOURCE_FILE( cache, ftcimage.c )
#include FT_SOURCE_FILE( cache, ftcsbits.c )
#include FT_SOURCE_FILE(cache,ftlru.c)
#include FT_SOURCE_FILE(cache,ftcmanag.c)
#include FT_SOURCE_FILE(cache,ftcglyph.c)
#include FT_SOURCE_FILE(cache,ftcchunk.c)
#include FT_SOURCE_FILE(cache,ftcimage.c)
#include FT_SOURCE_FILE(cache,ftcsbits.c)
/* END */

View File

@ -19,11 +19,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( cff, cffdrivr.c )
#include FT_SOURCE_FILE( cff, cffparse.c )
#include FT_SOURCE_FILE( cff, cffload.c )
#include FT_SOURCE_FILE( cff, cffobjs.c )
#include FT_SOURCE_FILE( cff, t2gload.c )
#include FT_SOURCE_FILE(cff,cffdrivr.c)
#include FT_SOURCE_FILE(cff,cffparse.c)
#include FT_SOURCE_FILE(cff,cffload.c)
#include FT_SOURCE_FILE(cff,cffobjs.c)
#include FT_SOURCE_FILE(cff,t2gload.c)
/* END */

View File

@ -24,8 +24,8 @@
#include FT_TRUETYPE_NAMES_H
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_SOURCE_FILE( cff, cffdrivr.h )
#include FT_SOURCE_FILE( cff, t2gload.h )
#include FT_SOURCE_FILE(cff,cffdrivr.h)
#include FT_SOURCE_FILE(cff,t2gload.h)
/*************************************************************************/

View File

@ -24,8 +24,8 @@
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( cff, cffload.h )
#include FT_SOURCE_FILE( cff, cffparse.h )
#include FT_SOURCE_FILE(cff,cffload.h)
#include FT_SOURCE_FILE(cff,cffparse.h)
/*************************************************************************/

View File

@ -25,8 +25,8 @@
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_SOURCE_FILE( cff, cffobjs.h )
#include FT_SOURCE_FILE( cff, cffload.h )
#include FT_SOURCE_FILE(cff,cffobjs.h)
#include FT_SOURCE_FILE(cff,cffload.h)
#include FT_INTERNAL_CFF_ERRORS_H
#include <string.h> /* for strlen() */

View File

@ -17,7 +17,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( cff, cffparse.h )
#include FT_SOURCE_FILE(cff,cffparse.h)
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_INTERNAL_STREAM_H
@ -442,7 +442,7 @@
static const CFF_Field_Handler cff_field_handlers[] =
{
#include FT_SOURCE_FILE( cff, cfftoken.h )
#include FT_SOURCE_FILE(cff,cfftoken.h)
{ 0, 0, 0, 0, 0, 0, 0 }
};

View File

@ -24,8 +24,8 @@
#include FT_OUTLINE_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( cff, cffload.h )
#include FT_SOURCE_FILE( cff, t2gload.h )
#include FT_SOURCE_FILE(cff,cffload.h)
#include FT_SOURCE_FILE(cff,t2gload.h)
#include FT_INTERNAL_CFF_ERRORS_H

View File

@ -22,7 +22,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_SOURCE_FILE( cff, cffobjs.h )
#include FT_SOURCE_FILE(cff,cffobjs.h)
FT_BEGIN_HEADER

View File

@ -17,8 +17,8 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( cid, cidload.h )
#include FT_SOURCE_FILE( cid, cidgload.h )
#include FT_SOURCE_FILE(cid,cidload.h)
#include FT_SOURCE_FILE(cid,cidgload.h)
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_OUTLINE_H

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( cid, cidobjs.h )
#include FT_SOURCE_FILE(cid,cidobjs.h)
FT_BEGIN_HEADER

View File

@ -22,7 +22,7 @@
#include FT_MULTIPLE_MASTERS_H
#include FT_INTERNAL_TYPE1_TYPES_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_SOURCE_FILE( cid, cidload.h )
#include FT_SOURCE_FILE(cid,cidload.h)
#include <stdio.h>
#include <ctype.h> /* for isspace(), isalnum() */

View File

@ -22,7 +22,7 @@
#include <ft2build.h>
#include FT_INTERNAL_STREAM_H
#include FT_SOURCE_FILE( cid, cidparse.h )
#include FT_SOURCE_FILE(cid,cidparse.h)
FT_BEGIN_HEADER

View File

@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_SOURCE_FILE( cid, cidgload.h )
#include FT_SOURCE_FILE( cid, cidload.h )
#include FT_SOURCE_FILE(cid,cidgload.h)
#include FT_SOURCE_FILE(cid,cidload.h)
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H

View File

@ -22,7 +22,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_SOURCE_FILE( cid, cidparse.h )
#include FT_SOURCE_FILE(cid,cidparse.h)
#include <string.h> /* for strncmp() */

View File

@ -17,8 +17,8 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( cid, cidriver.h )
#include FT_SOURCE_FILE( cid, cidgload.h )
#include FT_SOURCE_FILE(cid,cidriver.h)
#include FT_SOURCE_FILE(cid,cidgload.h)
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H

View File

@ -19,11 +19,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( cid, cidparse.c )
#include FT_SOURCE_FILE( cid, cidload.c )
#include FT_SOURCE_FILE( cid, cidobjs.c )
#include FT_SOURCE_FILE( cid, cidriver.c )
#include FT_SOURCE_FILE( cid, cidgload.c )
#include FT_SOURCE_FILE(cid,cidparse.c)
#include FT_SOURCE_FILE(cid,cidload.c)
#include FT_SOURCE_FILE(cid,cidobjs.c)
#include FT_SOURCE_FILE(cid,cidriver.c)
#include FT_SOURCE_FILE(cid,cidgload.c)
/* END */

View File

@ -19,9 +19,9 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( psaux, psobjs.c )
#include FT_SOURCE_FILE( psaux, psauxmod.c )
#include FT_SOURCE_FILE( psaux, t1decode.c )
#include FT_SOURCE_FILE(psaux,psobjs.c)
#include FT_SOURCE_FILE(psaux,psauxmod.c)
#include FT_SOURCE_FILE(psaux,t1decode.c)
/* END */

View File

@ -17,9 +17,9 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( psaux, psauxmod.h )
#include FT_SOURCE_FILE( psaux, psobjs.h )
#include FT_SOURCE_FILE( psaux, t1decode.h )
#include FT_SOURCE_FILE(psaux,psauxmod.h)
#include FT_SOURCE_FILE(psaux,psobjs.h)
#include FT_SOURCE_FILE(psaux,t1decode.h)
FT_CALLBACK_TABLE_DEF

View File

@ -20,7 +20,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_DEBUG_H
#include FT_ERRORS_H
#include FT_SOURCE_FILE( psaux, psobjs.h )
#include FT_SOURCE_FILE(psaux,psobjs.h)
/*************************************************************************/

View File

@ -20,8 +20,8 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_OUTLINE_H
#include FT_SOURCE_FILE( psaux, t1decode.h )
#include FT_SOURCE_FILE( psaux, psobjs.h )
#include FT_SOURCE_FILE(psaux,t1decode.h)
#include FT_SOURCE_FILE(psaux,psobjs.h)
/*************************************************************************/

View File

@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE( psnames, psmodule.h )
#include FT_SOURCE_FILE( psnames, pstables.h )
#include FT_SOURCE_FILE(psnames,psmodule.h)
#include FT_SOURCE_FILE(psnames,pstables.h)
#include <stdlib.h> /* for qsort() */
#include <string.h> /* for strcmp(), strncpy() */

View File

@ -19,7 +19,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( psnames, psmodule.c )
#include FT_SOURCE_FILE(psnames,psmodule.c)
/* END */

View File

@ -23,7 +23,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( raster, ftraster.h )
#include FT_SOURCE_FILE(raster,ftraster.h)
#include FT_INTERNAL_CALC_H /* for FT_MulDiv only */

View File

@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_OUTLINE_H
#include FT_SOURCE_FILE( raster, ftrend1.h )
#include FT_SOURCE_FILE( raster, ftraster.h )
#include FT_SOURCE_FILE(raster,ftrend1.h)
#include FT_SOURCE_FILE(raster,ftraster.h)
/* initialize renderer -- init its raster */

View File

@ -19,8 +19,8 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( raster, ftraster.c )
#include FT_SOURCE_FILE( raster, ftrend1.c )
#include FT_SOURCE_FILE(raster,ftraster.c)
#include FT_SOURCE_FILE(raster,ftrend1.c)
/* END */

View File

@ -20,17 +20,17 @@
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE( sfnt, sfdriver.h )
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE( sfnt, ttcmap.h )
#include FT_SOURCE_FILE( sfnt, sfobjs.h )
#include FT_SOURCE_FILE(sfnt,sfdriver.h)
#include FT_SOURCE_FILE(sfnt,ttload.h)
#include FT_SOURCE_FILE(sfnt,ttcmap.h)
#include FT_SOURCE_FILE(sfnt,sfobjs.h)
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include FT_SOURCE_FILE( sfnt, ttsbit.h )
#include FT_SOURCE_FILE(sfnt,ttsbit.h)
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include FT_SOURCE_FILE( sfnt, ttpost.h )
#include FT_SOURCE_FILE(sfnt,ttpost.h)
#endif
#include <string.h> /* for strcmp() */

View File

@ -19,17 +19,17 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( sfnt, ttload.c )
#include FT_SOURCE_FILE( sfnt, ttcmap.c )
#include FT_SOURCE_FILE( sfnt, sfobjs.c )
#include FT_SOURCE_FILE( sfnt, sfdriver.c )
#include FT_SOURCE_FILE(sfnt,ttload.c)
#include FT_SOURCE_FILE(sfnt,ttcmap.c)
#include FT_SOURCE_FILE(sfnt,sfobjs.c)
#include FT_SOURCE_FILE(sfnt,sfdriver.c)
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include FT_SOURCE_FILE( sfnt, ttsbit.c )
#include FT_SOURCE_FILE(sfnt,ttsbit.c)
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include FT_SOURCE_FILE( sfnt, ttpost.c )
#include FT_SOURCE_FILE(sfnt,ttpost.c)
#endif

View File

@ -17,8 +17,8 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( sfnt, sfobjs.h )
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE(sfnt,sfobjs.h)
#include FT_SOURCE_FILE(sfnt,ttload.h)
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_TRUETYPE_NAMES_H

View File

@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE( sfnt, ttcmap.h )
#include FT_SOURCE_FILE(sfnt,ttload.h)
#include FT_SOURCE_FILE(sfnt,ttcmap.h)
/*************************************************************************/

View File

@ -22,8 +22,8 @@
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE( sfnt, ttcmap.h )
#include FT_SOURCE_FILE(sfnt,ttload.h)
#include FT_SOURCE_FILE(sfnt,ttcmap.h)
/*************************************************************************/

View File

@ -29,8 +29,8 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( sfnt, ttpost.h )
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE(sfnt,ttpost.h)
#include FT_SOURCE_FILE(sfnt,ttload.h)
/*************************************************************************/

View File

@ -21,7 +21,7 @@
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( sfnt, ttsbit.h )
#include FT_SOURCE_FILE(sfnt,ttsbit.h)
/*************************************************************************/

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( sfnt, ttload.h )
#include FT_SOURCE_FILE(sfnt,ttload.h)
FT_BEGIN_HEADER

View File

@ -123,7 +123,7 @@
#else /* _STANDALONE_ */
#include <ft2build.h>
#include FT_SOURCE_FILE( smooth, ftgrays.h )
#include FT_SOURCE_FILE(smooth,ftgrays.h)
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
#include FT_OUTLINE_H

View File

@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_OUTLINE_H
#include FT_SOURCE_FILE( smooth, ftsmooth.h )
#include FT_SOURCE_FILE( smooth, ftgrays.h )
#include FT_SOURCE_FILE(smooth,ftsmooth.h)
#include FT_SOURCE_FILE(smooth,ftgrays.h)
/* initialize renderer -- init its raster */

View File

@ -19,8 +19,8 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( smooth, ftgrays.c )
#include FT_SOURCE_FILE( smooth, ftsmooth.c )
#include FT_SOURCE_FILE(smooth,ftgrays.c)
#include FT_SOURCE_FILE(smooth,ftsmooth.c)
/* END */

View File

@ -19,13 +19,13 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( truetype, ttdriver.c ) /* driver interface */
#include FT_SOURCE_FILE( truetype, ttpload.c ) /* tables loader */
#include FT_SOURCE_FILE( truetype, ttgload.c ) /* glyph loader */
#include FT_SOURCE_FILE( truetype, ttobjs.c ) /* object manager */
#include FT_SOURCE_FILE(truetype,ttdriver.c) /* driver interface */
#include FT_SOURCE_FILE(truetype,ttpload.c) /* tables loader */
#include FT_SOURCE_FILE(truetype,ttgload.c) /* glyph loader */
#include FT_SOURCE_FILE(truetype,ttobjs.c) /* object manager */
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#include FT_SOURCE_FILE( truetype, ttinterp.c )
#include FT_SOURCE_FILE(truetype,ttinterp.c)
#endif

View File

@ -21,8 +21,8 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H
#include FT_TRUETYPE_NAMES_H
#include FT_SOURCE_FILE( truetype, ttdriver.h )
#include FT_SOURCE_FILE( truetype, ttgload.h )
#include FT_SOURCE_FILE(truetype,ttdriver.h)
#include FT_SOURCE_FILE(truetype,ttgload.h)
/*************************************************************************/

View File

@ -24,7 +24,7 @@
#include FT_TRUETYPE_TAGS_H
#include FT_OUTLINE_H
#include FT_SOURCE_FILE( truetype, ttgload.h )
#include FT_SOURCE_FILE(truetype,ttgload.h)
/*************************************************************************/

View File

@ -21,10 +21,10 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( truetype, ttobjs.h )
#include FT_SOURCE_FILE(truetype,ttobjs.h)
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#include FT_SOURCE_FILE( truetype, ttinterp.h )
#include FT_SOURCE_FILE(truetype,ttinterp.h)
#endif

View File

@ -20,7 +20,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_CALC_H
#include FT_SYSTEM_H
#include FT_SOURCE_FILE( truetype, ttinterp.h )
#include FT_SOURCE_FILE(truetype,ttinterp.h)
#include FT_INTERNAL_TRUETYPE_ERRORS_H

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( truetype, ttobjs.h )
#include FT_SOURCE_FILE(truetype,ttobjs.h)
FT_BEGIN_HEADER

View File

@ -26,11 +26,11 @@
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_SOURCE_FILE( truetype, ttgload.h )
#include FT_SOURCE_FILE( truetype, ttpload.h )
#include FT_SOURCE_FILE(truetype,ttgload.h)
#include FT_SOURCE_FILE(truetype,ttpload.h)
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#include FT_SOURCE_FILE( truetype, ttinterp.h )
#include FT_SOURCE_FILE(truetype,ttinterp.h)
#endif

View File

@ -21,7 +21,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
#include FT_SOURCE_FILE( truetype, ttpload.h )
#include FT_SOURCE_FILE(truetype,ttpload.h)
#include FT_INTERNAL_TRUETYPE_ERRORS_H

View File

@ -17,7 +17,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1afm.h )
#include FT_SOURCE_FILE(type1,t1afm.h)
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_TYPES_H
#include <stdlib.h> /* for qsort() */

View File

@ -20,7 +20,7 @@
#define __T1AFM_H__
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1objs.h )
#include FT_SOURCE_FILE(type1,t1objs.h)
FT_BEGIN_HEADER

View File

@ -17,12 +17,12 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1driver.h )
#include FT_SOURCE_FILE( type1, t1gload.h )
#include FT_SOURCE_FILE( type1, t1load.h )
#include FT_SOURCE_FILE(type1,t1driver.h)
#include FT_SOURCE_FILE(type1,t1gload.h)
#include FT_SOURCE_FILE(type1,t1load.h)
#ifndef T1_CONFIG_OPTION_NO_AFM
#include FT_SOURCE_FILE( type1, t1afm.h )
#include FT_SOURCE_FILE(type1,t1afm.h)
#endif
#include FT_INTERNAL_DEBUG_H

View File

@ -17,7 +17,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1gload.h )
#include FT_SOURCE_FILE(type1,t1gload.h)
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_OUTLINE_H

View File

@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1objs.h )
#include FT_SOURCE_FILE(type1,t1objs.h)
FT_BEGIN_HEADER

View File

@ -68,7 +68,7 @@
#include FT_INTERNAL_TYPE1_TYPES_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_SOURCE_FILE( type1, t1load.h )
#include FT_SOURCE_FILE(type1,t1load.h)
#include <string.h> /* for strncmp(), strcmp() */
#include <ctype.h> /* for isalnum() */
@ -1372,7 +1372,7 @@
const T1_Field t1_keywords[] =
{
#include FT_SOURCE_FILE( type1, t1tokens.h )
#include FT_SOURCE_FILE(type1,t1tokens.h)
/* now add the special functions... */
T1_FIELD_CALLBACK( "FontName", parse_font_name )

View File

@ -25,7 +25,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_MULTIPLE_MASTERS_H
#include FT_SOURCE_FILE( type1, t1parse.h )
#include FT_SOURCE_FILE(type1,t1parse.h)
FT_BEGIN_HEADER

View File

@ -22,11 +22,11 @@
#include <string.h> /* strcmp() */
#include FT_SOURCE_FILE( type1, t1gload.h )
#include FT_SOURCE_FILE( type1, t1load.h )
#include FT_SOURCE_FILE(type1,t1gload.h)
#include FT_SOURCE_FILE(type1,t1load.h)
#ifndef T1_CONFIG_OPTION_NO_AFM
#include FT_SOURCE_FILE( type1, t1afm.h )
#include FT_SOURCE_FILE(type1,t1afm.h)
#endif
#include FT_INTERNAL_POSTSCRIPT_NAMES_H

View File

@ -39,7 +39,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_SOURCE_FILE( type1, t1parse.h )
#include FT_SOURCE_FILE(type1,t1parse.h)
#include <string.h> /* for strncmp() */

View File

@ -19,14 +19,14 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
#include FT_SOURCE_FILE( type1, t1parse.c )
#include FT_SOURCE_FILE( type1, t1load.c )
#include FT_SOURCE_FILE( type1, t1objs.c )
#include FT_SOURCE_FILE( type1, t1driver.c )
#include FT_SOURCE_FILE( type1, t1gload.c )
#include FT_SOURCE_FILE(type1,t1parse.c)
#include FT_SOURCE_FILE(type1,t1load.c)
#include FT_SOURCE_FILE(type1,t1objs.c)
#include FT_SOURCE_FILE(type1,t1driver.c)
#include FT_SOURCE_FILE(type1,t1gload.c)
#ifndef T1_CONFIG_OPTION_NO_AFM
#include FT_SOURCE_FILE( type1, t1afm.c )
#include FT_SOURCE_FILE(type1,t1afm.c)
#endif

View File

@ -22,7 +22,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_FNT_TYPES_H
#include FT_SOURCE_FILE( winfonts, winfnt.h )
#include FT_SOURCE_FILE(winfonts,winfnt.h)
/*************************************************************************/