mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* builds/*/*-def.mk: changed the objects directory from "obj" to "objs"

Browse Source 
* include/freetype/config/ftheader.h: removed obsolete macros like
	FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that
	were previously defined in <freetype/ftcache.h>. Added comments to be
	included in a new API Reference section.

	* src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component
	needs to added its own directory to the include path at compile time.
	Modified all "rules.mk" and "descrip.mms" accordingly..
This commit is contained in:
David Turner 2001-03-20 11:14:24 +00:00
parent 150f96d043
commit 7dca898c4b
120 changed files with 313 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,17 @@
2001-03-20 David Turner <david.turner@freetype.org>
* builds/*/*-def.mk: changed the objects directory from "obj" to "objs"
* include/freetype/config/ftheader.h: removed obsolete macros like
FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that
were previously defined in <freetype/ftcache.h>. Added comments to be
included in a new API Reference section.
* src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component
needs to added its own directory to the include path at compile time.
Modified all "rules.mk" and "descrip.mms" accordingly..
2001-03-20 Werner Lemberg <wl@gnu.org>
* builds/unix/configure.in: Add $ft_version.
@ -69,8 +83,8 @@
* include/freetype/internal/psaux.h: Changed the lenIV member of
the T1_Decoder_ struct to be an FT_Int instead of an FT_UInt.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust
for lenIV seed bytes at the start of a decrypted subroutine.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust
for lenIV seed bytes at the start of a decrypted subroutine.
* src/cid/cidload.c (cid_read_subrs): Decrypt subroutines only
if lenIV >= 0.

2
builds/ansi/ansi-def.mk
View File

@ -34,7 +34,7 @@ PLATFORM := ansi
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)obj
OBJ_DIR := $(TOP)$(SEP)objs
endif

2
builds/cygwin/cygwin-def.in
View File

@ -66,7 +66,7 @@ version_info := @version_info@
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif

2
builds/cygwin/cygwinddef.mk
View File

@ -33,7 +33,7 @@ PLATFORM := unixdev
# The directory where all object files are placed.
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif

2
builds/dos/dos-def.mk
View File

@ -34,7 +34,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)obj
OBJ_DIR := $(TOP)$(SEP)objs
endif

2
builds/freetype.mk
View File

@ -130,7 +130,7 @@ PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
# in the `freetype/builds/<system>' directory, as these
# files will override the default sources.
#
INCLUDES := $(BUILD) $(TOP)$(SEP)include $(SRC)
INCLUDES := $(BUILD) $(TOP)$(SEP)include
INCLUDE_FLAGS = $(INCLUDES:%=$I%)

2
builds/os2/os2-def.mk
View File

@ -34,7 +34,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)obj
OBJ_DIR := $(TOP)$(SEP)objs
endif

2
builds/unix/ft2unix.h
View File

@ -34,7 +34,7 @@
#define FT2_CONFIG_FILE( x ) <freetype2/freetype/config/ ## x ## >
#define FT2_INTERNAL_FILE( x ) <freetype2/freetype/internal/ ## x ## >
#include FT2_CONFIG_FILE( ft2build.h )
#include FT2_CONFIG_FILE( ftheader.h )
#endif /* __FT2_BUILD_UNIX_H__ */

2
builds/unix/unix-def.in
View File

@ -66,7 +66,7 @@ version_info := @version_info@
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif

2
builds/unix/unixddef.mk
View File

@ -33,7 +33,7 @@ PLATFORM := unixdev
# The directory where all object files are placed.
#
ifndef OBJ_DIR
OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif

8
builds/win32/detect.mk
View File

@ -86,6 +86,14 @@ ifeq ($(PLATFORM),win32)
.PHONY: visualc
endif
ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
CONFIG_FILE := w32-intl.mk
SEP := $(BACKSLASH)
CC := cl
visualc: setup
.PHONY: visualc
endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk
SEP := $(BACKSLASH)

2
builds/win32/win32-def.mk
View File

@ -36,7 +36,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
OBJ_DIR := $(TOP)$(SEP)obj
OBJ_DIR := $(TOP)$(SEP)objs
endif

172
include/freetype/config/ftheader.h
View File

@ -15,134 +15,8 @@
/* */
/***************************************************************************/
/*************************************************************************/
/* */
/* This file corresponds to the default "ft2build.h" file for */
/* FreeType 2. It uses the "freetype" include root. */
/* */
/* Note that specific platforms might use a different configuration. */
/* For example, on Unix, the "freetype2" include root could be used, */
/* with a specific "ft2build.h" to take care of this. The latter then */
/* looks like the following: */
/* */
/* #ifndef __FT2_BUILD_UNIX_H__ */
/* #define __FT2_BUILD_UNIX_H__ */
/* */
/* #define FT2_ROOT freetype2 */
/* #include <freetype2/config/ft2build.h> */
/* */
/* #include FT2_CONFIG_FILE( ft2build.h ) */
/* */
/* #endif */
/* */
/* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */
/* different path separator is needed. */
/* */
/*************************************************************************/
#ifndef __FT2_BUILD_H__
#define __FT2_BUILD_H__
/* 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_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: */
/* */
/* #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_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: */
/* */
/* #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. */
/* */
#define FT2_INTERNAL_FILE( x ) FT2_ENCLOSE(FT2_ROOT/internal/x)
/*************************************************************************/
/* */
/* The macro FT_SOURCE_FILE is used to include a given FreeType 2 */
/* component source file (be it a header, a C source file, or an */
/* included file). */
/* */
/* Its first argument is the component/module's directory according to */
/* the normal FreeType 2 source directory hierarchy, and the second one */
/* the file name. */
/* */
/* Note that you can also put all library source files in a single */
/* directory and compile them normally by defining the macro */
/* FT_FLAT_COMPILATION. */
/* */
#ifndef FT_SOURCE_FILE
#ifdef FT_FLAT_COMPILATION
#define FT_SOURCE_FILE( d, x ) #x
#else
#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x)
#endif
#endif /* !FT_SOURCE_FILE */
#ifndef __FT_HEADER_H__
#define __FT_HEADER_H__
/*************************************************************************/
/* */
@ -431,7 +305,36 @@
* a macro used in #include statements to name the file containing
* the API of the optional FreeType 2 cache sub-system.
*/
#define FT_CACHE_H <freetype/ftcache.h>
#define FT_CACHE_H <freetype/ftcache.h>
/*************************************************************************
*
* @macro: FT_CACHE_IMAGE_H
*
* @description:
* a macro used in #include statements to name the file containing
* the "glyph image" API of the FreeType 2 cache sub-system
*
* it is used to define a cache for @FT_Glyph elements. You can also
* see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need
* to store small glyph bitmaps, as it will use less memory
*/
#define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h>
/*************************************************************************
*
* @macro: FT_CACHE_SMALL_BITMAPS_H
*
* @description:
* a macro used in #include statements to name the file containing
* the "small bitmaps" API of the FreeType 2 cache sub-system
*
* it is used to define a cache for small glyph bitmaps in a relatively
* memory-efficient way. You can also use the API defined in
* @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, including
* scalable outlines.
*/
#define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h>
/*************************************************************************
*
@ -466,15 +369,20 @@
* the optional FreeType 2 API used to access embedded "name" strings
* in SFNT-based font formats (i.e. TrueType and OpenType)
*/
#define FT_NAMES_H <freetype/ftnames.h>
#define FT_NAMES_H <freetype/ftnames.h>
/* */
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_CACHE_MANAGER_H <freetype/cache/ftcmanag.h>
#define FT_CACHE_INTERNAL_LRU_H <freetype/cache/ftlru.h>
#define FT_CACHE_INTERNAL_GLYPH_H <freetype/cache/ftcglyph.h>
#define FT_CACHE_INTERNAL_CHUNK_H <freetype/cache/ftcchunk.h>
/* now include internal headers definitions from <freetype/internal/...> */
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#include FT_INTERNAL_INTERNAL_H

2
include/freetype/config/ftoption.h
View File

@ -311,7 +311,7 @@ FT_BEGIN_HEADER
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/

12
include/freetype/freetype.h
View File

@ -2339,10 +2339,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `(a + 0x8000) & -0x10000'. */
/* */
/* <Note> */
/* This function assumes that the target platform supports 32-bit */
/* signed integers. */
/* */
FT_EXPORT( FT_Fixed ) FT_RoundFix( FT_Fixed a );
@ -2361,10 +2357,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `(a + 0x10000 - 1) & -0x10000'. */
/* */
/* <Note> */
/* This function assumes that the target platform supports 32-bit */
/* signed integers. */
/* */
FT_EXPORT( FT_Fixed ) FT_CeilFix( FT_Fixed a );
@ -2383,10 +2375,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `a & -0x10000'. */
/* */
/* <Note> */
/* This function assumes that the target platform supports 32-bit */
/* signed integers. */
/* */
FT_EXPORT( FT_Fixed ) FT_FloorFix( FT_Fixed a );

9
include/freetype/ftcache.h
View File

@ -42,15 +42,6 @@
FT_BEGIN_HEADER
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
/*************************************************************************/
/* */
/* <Section> */

28
include/freetype/fttypes.h
View File

@ -55,6 +55,8 @@ FT_BEGIN_HEADER
/* FT_Long */
/* FT_ULong */
/* FT_Bool */
/* FT_Offset */
/* FT_PtrDist */
/* FT_Error */
/* FT_Fixed */
/* FT_Pointer */
@ -268,6 +270,32 @@ FT_BEGIN_HEADER
typedef void* FT_Pointer;
/*************************************************************************/
/* */
/* <Type> */
/* FT_Offset */
/* */
/* <Description> */
/* This is equivalent to the ANSI C "size_t" type, i.e. it's the */
/* largest _unsigned_ integer type used to express a file size or */
/* position, or a memory block size. */
/* */
typedef size_t FT_Offset;
/*************************************************************************/
/* */
/* <Type> */
/* FT_PtrDist */
/* */
/* <Description> */
/* This is equivalent to the ANSI C "ptrdiff_t" type, i.e. the */
/* largest _signed_ integer type used to express the distance */
/* between two pointers. */
/* */
typedef size_t FT_PtrDist;
/*************************************************************************/
/* */
/* <Struct> */

2
src/autohint/ahangles.c
View File

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

2
src/autohint/ahangles.h
View File

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

4
src/autohint/ahglobal.c
View File

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

2
src/autohint/ahglobal.h
View File

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

6
src/autohint/ahglyph.c
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 "ahglyph.h"
#include "ahangles.h"
#include "ahglobal.h"
#include <stdio.h>

2
src/autohint/ahglyph.h
View File

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

6
src/autohint/ahhint.c
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 "ahhint.h"
#include "ahglyph.h"
#include "ahangles.h"
#include FT_OUTLINE_H

2
src/autohint/ahhint.h
View File

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

2
src/autohint/ahmodule.c
View File

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

2
src/autohint/ahoptim.c
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 "ahoptim.h"
/* define this macro to use brute force optimisation -- this is slow, */

2
src/autohint/ahoptim.h
View File

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

2
src/autohint/ahtypes.h
View File

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

10
src/autohint/autohint.c
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 "ahangles.c"
#include "ahglyph.c"
#include "ahglobal.c"
#include "ahhint.c"
#include "ahmodule.c"
/* END */

2
src/autohint/descrip.mms
View File

@ -15,7 +15,7 @@
# Note that this license is compatible with the FreeType license.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint])
OBJS=autohint.obj

2
src/autohint/rules.mk
View File

@ -24,7 +24,7 @@ AUTO_DIR_ := $(AUTO_DIR)$(SEP)
# compilation flags for the driver
#
AUTO_COMPILE := $(FT_COMPILE)
AUTO_COMPILE := $(FT_COMPILE) $I$(AUTO_DIR)
# AUTO driver sources (i.e., C files)

2
src/base/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include])
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj

19
src/base/ftbase.c
View File

@ -17,13 +17,18 @@
#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)
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include "ftcalc.c"
#include "ftobjs.c"
#include "ftstream.c"
#include "ftlist.c"
#include "ftoutln.c"
#include "ftnames.c"
#if 0
#include "ftextend.c"
#endif
/* END */

4
src/base/ftmac.c
View File

@ -60,8 +60,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_STREAM_H
#include FT_SOURCE_FILE( truetype, ttobjs.h )
#include FT_SOURCE_FILE( type1, t1objs.h )
#include "truetype/ttobjs.h"
#include "type1/t1objs.h"
#include <Resources.h>
#include <Fonts.h>

8
src/base/ftobjs.c
View File

@ -2079,10 +2079,10 @@
}
FT_LOCAL_DEF
FT_Error FT_Render_Glyph_Internal( FT_Library library,
FT_GlyphSlot slot,
FT_UInt render_mode )
FT_EXPORT_DEF(FT_Error)
FT_Render_Glyph_Internal( FT_Library library,
FT_GlyphSlot slot,
FT_UInt render_mode )
{
FT_Error error = FT_Err_Ok;
FT_Renderer renderer;

2
src/cache/descrip.mms vendored
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache])
OBJS=ftcache.obj

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 "ftlru.c"
#include "ftcmanag.c"
#include "ftcglyph.c"
#include "ftcchunk.c"
#include "ftcimage.c"
#include "ftcsbits.c"
/* END */

2
src/cache/rules.mk vendored
View File

@ -23,7 +23,7 @@ CACHE_H_DIR_ := $(CACHE_H_DIR)$(SEP)
# compilation flags for the driver
#
Cache_COMPILE := $(FT_COMPILE)
Cache_COMPILE := $(FT_COMPILE) $I$(CACHE_DIR)
# Cache driver sources (i.e., C files)

10
src/cff/cff.c
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,cffgload.c)
#include "cffdrivr.c"
#include "cffparse.c"
#include "cffload.c"
#include "cffobjs.c"
#include "cffgload.c"
/* END */

6
src/cff/cffdrivr.c
View File

@ -24,9 +24,9 @@
#include FT_TRUETYPE_NAMES_H
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_SOURCE_FILE(cff,cffdrivr.h)
#include FT_SOURCE_FILE(cff,cffgload.h)
#include FT_SOURCE_FILE(cff,cffload.h)
#include "cffdrivr.h"
#include "cffgload.h"
#include "cffload.h"
/*************************************************************************/
/* */

18
src/cff/cffgload.c
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,cffgload.h)
#include "cffload.h"
#include "cffgload.h"
#include FT_INTERNAL_CFF_ERRORS_H
@ -74,7 +74,7 @@
cff_op_hintmask,
cff_op_cntrmask,
cff_op_dotsection,
cff_op_dotsection, /* deprecated, acts as no-op */
cff_op_abs,
cff_op_add,
@ -1092,11 +1092,6 @@
args = stack;
break;
case cff_op_dotsection:
FT_TRACE4(( " dotsection" ));
break;
case cff_op_rmoveto:
FT_TRACE4(( " rmoveto" ));
@ -1843,6 +1838,13 @@
goto Unimplemented;
case cff_op_dotsection:
{
/* this operator is deprecated and ignored by the parser */
FT_TRACE4(( " dotsection" ));
}
break;
case cff_op_and:
{
FT_Fixed cond = args[0] && args[1];

2
src/cff/cffgload.h
View File

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

8
src/cff/cffload.c
View File

@ -8,7 +8,7 @@
/* 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 */
/* modified, and xdistributed 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. */
@ -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 "cffload.h"
#include "cffparse.h"
/*************************************************************************/
@ -1790,7 +1790,7 @@
for ( k = i; k < nleft + i; k++, glyph_code++ )
{
/* Make sure k is not too big. */
if ( k > num_glyphs )
if ( (FT_UInt)k > num_glyphs )
goto Exit;
/* Assign code to GID mapping. */

8
src/cff/cffobjs.c
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 "cffobjs.h"
#include "cffload.h"
#include FT_INTERNAL_CFF_ERRORS_H
#include <string.h> /* for strlen() */
@ -388,8 +388,8 @@
/* set global bbox, as well as EM size */
root->bbox = dict->font_bbox;
root->ascender = root->bbox.yMax >> 16;
root->descender = root->bbox.yMin >> 16;
root->ascender = (FT_Short)(root->bbox.yMax >> 16);
root->descender = (FT_Short)(root->bbox.yMin >> 16);
root->height = ( ( root->ascender - root->descender ) * 12 ) / 10;
if ( dict->units_per_em )

4
src/cff/cffparse.c
View File

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

2
src/cff/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff])
OBJS=cff.obj

2
src/cff/rules.mk
View File

@ -19,7 +19,7 @@ CFF_DIR := $(SRC_)cff
CFF_DIR_ := $(CFF_DIR)$(SEP)
CFF_COMPILE := $(FT_COMPILE)
CFF_COMPILE := $(FT_COMPILE) $I$(CFF_DIR)
# CFF driver sources (i.e., C files)

4
src/cid/cidgload.c
View File

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

2
src/cid/cidgload.h
View File

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

10
src/cid/cidload.c
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 "cidload.h"
#include <stdio.h>
#include <ctype.h> /* for isspace(), isalnum() */
@ -271,16 +271,8 @@
const T1_Field cid_field_records[] =
{
#ifdef FT_FLAT_COMPILE
#include "cidtokens.h"
#else
#include <cid/cidtokens.h>
#endif
T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox )
T1_FIELD_CALLBACK( "FDArray", parse_fd_array )
T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix )

2
src/cid/cidload.h
View File

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

4
src/cid/cidobjs.c
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 "cidgload.h"
#include "cidload.h"
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H

2
src/cid/cidparse.c
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 "cidparse.h"
#include <string.h> /* for strncmp() */

4
src/cid/cidriver.c
View File

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

2
src/cid/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid])
OBJS=type1cid.obj

2
src/cid/rules.mk
View File

@ -19,7 +19,7 @@ CID_DIR := $(SRC_)cid
CID_DIR_ := $(CID_DIR)$(SEP)
CID_COMPILE := $(FT_COMPILE)
CID_COMPILE := $(FT_COMPILE) $I$(CID_DIR)
# CID driver sources (i.e., C files)

10
src/cid/type1cid.c
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 "cidparse.c"
#include "cidload.c"
#include "cidobjs.c"
#include "cidriver.c"
#include "cidgload.c"
/* END */

2
src/pcf/descrip.mms
View File

@ -25,7 +25,7 @@
# THE SOFTWARE.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf])
OBJS=pcf.obj

6
src/pcf/pcf.c
View File

@ -29,8 +29,8 @@ THE SOFTWARE.
#include <ft2build.h>
#include FT_SOURCE_FILE(pcf,pcfutil.c)
#include FT_SOURCE_FILE(pcf,pcfread.c)
#include FT_SOURCE_FILE(pcf,pcfdriver.c)
#include "pcfutil.c"
#include "pcfread.c"
#include "pcfdriver.c"
/* END */

2
src/pcf/pcf.h
View File

@ -226,7 +226,7 @@ FT_BEGIN_HEADER
#define GLYPHPADOPTIONS 4 /* I'm not sure about this */
static
FT_LOCAL
FT_Error pcf_load_font( FT_Stream,
PCF_Face );

6
src/pcf/pcfdriver.c
View File

@ -32,9 +32,9 @@ THE SOFTWARE.
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(pcf,pcf.h)
#include FT_SOURCE_FILE(pcf,pcfdriver.h)
#include FT_SOURCE_FILE(pcf,pcfutil.h)
#include "pcf.h"
#include "pcfdriver.h"
#include "pcfutil.h"
/*************************************************************************/

5
src/pcf/pcfread.c
View File

@ -32,8 +32,8 @@ THE SOFTWARE.
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(pcf,pcf.h)
#include FT_SOURCE_FILE(pcf,pcfdriver.h)
#include "pcf.h"
#include "pcfdriver.h"
#include <string.h> /* strlen(), strcpy() */
@ -856,6 +856,7 @@ THE SOFTWARE.
}
FT_LOCAL_DEF
FT_Error pcf_load_font( FT_Stream stream,
PCF_Face face )
{

2
src/pcf/pcfutil.c
View File

@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
#include <ft2build.h>
#include FT_SOURCE_FILE(pcf,pcfutil.h)
#include "pcfutil.h"
/* Utility functions for reformatting font bitmaps */

2
src/pcf/rules.mk
View File

@ -31,7 +31,7 @@ PCF_DIR := $(SRC_)pcf
PCF_DIR_ := $(PCF_DIR)$(SEP)
PCF_COMPILE := $(FT_COMPILE)
PCF_COMPILE := $(FT_COMPILE) $I$(PCF_DIR)
# pcf driver sources (i.e., C files)

2
src/psaux/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux])
OBJS=psaux.obj

6
src/psaux/psaux.c
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 "psobjs.c"
#include "psauxmod.c"
#include "t1decode.c"
/* END */

6
src/psaux/psauxmod.c
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 "psauxmod.h"
#include "psobjs.h"
#include "t1decode.h"
FT_CALLBACK_TABLE_DEF

2
src/psaux/psobjs.c
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 "psobjs.h"
/*************************************************************************/

2
src/psaux/rules.mk
View File

@ -21,7 +21,7 @@ PSAUX_DIR_ := $(PSAUX_DIR)$(SEP)
# compilation flags for the driver
#
PSAUX_COMPILE := $(FT_COMPILE)
PSAUX_COMPILE := $(FT_COMPILE) $I$(PSAUX_DIR)
# PSAUX driver sources (i.e., C files)

4
src/psaux/t1decode.c
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 "t1decode.h"
#include "psobjs.h"
/*************************************************************************/

2
src/psnames/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames])
OBJS=psnames.obj

4
src/psnames/psmodule.c
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 "psmodule.h"
#include "pstables.h"
#include <stdlib.h> /* for qsort() */
#include <string.h> /* for strcmp(), strncpy() */

2
src/psnames/psnames.c
View File

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

2
src/psnames/rules.mk
View File

@ -21,7 +21,7 @@ PSNAMES_DIR_ := $(PSNAMES_DIR)$(SEP)
# compilation flags for the driver
#
PSNAMES_COMPILE := $(FT_COMPILE)
PSNAMES_COMPILE := $(FT_COMPILE) $I$(PSNAMES_DIR)
# PSNames driver sources (i.e., C files)

2
src/raster/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster])
OBJS=raster.obj

2
src/raster/ftraster.c
View File

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

4
src/raster/ftrend1.c
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 "ftrend1.h"
#include "ftraster.h"
/* initialize renderer -- init its raster */

4
src/raster/raster.c
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 "ftraster.c"
#include "ftrend1.c"
/* END */

2
src/raster/rules.mk
View File

@ -20,7 +20,7 @@ RAS1_DIR_ := $(RAS1_DIR)$(SEP)
# compilation flags for the driver
#
RAS1_COMPILE := $(FT_COMPILE)
RAS1_COMPILE := $(FT_COMPILE) $I$(RAS1_DIR)
# raster1 driver sources (i.e., C files)

2
src/sfnt/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt])
OBJS=sfnt.obj

2
src/sfnt/rules.mk
View File

@ -21,7 +21,7 @@ SFNT_DIR_ := $(SFNT_DIR)$(SEP)
# compilation flags for the driver
#
SFNT_COMPILE := $(FT_COMPILE)
SFNT_COMPILE := $(FT_COMPILE) $I$(SFNT_DIR)
# SFNT driver sources (i.e., C files)

12
src/sfnt/sfdriver.c
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 "sfdriver.h"
#include "ttload.h"
#include "ttcmap.h"
#include "sfobjs.h"
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include FT_SOURCE_FILE(sfnt,ttsbit.h)
#include "ttsbit.h"
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include FT_SOURCE_FILE(sfnt,ttpost.h)
#include "ttpost.h"
#endif
#include <string.h> /* for strcmp() */

12
src/sfnt/sfnt.c
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 "ttload.c"
#include "ttcmap.c"
#include "sfobjs.c"
#include "sfdriver.c"
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#include FT_SOURCE_FILE(sfnt,ttsbit.c)
#include "ttsbit.c"
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#include FT_SOURCE_FILE(sfnt,ttpost.c)
#include "ttpost.c"
#endif

4
src/sfnt/sfobjs.c
View File

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

4
src/sfnt/ttcmap.c
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 "ttload.h"
#include "ttcmap.h"
/*************************************************************************/

4
src/sfnt/ttload.c
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 "ttload.h"
#include "ttcmap.h"
/*************************************************************************/

4
src/sfnt/ttpost.c
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 "ttpost.h"
#include "ttload.h"
/*************************************************************************/

2
src/sfnt/ttsbit.c
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 "ttsbit.h"
/*************************************************************************/

2
src/sfnt/ttsbit.h
View File

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

2
src/smooth/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth])
OBJS=smooth.obj

2
src/smooth/ftgrays.c
View File

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

4
src/smooth/ftsmooth.c
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 "ftsmooth.h"
#include "ftgrays.h"
/* initialize renderer -- init its raster */

2
src/smooth/rules.mk
View File

@ -20,7 +20,7 @@ SMOOTH_DIR_ := $(SMOOTH_DIR)$(SEP)
# compilation flags for the driver
#
SMOOTH_COMPILE := $(FT_COMPILE)
SMOOTH_COMPILE := $(FT_COMPILE) $I$(SMOOTH_DIR)
# smooth driver sources (i.e., C files)

4
src/smooth/smooth.c
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 "ftgrays.c"
#include "ftsmooth.c"
/* END */

2
src/truetype/descrip.mms
View File

@ -13,7 +13,7 @@
# fully.
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype])
OBJS=truetype.obj

2
src/truetype/rules.mk
View File

@ -21,7 +21,7 @@ TT_DIR_ := $(TT_DIR)$(SEP)
# compilation flags for the driver
#
TT_COMPILE := $(FT_COMPILE)
TT_COMPILE := $(FT_COMPILE) $I$(TT_DIR)
# TrueType driver sources (i.e., C files)

10
src/truetype/truetype.c
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 "ttdriver.c" /* driver interface */
#include "ttpload.c" /* tables loader */
#include "ttgload.c" /* glyph loader */
#include "ttobjs.c" /* object manager */
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#include FT_SOURCE_FILE(truetype,ttinterp.c)
#include "ttinterp.c"
#endif

4
src/truetype/ttdriver.c
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 "ttdriver.h"
#include "ttgload.h"
/*************************************************************************/

2
src/truetype/ttgload.c
View File

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

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