ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove trailing whitespace. From Alexei.

This commit is contained in:
Werner Lemberg 2007-01-16 06:11:27 +00:00
parent 267e1d719a
commit 9b774e2822
59 changed files with 185 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -174,7 +174,7 @@
(tt_size_init): Move most code into `tt_size_init_bytecode'. (tt_size_init): Move most code into `tt_size_init_bytecode'.
(tt_size_done): Move most code into `tt_size_done_bytecode'. (tt_size_done): Move most code into `tt_size_done_bytecode'.
(tt_size_reset): Move some code to `tt_size_ready_bytecode'. (tt_size_reset): Move some code to `tt_size_ready_bytecode'.
Don't extract the metrics table from the SFNT font file. Instead, Don't extract the metrics table from the SFNT font file. Instead,
reparse it on each glyph load. The runtime difference is not reparse it on each glyph load. The runtime difference is not
@ -280,7 +280,7 @@
* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New * src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New
function. function.
Check uniqueness of the gid pairs. Check uniqueness of the gid pairs.
(gxv_kern_subtable_fmt0_validate): Move some code to (gxv_kern_subtable_fmt0_validate): Move some code to
`gxv_kern_subtable_fmt0_pairs_validate'. `gxv_kern_subtable_fmt0_pairs_validate'.
2006-12-22 David Turner <david@freetype.org> 2006-12-22 David Turner <david@freetype.org>
@ -298,7 +298,7 @@
2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* include/freetype/internal/services/svotval.h: Add `volatile' to * include/freetype/internal/services/svotval.h: Add `volatile' to
sync with the modification by Jens Claudius on 2006-08-22; cf. sync with the modification by Jens Claudius on 2006-08-22; cf.
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5

2
builds/amiga/README
View File

@ -56,7 +56,7 @@ directory. The results are:
- ftdebugpure.o, an object module containing the pure version of the - ftdebugpure.o, an object module containing the pure version of the
debugging code which uses KVPrintf() from lib:debug.lib and no debugging code which uses KVPrintf() from lib:debug.lib and no
exit(). For debugging of Amiga run-time shared system libraries. exit(). For debugging of Amiga run-time shared system libraries.
Source code is in src/base/ftdebug.c. Source code is in src/base/ftdebug.c.
- NO ftinit.o. Because linking with a link library should result in - NO ftinit.o. Because linking with a link library should result in

2
builds/amiga/include/freetype/config/ftconfig.h
View File

@ -40,7 +40,7 @@
#endif #endif
#else #else
/* We must define that, it seems that /* We must define that, it seems that
* lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in
* ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf * ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf
* binaries from http://www.morphos.de) * binaries from http://www.morphos.de)
*/ */

6
builds/amiga/src/base/ftsystem.c
View File

@ -457,7 +457,7 @@ Free_VecPooled( APTR poolHeader,
extern void extern void
ft_mem_debug_done( FT_Memory memory ); ft_mem_debug_done( FT_Memory memory );
#endif #endif
@ -493,7 +493,7 @@ Free_VecPooled( APTR poolHeader,
memory->free = ft_free; memory->free = ft_free;
#ifdef FT_DEBUG_MEMORY #ifdef FT_DEBUG_MEMORY
ft_mem_debug_init( memory ); ft_mem_debug_init( memory );
#endif #endif
} }
} }
@ -508,7 +508,7 @@ Free_VecPooled( APTR poolHeader,
{ {
#ifdef FT_DEBUG_MEMORY #ifdef FT_DEBUG_MEMORY
ft_mem_debug_done( memory ); ft_mem_debug_done( memory );
#endif #endif
DeletePool( memory->user ); DeletePool( memory->user );
FreeVec( memory ); FreeVec( memory );

4
builds/atari/ATARI.H
View File

@ -6,8 +6,8 @@
/* PureC doesn't like 32bit enumerations */ /* PureC doesn't like 32bit enumerations */
#ifndef FT_IMAGE_TAG #ifndef FT_IMAGE_TAG
#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 ) value #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 ) value
#endif /* FT_IMAGE_TAG */ #endif /* FT_IMAGE_TAG */
#ifndef FT_ENC_TAG #ifndef FT_ENC_TAG
#define FT_ENC_TAG( value, a, b, c, d ) value #define FT_ENC_TAG( value, a, b, c, d ) value

30
docs/CUSTOMIZE
View File

@ -12,16 +12,16 @@ I. Configuration macros
list of commented configuration macros that can be toggled by list of commented configuration macros that can be toggled by
developers to indicate which features should be active while developers to indicate which features should be active while
building the library. building the library.
These options range from debug level to availability of certain These options range from debug level to availability of certain
features, like native TrueType hinting through a bytecode features, like native TrueType hinting through a bytecode
interpreter. interpreter.
We invite you to read this file for more information. You can We invite you to read this file for more information. You can
change the file's content to suit your needs, or override it with change the file's content to suit your needs, or override it with
one of the techniques described below. one of the techniques described below.
II. Modules list II. Modules list
If you use GNU make please edit the top-level file `modules.cfg'. If you use GNU make please edit the top-level file `modules.cfg'.
@ -43,7 +43,7 @@ III. System interface
FreeType's default interface to the system (i.e., the parts that FreeType's default interface to the system (i.e., the parts that
deal with memory management and i/o streams) is located in deal with memory management and i/o streams) is located in
`src/base/ftsystem.c'. `src/base/ftsystem.c'.
The current implementation uses standard C library calls to manage The current implementation uses standard C library calls to manage
memory and to read font files. It is however possible to write memory and to read font files. It is however possible to write
custom implementations to suit specific systems. custom implementations to suit specific systems.
@ -51,21 +51,21 @@ III. System interface
To tell the GNU Make-based build system to use a custom system To tell the GNU Make-based build system to use a custom system
interface, you have to define the environment variable FTSYS_SRC to interface, you have to define the environment variable FTSYS_SRC to
point to the relevant implementation: point to the relevant implementation:
on Unix: on Unix:
./configure <your options> ./configure <your options>
export FTSYS_SRC=foo/my_ftsystem.c export FTSYS_SRC=foo/my_ftsystem.c
make make
make install make install
on Windows: on Windows:
make setup <compiler> make setup <compiler>
set FTSYS_SRC=foo/my_ftsystem.c set FTSYS_SRC=foo/my_ftsystem.c
make make
IV. Overriding default configuration and module headers IV. Overriding default configuration and module headers
It is possible to override the default configuration and module It is possible to override the default configuration and module
@ -84,10 +84,10 @@ IV. Overriding default configuration and module headers
2. Using the C include path 2. Using the C include path
Use the C include path to ensure that your own versions of the Use the C include path to ensure that your own versions of the
files are used at compile time when the lines files are used at compile time when the lines
#include FT_CONFIG_OPTIONS_H #include FT_CONFIG_OPTIONS_H
#include FT_CONFIG_MODULES_H #include FT_CONFIG_MODULES_H
@ -100,7 +100,7 @@ IV. Overriding default configuration and module headers
config/ config/
ftoption.h => custom options header ftoption.h => custom options header
ftmodule.h => custom modules list ftmodule.h => custom modules list
include/ => normal FreeType 2 include include/ => normal FreeType 2 include
freetype/ freetype/
... ...
@ -110,11 +110,11 @@ IV. Overriding default configuration and module headers
3. Redefining FT_CONFIG_OPTIONS_H and FT_CONFIG_MODULES_H 3. Redefining FT_CONFIG_OPTIONS_H and FT_CONFIG_MODULES_H
Another way to do the same thing is to redefine the macros used to Another way to do the same thing is to redefine the macros used to
name the configuration headers. To do so, you need a custom name the configuration headers. To do so, you need a custom
`ft2build.h' whose content can be as simple as: `ft2build.h' whose content can be as simple as:
#ifndef __FT2_BUILD_MY_PLATFORM_H__ #ifndef __FT2_BUILD_MY_PLATFORM_H__
#define __FT2_BUILD_MY_PLATFORM_H__ #define __FT2_BUILD_MY_PLATFORM_H__
@ -124,9 +124,9 @@ IV. Overriding default configuration and module headers
#include <freetype/config/ftheader.h> #include <freetype/config/ftheader.h>
#endif /* __FT2_BUILD_MY_PLATFORM_H__ */ #endif /* __FT2_BUILD_MY_PLATFORM_H__ */
Place those files in a separate directory, e.g., Place those files in a separate directory, e.g.,
custom/ custom/
ft2build.h => custom version described above ft2build.h => custom version described above
my-ftoption.h => custom options header my-ftoption.h => custom options header

8
docs/DEBUG
View File

@ -78,7 +78,7 @@ its code:
3. FT_TRACE( level, (message...) ) 3. FT_TRACE( level, (message...) )
The FT_TRACE macro is used to send general-purpose debugging The FT_TRACE macro is used to send general-purpose debugging
messages during program execution. This macro uses an *implicit* messages during program execution. This macro uses an *implicit*
macro named FT_COMPONENT used to name the current FreeType component macro named FT_COMPONENT used to name the current FreeType component
@ -168,19 +168,19 @@ behaviour of FreeType at runtime.
performed by FreeType. This is very useful to test the robustness performed by FreeType. This is very useful to test the robustness
of the font engine and programs that use it in tight memory of the font engine and programs that use it in tight memory
conditions. 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. no allocation bounds are checked at runtime.
FT2_ALLOC_COUNT_MAX FT2_ALLOC_COUNT_MAX
This variable is ignored if FT2_DEBUG_MEMORY is not defined. It This variable is ignored if FT2_DEBUG_MEMORY is not defined. It
allows you to specify a maximum number of memory allocations allows you to specify a maximum number of memory allocations
performed by FreeType before returning the error performed by FreeType before returning the error
FT_Err_Out_Of_Memory. This is useful for debugging and testing the FT_Err_Out_Of_Memory. This is useful for debugging and testing the
engine's robustness. 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. no allocation bounds are checked at runtime.

2
docs/FTL.TXT
View File

@ -47,7 +47,7 @@ Introduction
credit/disclaimer to use in compliance with this license. We thus credit/disclaimer to use in compliance with this license. We thus
encourage you to use the following text: encourage you to use the following text:
""" """
Portions of this software are copyright © <year> The FreeType Portions of this software are copyright © <year> The FreeType
Project (www.freetype.org). All rights reserved. Project (www.freetype.org). All rights reserved.
""" """

10
docs/INSTALL
View File

@ -22,12 +22,12 @@ I. Normal installation and upgrades
3. On VMS with the `mms' build tool 3. On VMS with the `mms' build tool
See `INSTALL.VMS' for installation instructions on this platform. See `INSTALL.VMS' for installation instructions on this platform.
4. Other systems using GNU Make 4. Other systems using GNU Make
On non-Unix platforms, it is possible to build the library using On non-Unix platforms, it is possible to build the library using
GNU Make utility. Note that *NO OTHER MAKE TOOL WILL WORK*[2]! GNU Make utility. Note that *NO OTHER MAKE TOOL WILL WORK*[2]!
This methods supports several compilers on Windows, OS/2, and This methods supports several compilers on Windows, OS/2, and
@ -37,18 +37,18 @@ I. Normal installation and upgrades
5. With an IDE Project File (e.g., for Visual Studio or CodeWarrior) 5. With an IDE Project File (e.g., for Visual Studio or CodeWarrior)
We provide a small number of `project files' for various IDEs to We provide a small number of `project files' for various IDEs to
automatically build the library as well. Note that these files automatically build the library as well. Note that these files
are not supported and only sporadically maintained by FreeType are not supported and only sporadically maintained by FreeType
developers, so don't expect them to work in each release. developers, so don't expect them to work in each release.
To find them, have a look at the content of the `builds/<system>' To find them, have a look at the content of the `builds/<system>'
directory, where <system> stands for your OS or environment. directory, where <system> stands for your OS or environment.
6. From you own IDE, or own Makefiles 6. From you own IDE, or own Makefiles
If you want to create your own project file, follow the If you want to create your own project file, follow the
instructions given in the `INSTALL.ANY' document of this instructions given in the `INSTALL.ANY' document of this
directory. directory.

4
docs/INSTALL.ANY
View File

@ -10,9 +10,9 @@ I. Standard procedure
* DISABLE PRE-COMPILED HEADERS! This is very important for Visual * DISABLE PRE-COMPILED HEADERS! This is very important for Visual
C++, because FreeType uses lines like: C++, because FreeType uses lines like:
#include FT_FREETYPE_H #include FT_FREETYPE_H
which are not correctly supported by this compiler while being ISO which are not correctly supported by this compiler while being ISO
C compliant! C compliant!

4
docs/INSTALL.GNU
View File

@ -22,7 +22,7 @@ in the file INSTALL.UNIX instead.
Note that make++, a make tool written in Perl, supports enough Note that make++, a make tool written in Perl, supports enough
features of GNU make to compile FreeType. See features of GNU make to compile FreeType. See
http://makepp.sourceforge.net http://makepp.sourceforge.net
for more information; you need version 1.19 or newer, and you must for more information; you need version 1.19 or newer, and you must
@ -137,7 +137,7 @@ in the file INSTALL.UNIX instead.
Final note Final note
The build system builds a statically linked library of the font The build system builds a statically linked library of the font
engine in the `objs' directory. It does _not_ support the build engine in the `objs' directory. It does _not_ support the build
of DLLs on Windows and OS/2. If you need these, you have to of DLLs on Windows and OS/2. If you need these, you have to

2
docs/UPGRADE.UNIX
View File

@ -11,7 +11,7 @@ SPECIAL NOTE FOR UNIX USERS
----------------------------------------------------- -----------------------------------------------------
See the instructions in the file `TRUETYPE' of this directory. See the instructions in the file `TRUETYPE' of this directory.
Note that FreeType supports TrueType fonts without the bytecode Note that FreeType supports TrueType fonts without the bytecode
interpreter through its auto-hinter, which now generates relatively interpreter through its auto-hinter, which now generates relatively
good results with most fonts. good results with most fonts.

2
include/freetype/ftbitmap.h
View File

@ -3,7 +3,7 @@
/* ftbitmap.h */ /* ftbitmap.h */
/* */ /* */
/* FreeType utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp */ /* FreeType utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp */
/* bitmaps into 8bpp format (specification). */ /* bitmaps into 8bpp format (specification). */
/* */ /* */
/* Copyright 2004, 2005, 2006 by */ /* Copyright 2004, 2005, 2006 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */

4
include/freetype/ftgasp.h
View File

@ -51,11 +51,11 @@
* *
* @values: * @values:
* FT_GASP_NO_TABLE :: * FT_GASP_NO_TABLE ::
* This special value means that there is no GASP table in this face. * This special value means that there is no GASP table in this face.
* It is up to the client to decide what to do. * It is up to the client to decide what to do.
* *
* FT_GASP_DO_GRIDFIT :: * FT_GASP_DO_GRIDFIT ::
* Grid-fitting and hinting should be performed at the specified ppem. * Grid-fitting and hinting should be performed at the specified ppem.
* This *really* means TrueType bytecode interpretation. * This *really* means TrueType bytecode interpretation.
* *
* FT_GASP_DO_GRAY :: * FT_GASP_DO_GRAY ::

10
include/freetype/ftincrem.h
View File

@ -229,11 +229,11 @@ FT_BEGIN_HEADER
* *
* @struct: * @struct:
* FT_Incremental_FuncsRec * FT_Incremental_FuncsRec
* *
* @description: * @description:
* A table of functions for accessing fonts that load data * A table of functions for accessing fonts that load data
* incrementally. Used in @FT_Incremental_InterfaceRec. * incrementally. Used in @FT_Incremental_InterfaceRec.
* *
* @fields: * @fields:
* get_glyph_data :: * get_glyph_data ::
* The function to get glyph data. Must not be null. * The function to get glyph data. Must not be null.
@ -243,7 +243,7 @@ FT_BEGIN_HEADER
* *
* get_glyph_metrics :: * get_glyph_metrics ::
* The function to get glyph metrics. May be null if the font does * The function to get glyph metrics. May be null if the font does
* not provide overriding glyph metrics. * not provide overriding glyph metrics.
*/ */
typedef struct FT_Incremental_FuncsRec_ typedef struct FT_Incremental_FuncsRec_
{ {
@ -293,7 +293,7 @@ FT_BEGIN_HEADER
{ {
const FT_Incremental_FuncsRec* funcs; const FT_Incremental_FuncsRec* funcs;
FT_Incremental object; FT_Incremental object;
} FT_Incremental_InterfaceRec; } FT_Incremental_InterfaceRec;
@ -321,7 +321,7 @@ FT_BEGIN_HEADER
*/ */
#define FT_PARAM_TAG_INCREMENTAL FT_MAKE_TAG( 'i', 'n', 'c', 'r' ) #define FT_PARAM_TAG_INCREMENTAL FT_MAKE_TAG( 'i', 'n', 'c', 'r' )
/* */ /* */
FT_END_HEADER FT_END_HEADER

2
include/freetype/ftlcdfil.h
View File

@ -75,7 +75,7 @@ FT_BEGIN_HEADER
* FT_LCD_FILTER_LEGACY :: * FT_LCD_FILTER_LEGACY ::
* This filter corresponds to the original libXft color filter. It * This filter corresponds to the original libXft color filter. It
* provides high contrast output but can exhibit really bad color * provides high contrast output but can exhibit really bad color
* fringes if glyphs are not extremely well hinted to the pixel grid. * fringes if glyphs are not extremely well hinted to the pixel grid.
* In other words, it only works well if the TrueType bytecode * In other words, it only works well if the TrueType bytecode
* interpreter is enabled *and* high-quality hinted fonts are used. * interpreter is enabled *and* high-quality hinted fonts are used.
* *

8
include/freetype/ftotval.h
View File

@ -154,10 +154,10 @@ FT_BEGIN_HEADER
FT_EXPORT( FT_Error ) FT_EXPORT( FT_Error )
FT_OpenType_Validate( FT_Face face, FT_OpenType_Validate( FT_Face face,
FT_UInt validation_flags, FT_UInt validation_flags,
FT_Bytes *BASE_table, FT_Bytes *BASE_table,
FT_Bytes *GDEF_table, FT_Bytes *GDEF_table,
FT_Bytes *GPOS_table, FT_Bytes *GPOS_table,
FT_Bytes *GSUB_table, FT_Bytes *GSUB_table,
FT_Bytes *JSTF_table ); FT_Bytes *JSTF_table );
/* */ /* */

8
include/freetype/ftoutln.h
View File

@ -442,13 +442,13 @@ FT_BEGIN_HEADER
* *
* @enum: * @enum:
* FT_Orientation * FT_Orientation
* *
* @description: * @description:
* A list of values used to describe an outline's contour orientation. * A list of values used to describe an outline's contour orientation.
* *
* The TrueType and Postscript specifications use different conventions * The TrueType and Postscript specifications use different conventions
* to determine whether outline contours should be filled or unfilled. * to determine whether outline contours should be filled or unfilled.
* *
* @values: * @values:
* FT_ORIENTATION_TRUETYPE :: * FT_ORIENTATION_TRUETYPE ::
* According to the TrueType specification, clockwise contours must * According to the TrueType specification, clockwise contours must
@ -480,7 +480,7 @@ FT_BEGIN_HEADER
FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE, FT_ORIENTATION_FILL_RIGHT = FT_ORIENTATION_TRUETYPE,
FT_ORIENTATION_FILL_LEFT = FT_ORIENTATION_POSTSCRIPT, FT_ORIENTATION_FILL_LEFT = FT_ORIENTATION_POSTSCRIPT,
FT_ORIENTATION_NONE FT_ORIENTATION_NONE
} FT_Orientation; } FT_Orientation;
@ -488,7 +488,7 @@ FT_BEGIN_HEADER
* *
* @function: * @function:
* FT_Outline_Get_Orientation * FT_Outline_Get_Orientation
* *
* @description: * @description:
* This function analyzes a glyph outline and tries to compute its * This function analyzes a glyph outline and tries to compute its
* fill orientation (see @FT_Orientation). This is done by computing * fill orientation (see @FT_Orientation). This is done by computing

8
include/freetype/ftwinfnt.h
View File

@ -64,7 +64,7 @@ FT_BEGIN_HEADER
* *
* @values: * @values:
* FT_WinFNT_ID_DEFAULT :: * FT_WinFNT_ID_DEFAULT ::
* This is used for font enumeration and font creation as a * This is used for font enumeration and font creation as a
* `don't care' value. Valid font files don't contain this value. * `don't care' value. Valid font files don't contain this value.
* When querying for information about the character set of the font * When querying for information about the character set of the font
* that is currently selected into a specified device context, this * that is currently selected into a specified device context, this
@ -95,7 +95,7 @@ FT_BEGIN_HEADER
* Windows have. It is one of the OEM codepages from * Windows have. It is one of the OEM codepages from
* *
* http://www.microsoft.com/globaldev/reference/cphome.mspx, * http://www.microsoft.com/globaldev/reference/cphome.mspx,
* *
* and is used for the `DOS boxes', to support legacy applications. * and is used for the `DOS boxes', to support legacy applications.
* A German Windows version for example usually uses ANSI codepage * A German Windows version for example usually uses ANSI codepage
* 1252 and OEM codepage 850. * 1252 and OEM codepage 850.
@ -130,10 +130,10 @@ FT_BEGIN_HEADER
* *
* FT_WinFNT_ID_CP1253 :: * FT_WinFNT_ID_CP1253 ::
* A superset of Greek ISO 8859-7 (with minor modifications). * A superset of Greek ISO 8859-7 (with minor modifications).
* *
* FT_WinFNT_ID_CP1254 :: * FT_WinFNT_ID_CP1254 ::
* A superset of Turkish ISO 8859-9. * A superset of Turkish ISO 8859-9.
* *
* FT_WinFNT_ID_CP1255 :: * FT_WinFNT_ID_CP1255 ::
* A superset of Hebrew ISO 8859-8 (with some modifications). * A superset of Hebrew ISO 8859-8 (with some modifications).
* *

4
include/freetype/internal/services/svkern.h
View File

@ -36,12 +36,12 @@ FT_BEGIN_HEADER
FT_DEFINE_SERVICE( Kerning ) FT_DEFINE_SERVICE( Kerning )
{ {
FT_Kerning_TrackGetFunc get_track; FT_Kerning_TrackGetFunc get_track;
}; };
/* */ /* */
FT_END_HEADER FT_END_HEADER

8
include/freetype/internal/services/svttcmap.h
View File

@ -18,11 +18,11 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
/* Development of this service is support of /* Development of this service is support of
Information-technology Promotion Agency, Japan. */ Information-technology Promotion Agency, Japan. */
#ifndef __SVTTCMAP_H__ #ifndef __SVTTCMAP_H__
#define __SVTTCMAP_H__ #define __SVTTCMAP_H__
#include FT_INTERNAL_SERVICE_H #include FT_INTERNAL_SERVICE_H
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H
@ -64,8 +64,8 @@ FT_BEGIN_HEADER
FT_DEFINE_SERVICE( TTCMaps ) FT_DEFINE_SERVICE( TTCMaps )
{ {
TT_CMap_Info_GetFunc get_cmap_info; TT_CMap_Info_GetFunc get_cmap_info;
}; };
/* */ /* */

2
include/freetype/internal/services/svxf86nm.h
View File

@ -45,7 +45,7 @@ FT_BEGIN_HEADER
/* */ /* */
FT_END_HEADER FT_END_HEADER

6
include/freetype/internal/sfnt.h
View File

@ -738,13 +738,13 @@ FT_BEGIN_HEADER
/* the table directory */ /* the table directory */
TT_Load_Table_Func load_font_dir; TT_Load_Table_Func load_font_dir;
TT_Load_Metrics_Func load_hmtx; TT_Load_Metrics_Func load_hmtx;
TT_Load_Table_Func load_eblc; TT_Load_Table_Func load_eblc;
TT_Free_Table_Func free_eblc; TT_Free_Table_Func free_eblc;
TT_Set_SBit_Strike_Func set_sbit_strike; TT_Set_SBit_Strike_Func set_sbit_strike;
TT_Load_Strike_Metrics_Func load_strike_metrics; TT_Load_Strike_Metrics_Func load_strike_metrics;
TT_Get_Metrics_Func get_metrics; TT_Get_Metrics_Func get_metrics;
} SFNT_Interface; } SFNT_Interface;

2
include/freetype/internal/t1types.h
View File

@ -203,7 +203,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
PS_Unicodes unicode_map; PS_Unicodes unicode_map;
#endif #endif
/* support for Multiple Masters fonts */ /* support for Multiple Masters fonts */
PS_Blend blend; PS_Blend blend;

4
include/freetype/tttables.h
View File

@ -619,7 +619,7 @@ FT_BEGIN_HEADER
* to access the whole font file. Otherwise, you can use one of the * to access the whole font file. Otherwise, you can use one of the
* definitions found in the @FT_TRUETYPE_TAGS_H file, or forge a new * definitions found in the @FT_TRUETYPE_TAGS_H file, or forge a new
* one with @FT_MAKE_TAG. * one with @FT_MAKE_TAG.
* *
* offset :: * offset ::
* The starting offset in the table (or file if tag == 0). * The starting offset in the table (or file if tag == 0).
* *
@ -630,7 +630,7 @@ FT_BEGIN_HEADER
* *
* @inout: * @inout:
* length :: * length ::
* If the `length' parameter is NULL, then try to load the whole table. * If the `length' parameter is NULL, then try to load the whole table.
* Return an error code if it fails. * Return an error code if it fails.
* *
* Else, if `*length' is 0, exit immediately while returning the * Else, if `*length' is 0, exit immediately while returning the

18
src/base/ftapi.c
View File

@ -49,7 +49,7 @@
FT_UNUSED( library ); FT_UNUSED( library );
FT_Stream_OpenMemory( stream, base, size ); FT_Stream_OpenMemory( stream, base, size );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
@ -57,7 +57,7 @@
FT_ULong pos ) FT_ULong pos )
{ {
return FT_Stream_Seek( stream, pos ); return FT_Stream_Seek( stream, pos );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
@ -65,7 +65,7 @@
FT_Long distance ) FT_Long distance )
{ {
return FT_Stream_Skip( stream, distance ); return FT_Stream_Skip( stream, distance );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
@ -74,7 +74,7 @@
FT_ULong count ) FT_ULong count )
{ {
return FT_Stream_Read( stream, buffer, count ); return FT_Stream_Read( stream, buffer, count );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
@ -84,7 +84,7 @@
FT_ULong count ) FT_ULong count )
{ {
return FT_Stream_ReadAt( stream, pos, buffer, count ); return FT_Stream_ReadAt( stream, pos, buffer, count );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
@ -93,7 +93,7 @@
FT_Byte** pbytes ) FT_Byte** pbytes )
{ {
return FT_Stream_ExtractFrame( stream, count, pbytes ); return FT_Stream_ExtractFrame( stream, count, pbytes );
} }
FT_BASE_DEF( void ) FT_BASE_DEF( void )
@ -101,14 +101,14 @@
FT_Byte** pbytes ) FT_Byte** pbytes )
{ {
FT_Stream_ReleaseFrame( stream, pbytes ); FT_Stream_ReleaseFrame( stream, pbytes );
} }
FT_BASE_DEF( FT_Error ) FT_BASE_DEF( FT_Error )
FT_Access_Frame( FT_Stream stream, FT_Access_Frame( FT_Stream stream,
FT_ULong count ) FT_ULong count )
{ {
return FT_Stream_EnterFrame( stream, count ); return FT_Stream_EnterFrame( stream, count );
} }
FT_BASE_DEF( void ) FT_BASE_DEF( void )
@ -116,6 +116,6 @@
{ {
FT_Stream_ExitFrame( stream ); FT_Stream_ExitFrame( stream );
} }
/* END */ /* END */

2
src/base/ftmac.c
View File

@ -6,7 +6,7 @@
/* Heavily modified by mpsuzuki, George Williams, and Sean McBride. */ /* Heavily modified by mpsuzuki, George Williams, and Sean McBride. */
/* */ /* */
/* This file is for Mac OS X only; see builds/mac/ftoldmac.c for */ /* This file is for Mac OS X only; see builds/mac/ftoldmac.c for */
/* classic platforms built by MPW. */ /* classic platforms built by MPW. */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */
/* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */

2
src/base/ftmm.c
View File

@ -174,7 +174,7 @@
/* documentation is in ftmm.h */ /* documentation is in ftmm.h */
/* This is exactly the same as the previous function. It exists for */ /* This is exactly the same as the previous function. It exists for */
/* orthogonality. */ /* orthogonality. */

10
src/bdf/README
View File

@ -8,14 +8,14 @@ Introduction
************ ************
BDF (Bitmap Distribution Format) is a bitmap font format defined by Adobe, BDF (Bitmap Distribution Format) is a bitmap font format defined by Adobe,
which is intended to be easily understood by both humans and computers. which is intended to be easily understood by both humans and computers.
This code implements a BDF driver for the FreeType library, following the This code implements a BDF driver for the FreeType library, following the
Adobe Specification V 2.2. The specification of the BDF font format is Adobe Specification V 2.2. The specification of the BDF font format is
available from Adobe's web site: available from Adobe's web site:
http://partners.adobe.com/asn/developer/PDFS/TN/5005.BDF_Spec.pdf http://partners.adobe.com/asn/developer/PDFS/TN/5005.BDF_Spec.pdf
Many good bitmap fonts in bdf format come with XFree86 (www.XFree86.org). Many good bitmap fonts in bdf format come with XFree86 (www.XFree86.org).
They do not define vertical metrics, because the X Consortium BDF They do not define vertical metrics, because the X Consortium BDF
specification has removed them. specification has removed them.
@ -40,13 +40,13 @@ client application the work of interpreting them. For instance:
FT_New_Face( library, ..., &face ); FT_New_Face( library, ..., &face );
bdfface = (BDF_Public_Face)face; bdfface = (BDF_Public_Face)face;
if ( ( bdfface->charset_registry == "ISO10646" ) && if ( ( bdfface->charset_registry == "ISO10646" ) &&
( bdfface->charset_encoding == "1" ) ) ( bdfface->charset_encoding == "1" ) )
[..] [..]
Thus the driver always exports `ft_encoding_none' as face->charmap.encoding. Thus the driver always exports `ft_encoding_none' as face->charmap.encoding.
FT_Get_Char_Index's behavior is unmodified, that is, it converts the ULong FT_Get_Char_Index's behavior is unmodified, that is, it converts the ULong
value given as argument into the corresponding glyph number. value given as argument into the corresponding glyph number.

2
src/bdf/bdf.c
View File

@ -3,7 +3,7 @@
FreeType font driver for bdf files FreeType font driver for bdf files
Copyright (C) 2001, 2002 by Copyright (C) 2001, 2002 by
Francesco Zappa Nardelli Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

2
src/bdf/bdf.h
View File

@ -161,7 +161,7 @@ FT_BEGIN_HEADER
{ {
const char* key; const char* key;
void* data; void* data;
} _hashnode, *hashnode; } _hashnode, *hashnode;

2
src/bdf/module.mk
View File

@ -4,7 +4,7 @@
# Copyright 2001, 2002, 2006 by # Copyright 2001, 2002, 2006 by
# Francesco Zappa Nardelli # Francesco Zappa Nardelli
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights # in the Software without restriction, including without limitation the rights

4
src/cff/cffcmap.h
View File

@ -39,14 +39,14 @@ FT_BEGIN_HEADER
{ {
FT_CMapRec cmap; FT_CMapRec cmap;
FT_UShort* gids; /* up to 256 elements */ FT_UShort* gids; /* up to 256 elements */
} CFF_CMapStdRec; } CFF_CMapStdRec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec FT_CALLBACK_TABLE const FT_CMap_ClassRec
cff_cmap_encoding_class_rec; cff_cmap_encoding_class_rec;
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
/***** *****/ /***** *****/

2
src/cff/cffload.c
View File

@ -321,7 +321,7 @@
FT_Memory memory = stream->memory; FT_Memory memory = stream->memory;
if ( idx->count > 0 && idx->offsets == NULL ) if ( idx->count > 0 && idx->offsets == NULL )
{ {
FT_Byte offsize = idx->off_size; FT_Byte offsize = idx->off_size;
FT_ULong data_size; FT_ULong data_size;

4
src/gxvalid/README
View File

@ -439,7 +439,7 @@ gxvalid: TrueType GX validator
dialect. The classic Microsoft dialect and the new Apple dialect dialect. The classic Microsoft dialect and the new Apple dialect
are documented by each vendors' TrueType font specification, but are documented by each vendors' TrueType font specification, but
the documentation for classic Apple dialect is not available. the documentation for classic Apple dialect is not available.
For example, in the new Apple dialect, bit 15 is documented as For example, in the new Apple dialect, bit 15 is documented as
`set to 1 if the kerning is vertical'. On the other hand, in `set to 1 if the kerning is vertical'. On the other hand, in
classic Microsoft dialect, bit 1 is documented as `set to 1 if the classic Microsoft dialect, bit 1 is documented as `set to 1 if the
@ -487,7 +487,7 @@ gxvalid: TrueType GX validator
We checked 59 fonts bundled with MacOS and 38 fonts bundled with We checked 59 fonts bundled with MacOS and 38 fonts bundled with
Windows, where all font include a `kern' table. Windows, where all font include a `kern' table.
- fonts bundled with MacOS - fonts bundled with MacOS
* new Apple dialect * new Apple dialect
format 0: 18 format 0: 18

2
src/gxvalid/gxvfgen.c
View File

@ -465,7 +465,7 @@
printf( " {%1d, %1d, %1d, %2d}, /* %s */\n", printf( " {%1d, %1d, %1d, %2d}, /* %s */\n",
feat_name ? 1 : 0, feat_name ? 1 : 0,
( feat_name && ( feat_name &&
( ft_strncmp( feat_name, ( ft_strncmp( feat_name,
APPLE_RESERVED, APPLE_RESERVED_LENGTH ) == 0 ) APPLE_RESERVED, APPLE_RESERVED_LENGTH ) == 0 )
) ? 1 : 0, ) ? 1 : 0,
featreg_table[i].exclusive ? 1 : 0, featreg_table[i].exclusive ? 1 : 0,

2
src/gxvalid/gxvmort2.c
View File

@ -205,7 +205,7 @@
setComponent = (FT_UShort)( ( flags >> 15 ) & 1 ); setComponent = (FT_UShort)( ( flags >> 15 ) & 1 );
dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 ); dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 );
offset = (FT_UShort)( flags & 0x3FFFU ); offset = (FT_UShort)( flags & 0x3FFFU );
if ( 0 < offset ) if ( 0 < offset )

4
src/otvalid/otvmod.c
View File

@ -198,14 +198,14 @@
static static
const FT_Service_OTvalidateRec otvalid_interface = const FT_Service_OTvalidateRec otvalid_interface =
{ {
otv_validate otv_validate
}; };
static static
const FT_ServiceDescRec otvalid_services[] = const FT_ServiceDescRec otvalid_services[] =
{ {
{ FT_SERVICE_ID_OPENTYPE_VALIDATE, &otvalid_interface }, { FT_SERVICE_ID_OPENTYPE_VALIDATE, &otvalid_interface },
{ NULL, NULL } { NULL, NULL }

4
src/pcf/README
View File

@ -46,8 +46,8 @@ client application the work of interpreting them. For instance:
FT_New_Face( library,..., &face ); FT_New_Face( library,..., &face );
pcfface = (PCF_Public_Face)face; pcfface = (PCF_Public_Face)face;
if ((pcfface->charset_registry == "ISO10646") && if ((pcfface->charset_registry == "ISO10646") &&
(pcfface->charset_encoding) == "1")) [..] (pcfface->charset_encoding) == "1")) [..]
Thus the driver always export `ft_encoding_none' as Thus the driver always export `ft_encoding_none' as

2
src/pcf/module.mk
View File

@ -4,7 +4,7 @@
# Copyright 2000, 2006 by # Copyright 2000, 2006 by
# Francesco Zappa Nardelli # Francesco Zappa Nardelli
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights # in the Software without restriction, including without limitation the rights

4
src/pcf/pcfread.c
View File

@ -550,7 +550,7 @@ THE SOFTWARE.
} }
error = PCF_Err_Ok; error = PCF_Err_Ok;
Bail: Bail:
FT_FREE( props ); FT_FREE( props );
FT_FREE( strings ); FT_FREE( strings );
@ -1183,7 +1183,7 @@ THE SOFTWARE.
else else
root->family_name = NULL; root->family_name = NULL;
/* /*
* Note: We shift all glyph indices by +1 since we must * Note: We shift all glyph indices by +1 since we must
* respect the convention that glyph 0 always corresponds * respect the convention that glyph 0 always corresponds
* to the `missing glyph'. * to the `missing glyph'.

4
src/pcf/pcfutil.c
View File

@ -47,12 +47,12 @@ in this Software without prior written authorization from The Open Group.
for ( ; --nbytes >= 0; buf++ ) for ( ; --nbytes >= 0; buf++ )
{ {
unsigned int val = *buf; unsigned int val = *buf;
val = ( ( val >> 1 ) & 0x55 ) | ( ( val << 1 ) & 0xAA ); val = ( ( val >> 1 ) & 0x55 ) | ( ( val << 1 ) & 0xAA );
val = ( ( val >> 2 ) & 0x33 ) | ( ( val << 2 ) & 0xCC ); val = ( ( val >> 2 ) & 0x33 ) | ( ( val << 2 ) & 0xCC );
val = ( ( val >> 4 ) & 0x0F ) | ( ( val << 4 ) & 0xF0 ); val = ( ( val >> 4 ) & 0x0F ) | ( ( val << 4 ) & 0xF0 );
*buf = (unsigned char)val; *buf = (unsigned char)val;
} }
} }

8
src/pfr/pfrcmap.c
View File

@ -16,7 +16,7 @@
/***************************************************************************/ /***************************************************************************/
#include "pfrcmap.h" #include "pfrcmap.h"
#include "pfrobjs.h" #include "pfrobjs.h"
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
@ -29,12 +29,12 @@
cmap->num_chars = face->phy_font.num_chars; cmap->num_chars = face->phy_font.num_chars;
cmap->chars = face->phy_font.chars; cmap->chars = face->phy_font.chars;
/* just for safety, check that the character entries are correctly */ /* just for safety, check that the character entries are correctly */
/* sorted in increasing character code order */ /* sorted in increasing character code order */
{ {
FT_UInt n; FT_UInt n;
for ( n = 1; n < cmap->num_chars; n++ ) for ( n = 1; n < cmap->num_chars; n++ )
{ {
@ -42,7 +42,7 @@
FT_ASSERT( 0 ); FT_ASSERT( 0 );
} }
} }
return 0; return 0;
} }

2
src/pfr/pfrcmap.h
View File

@ -31,7 +31,7 @@ FT_BEGIN_HEADER
FT_CMapRec cmap; FT_CMapRec cmap;
FT_UInt num_chars; FT_UInt num_chars;
PFR_Char chars; PFR_Char chars;
} PFR_CMapRec, *PFR_CMap; } PFR_CMapRec, *PFR_CMap;

8
src/pfr/pfrload.h
View File

@ -54,11 +54,11 @@ FT_BEGIN_HEADER
{ {
FT_UInt type; FT_UInt type;
PFR_ExtraItem_ParseFunc parser; PFR_ExtraItem_ParseFunc parser;
} PFR_ExtraItemRec; } PFR_ExtraItemRec;
typedef const struct PFR_ExtraItemRec_* PFR_ExtraItem; typedef const struct PFR_ExtraItemRec_* PFR_ExtraItem;
FT_LOCAL( FT_Error ) FT_LOCAL( FT_Error )
pfr_extra_items_skip( FT_Byte* *pp, pfr_extra_items_skip( FT_Byte* *pp,
@ -109,7 +109,7 @@ FT_BEGIN_HEADER
FT_Memory memory ); FT_Memory memory );
/* */ /* */
FT_END_HEADER FT_END_HEADER
#endif /* __PFRLOAD_H__ */ #endif /* __PFRLOAD_H__ */

2
src/psaux/Jamfile
View File

@ -17,7 +17,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) psaux ;
if $(FT2_MULTI) if $(FT2_MULTI)
{ {
_sources = psauxmod psobjs t1decode t1cmap _sources = psauxmod psobjs t1decode t1cmap
psconv afmparse psconv afmparse
; ;
} }
else else

6
src/psaux/psobjs.c
View File

@ -588,7 +588,7 @@
"current token is `%c', which is self-delimiting " "current token is `%c', which is self-delimiting "
"but invalid at this point\n", "but invalid at this point\n",
*cur )); *cur ));
error = PSaux_Err_Invalid_File_Format; error = PSaux_Err_Invalid_File_Format;
} }
@ -1282,8 +1282,8 @@
{ {
FT_Error error = PSaux_Err_Ok; FT_Error error = PSaux_Err_Ok;
FT_Byte* cur; FT_Byte* cur;
ps_parser_skip_spaces( parser ); ps_parser_skip_spaces( parser );
cur = parser->cursor; cur = parser->cursor;

30
src/sfnt/sfdriver.c
View File

@ -412,9 +412,9 @@
{ {
FT_UNUSED( face ); FT_UNUSED( face );
FT_UNUSED( stream ); FT_UNUSED( stream );
return FT_Err_Unimplemented_Feature; return FT_Err_Unimplemented_Feature;
} }
FT_CALLBACK_DEF( void ) FT_CALLBACK_DEF( void )
@ -449,8 +449,8 @@
*astrike_index = 0x7FFFFFFFUL; *astrike_index = 0x7FFFFFFFUL;
return tt_face_set_sbit_strike( face, &req, astrike_index ); return tt_face_set_sbit_strike( face, &req, astrike_index );
} }
FT_CALLBACK_DEF( FT_Error ) FT_CALLBACK_DEF( FT_Error )
@ -459,15 +459,15 @@
{ {
FT_UNUSED( face ); FT_UNUSED( face );
FT_UNUSED( stream ); FT_UNUSED( stream );
/* /*
* This function was originally implemented to load the sbit table. * This function was originally implemented to load the sbit table.
* However, it has been replaced by `tt_face_load_eblc', and this stub * However, it has been replaced by `tt_face_load_eblc', and this stub
* is only there for some rogue clients which would want to call it * is only there for some rogue clients which would want to call it
* directly (which doesn't make much sense). * directly (which doesn't make much sense).
*/ */
return FT_Err_Unimplemented_Feature; return FT_Err_Unimplemented_Feature;
} }
FT_CALLBACK_DEF( void ) FT_CALLBACK_DEF( void )
@ -476,8 +476,8 @@
/* nothing to do in this stub */ /* nothing to do in this stub */
FT_UNUSED( face ); FT_UNUSED( face );
} }
FT_CALLBACK_DEF( FT_Error ) FT_CALLBACK_DEF( FT_Error )
tt_face_load_charmap_stub( TT_Face face, tt_face_load_charmap_stub( TT_Face face,
void* cmap, void* cmap,
@ -486,9 +486,9 @@
FT_UNUSED( face ); FT_UNUSED( face );
FT_UNUSED( cmap ); FT_UNUSED( cmap );
FT_UNUSED( input ); FT_UNUSED( input );
return FT_Err_Unimplemented_Feature; return FT_Err_Unimplemented_Feature;
} }
FT_CALLBACK_DEF( FT_Error ) FT_CALLBACK_DEF( FT_Error )
@ -497,10 +497,10 @@
{ {
FT_UNUSED( face ); FT_UNUSED( face );
FT_UNUSED( cmap ); FT_UNUSED( cmap );
return 0; return 0;
} }
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
@ -600,7 +600,7 @@
0, 0,
0, 0,
0, 0,
#endif #endif
tt_face_get_metrics tt_face_get_metrics
}; };

6
src/sfnt/ttcmap.c
View File

@ -708,7 +708,7 @@
tt_cmap4_next( TT_CMap4 cmap ) tt_cmap4_next( TT_CMap4 cmap )
{ {
FT_UInt charcode; FT_UInt charcode;
if ( cmap->cur_charcode >= 0xFFFFUL ) if ( cmap->cur_charcode >= 0xFFFFUL )
goto Fail; goto Fail;
@ -984,7 +984,7 @@
for ( ; charcode <= 0xFFFFU; charcode++ ) for ( ; charcode <= 0xFFFFU; charcode++ )
{ {
FT_Byte* q; FT_Byte* q;
p = cmap->data + 14; /* ends table */ p = cmap->data + 14; /* ends table */
q = cmap->data + 16 + num_segs2; /* starts table */ q = cmap->data + 16 + num_segs2; /* starts table */
@ -1040,7 +1040,7 @@
FT_UInt charcode = *pcharcode; FT_UInt charcode = *pcharcode;
FT_UInt gindex = 0; FT_UInt gindex = 0;
FT_Byte* p; FT_Byte* p;
p = cmap->data + 6; p = cmap->data + 6;
num_segs2 = FT_PAD_FLOOR( TT_PEEK_USHORT( p ), 2 ); num_segs2 = FT_PAD_FLOOR( TT_PEEK_USHORT( p ), 2 );

2
src/sfnt/ttsbit0.c
View File

@ -183,7 +183,7 @@
FT_Size_Metrics* metrics ) FT_Size_Metrics* metrics )
{ {
FT_Byte* strike; FT_Byte* strike;
if ( strike_index >= (FT_ULong)face->sbit_num_strikes ) if ( strike_index >= (FT_ULong)face->sbit_num_strikes )
return SFNT_Err_Invalid_Argument; return SFNT_Err_Invalid_Argument;

2
src/tools/cordic.py
View File

@ -76,4 +76,4 @@ print "shrink factor = " + repr( shrink )
print "shrink factor 2 = " + repr( shrink * (2.0**32) ) print "shrink factor 2 = " + repr( shrink * (2.0**32) )
print "expansion factor = " + repr(1/shrink) print "expansion factor = " + repr(1/shrink)
print "" print ""

8
src/tools/docmaker/docbeauty.py
View File

@ -28,15 +28,15 @@ def beautify_block( block ):
for markup in markups: for markup in markups:
text.extend( markup.beautify( first ) ) text.extend( markup.beautify( first ) )
first = 0 first = 0
# now beautify the documentation "borders" themselves # now beautify the documentation "borders" themselves
lines = [ " /*************************************************************************" ] lines = [ " /*************************************************************************" ]
for l in text: for l in text:
lines.append( " *" + l ) lines.append( " *" + l )
lines.append( " */" ) lines.append( " */" )
block.lines = lines block.lines = lines
def usage(): def usage():
print "\nDocBeauty 0.1 Usage information\n" print "\nDocBeauty 0.1 Usage information\n"
@ -46,7 +46,7 @@ def usage():
print " -b : backup original files with the 'orig' extension" print " -b : backup original files with the 'orig' extension"
print "" print ""
print " --backup : same as -b" print " --backup : same as -b"
def main( argv ): def main( argv ):
"""main program loop""" """main program loop"""

4
src/tools/docmaker/docmaker.py
View File

@ -36,7 +36,7 @@ def usage():
print " --title : same as -t, as in '--title=\"My Project\"'" print " --title : same as -t, as in '--title=\"My Project\"'"
print " --output : same as -o, as in '--output=mydir'" print " --output : same as -o, as in '--output=mydir'"
print " --prefix : same as -p, as in '--prefix=ft2'" print " --prefix : same as -p, as in '--prefix=ft2'"
def main( argv ): def main( argv ):
"""main program loop""" """main program loop"""
@ -87,7 +87,7 @@ def main( argv ):
for filename in file_list: for filename in file_list:
source_processor.parse_file( filename ) source_processor.parse_file( filename )
content_processor.parse_sources( source_processor ) content_processor.parse_sources( source_processor )
# process sections # process sections
content_processor.finish() content_processor.finish()

54
src/tools/docmaker/formatter.py
View File

@ -26,7 +26,7 @@ class Formatter:
for section in self.sections: for section in self.sections:
for block in section.blocks.values(): for block in section.blocks.values():
self.add_identifier( block.name, block ) self.add_identifier( block.name, block )
# add enumeration values to the index, since this is useful # add enumeration values to the index, since this is useful
for markup in block.markups: for markup in block.markups:
if markup.tag == 'values': if markup.tag == 'values':
@ -47,7 +47,7 @@ class Formatter:
self.identifiers[ name ].location() + "\n" ) self.identifiers[ name ].location() + "\n" )
else: else:
self.identifiers[name] = block self.identifiers[name] = block
# #
# Formatting the table of contents # Formatting the table of contents
@ -55,50 +55,50 @@ class Formatter:
def toc_enter( self ): def toc_enter( self ):
pass pass
def toc_chapter_enter( self, chapter ): def toc_chapter_enter( self, chapter ):
pass pass
def toc_section_enter( self, section ): def toc_section_enter( self, section ):
pass pass
def toc_section_exit( self, section ): def toc_section_exit( self, section ):
pass pass
def toc_chapter_exit( self, chapter ): def toc_chapter_exit( self, chapter ):
pass pass
def toc_index( self, index_filename ): def toc_index( self, index_filename ):
pass pass
def toc_exit( self ): def toc_exit( self ):
pass pass
def toc_dump( self, toc_filename = None, index_filename = None ): def toc_dump( self, toc_filename = None, index_filename = None ):
output = None output = None
if toc_filename: if toc_filename:
output = open_output( toc_filename ) output = open_output( toc_filename )
self.toc_enter() self.toc_enter()
for chap in self.processor.chapters: for chap in self.processor.chapters:
self.toc_chapter_enter( chap ) self.toc_chapter_enter( chap )
for section in chap.sections: for section in chap.sections:
self.toc_section_enter( section ) self.toc_section_enter( section )
self.toc_section_exit( section ) self.toc_section_exit( section )
self.toc_chapter_exit ( chap ) self.toc_chapter_exit ( chap )
self.toc_index( index_filename ) self.toc_index( index_filename )
self.toc_exit() self.toc_exit()
if output: if output:
close_output( output ) close_output( output )
# #
# Formatting the index # Formatting the index
# #
@ -116,7 +116,7 @@ class Formatter:
pass pass
def index_dump( self, index_filename = None ): def index_dump( self, index_filename = None ):
output = None output = None
if index_filename: if index_filename:
output = open_output( index_filename ) output = open_output( index_filename )
@ -128,31 +128,31 @@ class Formatter:
self.index_name_exit ( name ) self.index_name_exit ( name )
self.index_exit() self.index_exit()
if output: if output:
close_output( output ) close_output( output )
# #
# Formatting a section # Formatting a section
# #
def section_enter( self, section ): def section_enter( self, section ):
pass pass
def block_enter( self, block ): def block_enter( self, block ):
pass pass
def markup_enter( self, markup, block = None ): def markup_enter( self, markup, block = None ):
pass pass
def field_enter( self, field, markup = None, block = None ): def field_enter( self, field, markup = None, block = None ):
pass pass
def field_exit( self, field, markup = None, block = None ): def field_exit( self, field, markup = None, block = None ):
pass pass
def markup_exit( self, markup, block = None ): def markup_exit( self, markup, block = None ):
pass pass
def block_exit( self, block ): def block_exit( self, block ):
pass pass
@ -161,11 +161,11 @@ class Formatter:
def section_dump( self, section, section_filename = None ): def section_dump( self, section, section_filename = None ):
output = None output = None
if section_filename: if section_filename:
output = open_output( section_filename ) output = open_output( section_filename )
self.section_enter( section ) self.section_enter( section )
for name in section.block_names: for name in section.block_names:

4
src/tools/docmaker/utils.py
View File

@ -115,7 +115,7 @@ def make_file_list( args = None ):
# of the order of files # of the order of files
else: else:
newpath = [pathname] newpath = [pathname]
file_list.extend( newpath ) file_list.extend( newpath )
if len( file_list ) == 0: if len( file_list ) == 0:
@ -123,6 +123,6 @@ def make_file_list( args = None ):
else: else:
# now filter the file list to remove non-existing ones # now filter the file list to remove non-existing ones
file_list = filter( file_exists, file_list ) file_list = filter( file_exists, file_list )
return file_list return file_list

2
src/tools/test_afm.c
View File

@ -52,7 +52,7 @@
{ {
AFM_KernPair kp = fi->KernPairs + i; AFM_KernPair kp = fi->KernPairs + i;
printf( "\t%3d + %3d => (%4d, %4d)\n", kp->index1, printf( "\t%3d + %3d => (%4d, %4d)\n", kp->index1,
kp->index2, kp->index2,
kp->x, kp->x,

4
src/truetype/ttgxvar.h
View File

@ -32,7 +32,7 @@ FT_BEGIN_HEADER
/* <Struct> */ /* <Struct> */
/* GX_AVarCorrespondenceRec */ /* GX_AVarCorrespondenceRec */
/* */ /* */
/* <Description> */ /* <Description> */
/* A data structure representing `shortFracCorrespondence' in `avar' */ /* A data structure representing `shortFracCorrespondence' in `avar' */
/* table according to the specifications from Apple. */ /* table according to the specifications from Apple. */
/* */ /* */
@ -94,7 +94,7 @@ FT_BEGIN_HEADER
FT_UInt gv_glyphcnt; FT_UInt gv_glyphcnt;
FT_ULong* glyphoffsets; FT_ULong* glyphoffsets;
} GX_BlendRec; } GX_BlendRec;

2
src/type1/t1objs.h
View File

@ -152,7 +152,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error ) FT_LOCAL( FT_Error )
T1_GlyphSlot_Init( T1_GlyphSlot slot ); T1_GlyphSlot_Init( T1_GlyphSlot slot );
FT_LOCAL( void ) FT_LOCAL( void )
T1_GlyphSlot_Done( T1_GlyphSlot slot ); T1_GlyphSlot_Done( T1_GlyphSlot slot );

8
src/type1/t1parse.c
View File

@ -105,18 +105,18 @@
if ( FT_STREAM_SEEK( 0 ) ) if ( FT_STREAM_SEEK( 0 ) )
goto Exit; goto Exit;
error = read_pfb_tag( stream, &tag, &size ); error = read_pfb_tag( stream, &tag, &size );
if ( error ) if ( error )
goto Exit; goto Exit;
if ( tag != 0x8001U && FT_STREAM_SEEK( 0 ) ) if ( tag != 0x8001U && FT_STREAM_SEEK( 0 ) )
goto Exit; goto Exit;
if ( !FT_FRAME_ENTER( header_length ) ) if ( !FT_FRAME_ENTER( header_length ) )
{ {
error = 0; error = 0;
if ( ft_memcmp( stream->cursor, header_string, header_length ) != 0 ) if ( ft_memcmp( stream->cursor, header_string, header_length ) != 0 )
error = T1_Err_Unknown_File_Format; error = T1_Err_Unknown_File_Format;