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

* src/cff/cffgload.c (CFF_Parse_CharStrings): s/rand/Rand/ to avoid 

compiler warning.

formatting/fixing ChangeLog
This commit is contained in:
Werner Lemberg 2002-04-14 00:54:32 +00:00
parent 737fa9acf7
commit 94ffae5239
18 changed files with 235 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
ChangeLog
View File

@ -1,74 +1,78 @@
2002-04-13 Werner LEMBERG <wl@gnu.org>
* src/cff/cffgload.c (CFF_Parse_CharStrings): s/rand/Rand/ to avoid
compiler warning.
2002-04-12 David Turner <david@freetype.org> 2002-04-12 David Turner <david@freetype.org>
* builds/unix/ftconfig.in, builds/vms/ftconfig.h: Oops, forgot to * README.UNX: Updated the Unix-specific quick-compilation guide to
update these files too warn about the GNU Make requirement at compile time.
* README.UNX: updated the Unix-specific quick-compilation guide to * include/freetype/config/ftstdlib.h,
warn about the GNU Make requirement at compile time.. include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
* include/freetype/config/ftstdlib.h, src/autohint/ahoptim.c,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c, src/base/ftdbgmem.c, src/base/ftdebug.c, src/base/ftmac.c,
src/base/ftobjs.c, src/base/ftsystem.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc... src/cache/ftcimage.c, src/cache/ftcsbits.c,
from the engine's sources where they're not needed..
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c,
builds/unix/ftconfig.in, builds/vms/ftconfig.h,
builds/amiga/src/base/ftdebug.c:
Added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc.).
This eases the porting of FreeType 2 to environments like
XFree86 modules/extensions.
Also removed many #include <string.h>, #include <stdlib.h>, etc.
from the engine's sources where they are not needed.
* src/sfnt/ttpost.c: Use macro name for psnames.h.
2002-04-12 Vincent Caron <v.caron@zerodeux.net> 2002-04-12 Vincent Caron <v.caron@zerodeux.net>
* configure, builds/detect.mk: updated the build system to print * configure, builds/detect.mk: Updated the build system to print
a warning message in case GNU Make isn't used to build the library. a warning message in case GNU Make isn't used to build the library.
Very nice !
2002-04-11 David Turner <david@freetype.org> 2002-04-11 David Turner <david@freetype.org>
* README, docs/CHANGES, Jamfile.in: updating for the 2.1.0 release * README, docs/CHANGES, Jamfile.in: Updates for the 2.1.0 release.
* docs/FTL.txt: updated license text to provide a preffered disclaimer * docs/FTL.txt: Updated license text to provide a preferred
and adjust copyright dates/extents disclaimer and adjust copyright dates/extents.
* include/freetype/cache/ftcglyph.h: removing obsolete (and confusing * include/freetype/cache/ftcglyph.h: Removing obsolete (and
comment) confusing) comment.
* Jamfile.in: New file. * Jamfile.in: New file.

97
README.UNX
View File

@ -8,22 +8,22 @@ SPECIAL NOTE FOR UNIX USERS
I. Enable the TrueType bytecode hinter if you need it: I. Enable the TrueType bytecode hinter if you need it
------------------------------------------------------ -----------------------------------------------------
The TrueType bytecode interpreter is disabled in all public The TrueType bytecode interpreter is disabled in all public
releases of the FreeType packages for patents reasons (see releases of the FreeType packages for patents reasons (see
http://www.freetype.org/patents.html for more details). http://www.freetype.org/patents.html for more details).
However, many Linux distributions do enable the interpreter in the However, many Linux distributions do enable the interpreter in the
FreeType packages (DEB/RPM/etc.) they produce for their platforms. FreeType packages (DEB/RPM/etc.) they produce for their platforms.
If you are using TrueType fonts on your system, you most probably If you are using TrueType fonts on your system, you most probably
want to enable it manually by doing the following: want to enable it manually by doing the following:
- open the file "include/freetype/config/ftoption.h" - open the file "include/freetype/config/ftoption.h"
- locate a line that says: - locate a line that says:
#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER #undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- change it to: - change it to:
@ -34,100 +34,99 @@ SPECIAL NOTE FOR UNIX USERS
II. Determine the correct installation path: II. Determine the correct installation path
-------------------------------------------- --------------------------------------------
By default, the source package will install the library in By default, the source package will install the library in
"/usr/local". However, many Unix distributions now install the "/usr/local". However, many Unix distributions now install the
library in "/usr", since FreeType is becoming a critical system library in "/usr", since FreeType is becoming a critical system
component. component.
If FreeType is already installed on your system, type If FreeType is already installed on your system, type
freetype-config --prefix freetype-config --prefix
on the command line. This should return the installation path to on the command line. This should return the installation path to
use below (e.g. "/usr" or "/usr/local"). Otherwise, simply use use below (e.g. "/usr" or "/usr/local"). Otherwise, simply use
"/usr" (or what you think is adequate for your installation). "/usr" (or what you think is adequate for your installation).
III. Ensure that you're using GNU Make: III. Ensure that you are using GNU Make
--------------------------------------- ---------------------------------------
The FreeType build system _exclusively_ works with GNU Make. You will The FreeType build system _exclusively_ works with GNU Make. You
not be able to compile the library with the following instructions with will not be able to compile the library with the instructions
any other alternative (including BSD Make !!). below using any other alternative (including BSD Make).
Trying to compile the library with a different Make tool will print a Trying to compile the library with a different Make tool will
message like: print a message like:
"Sorry, GNU make is required to build FreeType2." Sorry, GNU make is required to build FreeType2.
and the build will be aborted. If this happens, install GNU Make on your and the build process will be aborted. If this happens, install
system, and use the GNUMAKE environment variable to name it. GNU Make on your system, and use the GNUMAKE environment variable
to name it.
IV. Build and install the library:
---------------------------------- IV. Build and install the library
---------------------------------
The following should work on all Unix systems where the 'make' command
invokes GNU Make: The following should work on all Unix systems where the `make'
command invokes GNU Make:
./configure --prefix=<yourprefix> ./configure --prefix=<yourprefix>
make make
make install (as root) make install (as root)
where "<yourprefix>" must be replaced by the prefix returned by where "<yourprefix>" must be replaced by the prefix returned by
the "freetype-config" command. the "freetype-config" command.
When using a different command to invoke GNU Make, use the GNUMAKE When using a different command to invoke GNU Make, use the GNUMAKE
variable. For example, if 'gmake' is the command to use on your system, variable. For example, if `gmake' is the command to use on your
do something like: system, do something like:
GNUMAKE=gmake ./configure --prefix=<yourprefix> GNUMAKE=gmake ./configure --prefix=<yourprefix>
gmake gmake
gmake install (as root) gmake install (as root)
If this still doesn't work, read the detailed compilation
procedure available in the file "docs/BUILD" for troubleshooting.
If this still doesn't work, read the detailed compilation procedure V. Take care of XFree86 version 4
available in the file "docs/BUILD" for troubleshooting.. ---------------------------------
V. Take care of XFree86 version 4:
----------------------------------
Certain recent Linux distributions will install _several_ versions Certain recent Linux distributions will install _several_ versions
of FreeType on your system. For example, on a fresh Mandrake 8.1 of FreeType on your system. For example, on a fresh Mandrake 8.1
system, you can find the following files: system, you can find the following files:
/usr/lib/libfreetype.so which links to /usr/lib/libfreetype.so which links to
/usr/lib/libfreetype.6.1.0.so /usr/lib/libfreetype.6.1.0.so
and and
/usr/X11R6/lib/libfreetype.so which links to /usr/X11R6/lib/libfreetype.so which links to
/usr/X11R6/lib/libfreetype.6.0.so /usr/X11R6/lib/libfreetype.6.0.so
Note that these files correspond to two distinct versions of the Note that these files correspond to two distinct versions of the
library! It seems that this surprising issue is due to the library! It seems that this surprising issue is due to the
install scripts of recent XFree86 servers (from 4.1.0) which install scripts of recent XFree86 servers (from 4.1.0) which
irremediably install their own (dated) version of the library in irremediably install their own (dated) version of the library in
"/usr/X11R6/lib". "/usr/X11R6/lib".
In certain _rare_ cases you may experience minor problems if you In certain _rare_ cases you may experience minor problems if you
install this release of the library in "/usr" only, namely, that install this release of the library in "/usr" only, namely, that
certain applications will not benefit from the bug fixes and certain applications will not benefit from the bug fixes and
rendering improvements you'd expect. rendering improvements you'd expect.
There are two good ways to deal with this situation: There are two good ways to deal with this situation:
- Install the library _twice_, in "/usr" and in "/usr/X11R6" - Install the library _twice_, in "/usr" and in "/usr/X11R6"
(you have to do that each time you install a new FreeType (you have to do that each time you install a new FreeType
release though). release though).
- Change the link in /usr/X11R6/lib/libfreetype.so to point to - Change the link in /usr/X11R6/lib/libfreetype.so to point to
/usr/lib/libfreetype.so, /usr/lib/libfreetype.so,

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

@ -38,7 +38,7 @@ extern void __stdargs KVPrintF( const char *formatString, const void *values );
/* */ /* */
/* - release mode: */ /* - release mode: */
/* */ /* */
/* No error message is sent or generated. The code is ft_free from any */ /* No error message is sent or generated. The code is free from any */
/* debugging parts. */ /* debugging parts. */
/* */ /* */
/*************************************************************************/ /*************************************************************************/

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

@ -122,7 +122,6 @@
#endif #endif
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* @macro: */ /* @macro: */

164
include/freetype/config/ftstdlib.h
View File

@ -2,9 +2,10 @@
/* */ /* */
/* ftstdlib.h */ /* ftstdlib.h */
/* */ /* */
/* ANSI-specific configuration file */ /* ANSI-specific library and header configuration file (specification */
/* only). */
/* */ /* */
/* Copyright 1996-2001, 2002 by */ /* Copyright 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -13,104 +14,113 @@
/* this file you indicate that you have read the license and */ /* this file you indicate that you have read the license and */
/* understand and accept it fully. */ /* understand and accept it fully. */
/* */ /* */
/* */
/* This file is used to group all #includes to the ANSI C library */
/* that FreeType normally requires. It also defines macros to rename */
/* the standard functions within the FT source code */
/* */
/* (You're free to provide alternative when working in exotic */
/* runtime environments :-) */
/* */
/***************************************************************************/ /***************************************************************************/
#ifndef __FT_STANDARD_LIBRARY_H__
#define __FT_STANDARD_LIBRARY_H__ /*************************************************************************/
/* */
/* This file is used to group all #includes to the ANSI C library that */
/* FreeType normally requires. It also defines macros to rename the */
/* standard functions within the FreeType source code. */
/* */
/* Load a file which defines __FTSTDLIB_H__ before this one to override */
/* it. */
/* */
/*************************************************************************/
/************************************************************************/ #ifndef __FTSTDLIB_H__
/* */ #define __FTSTDLIB_H__
/* integer limits */
/* */
/* UINT_MAX and ULONG_MAX are used to automatically compute the size */ /**********************************************************************/
/* of 'int' and 'long' in bytes at compile-time. So far, this works */ /* */
/* for all platforms the library has been tested on. */ /* integer limits */
/* */ /* */
/* Note that on the extremely rare platforms that do not provide */ /* UINT_MAX and ULONG_MAX are used to automatically compute the size */
/* integer types that are _exactly_ 16 and 32 bits wide (e.g. some */ /* of `int' and `long' in bytes at compile-time. So far, this works */
/* old Crays where 'int' is 36 bits !!), we do not make any guarantee */ /* for all platforms the library has been tested on. */
/* about the correct behaviour of FT2 with all fonts.. */ /* */
/* */ /* Note that on the extremely rare platforms that do not provide */
/* in these case, "ftconfig.h" will refuse to compile anyway with a */ /* integer types that are _exactly_ 16 and 32 bits wide (e.g. some */
/* message like "couldn't find 32-bit type" or something similar */ /* old Crays where `int' is 36 bits), we do not make any guarantee */
/* anyway.. */ /* about the correct behaviour of FT2 with all fonts. */
/* */ /* */
/* */ /* In these case, "ftconfig.h" will refuse to compile anyway with a */
/* IMPORTANT NOTE: We do not define aliases for heap management and */ /* message like "couldn't find 32-bit type" or something similar. */
/* i/o routines (i.e. malloc/free/fopen/fread/...) */ /* */
/* since these functions should all be encapsulated */ /* IMPORTANT NOTE: We do not define aliases for heap management and */
/* by platform-specific implementations of */ /* i/o routines (i.e. malloc/free/fopen/fread/...) */
/* "ftsystem.c" anyway !! */ /* since these functions should all be encapsulated */
/* */ /* by platform-specific implementations of */
/************************************************************************/ /* "ftsystem.c". */
/* */
/**********************************************************************/
#include <limits.h> #include <limits.h>
#define FT_UINT_MAX UINT_MAX #define FT_UINT_MAX UINT_MAX
#define FT_ULONG_MAX ULONG_MAX #define FT_ULONG_MAX ULONG_MAX
/************************************************************************/ /**********************************************************************/
/* */ /* */
/* character and string processing */ /* character and string processing */
/* */ /* */
/************************************************************************/ /**********************************************************************/
#include <ctype.h> #include <ctype.h>
#define ft_isalnum isalnum #define ft_isalnum isalnum
#define ft_isupper isupper #define ft_isupper isupper
#define ft_islower islower #define ft_islower islower
#include <string.h> #include <string.h>
#define ft_strlen strlen #define ft_strlen strlen
#define ft_strcmp strcmp #define ft_strcmp strcmp
#define ft_strncmp strncmp #define ft_strncmp strncmp
#define ft_memcpy memcpy #define ft_memcpy memcpy
#define ft_strcpy strcpy #define ft_strcpy strcpy
#define ft_strncpy strncpy #define ft_strncpy strncpy
#define ft_memset memset #define ft_memset memset
#define ft_memmove memmove #define ft_memmove memmove
/************************************************************************/ /**********************************************************************/
/* */ /* */
/* sorting */ /* sorting */
/* */ /* */
/************************************************************************/ /**********************************************************************/
#include <stdlib.h> /* for qsort() */
#define ft_qsort qsort
/************************************************************************/ #include <stdlib.h>
/* */ #define ft_qsort qsort
/* execution control */
/* */
/************************************************************************/ /**********************************************************************/
/* */
/* execution control */
/* */
/**********************************************************************/
#include <setjmp.h> #include <setjmp.h>
#define ft_jmp_buf jmp_buf /* note: this cannot be a typedef since */ #define ft_jmp_buf jmp_buf /* note: this cannot be a typedef since */
/* jmp_buf is defined as a macro */ /* jmp_buf is defined as a macro */
/* on certain platforms.. */ /* on certain platforms */
#define ft_setjmp setjmp /* same thing here */ #define ft_setjmp setjmp /* same thing here */
#define ft_longjmp longjmp /* " */ #define ft_longjmp longjmp /* " */
/* the following is only used for debugging purposes, i.e. when */ /* the following is only used for debugging purposes, i.e. when */
/* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined */ /* FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined */
/* */ /* */
#include <stdarg.h> #include <stdarg.h>
#endif /* __FT_STANDARD_LIBRARY_H__ */ #endif /* __FTSTDLIB_H__ */
/* END */

10
include/freetype/internal/ftobjs.h
View File

@ -127,12 +127,12 @@ FT_BEGIN_HEADER
/* validator structure */ /* validator structure */
typedef struct FT_ValidatorRec_ typedef struct FT_ValidatorRec_
{ {
const FT_Byte* base; /* address of table in memory */ const FT_Byte* base; /* address of table in memory */
const FT_Byte* limit; /* `base' + sizeof(table) in memory */ const FT_Byte* limit; /* `base' + sizeof(table) in memory */
FT_ValidationLevel level; /* validation level */ FT_ValidationLevel level; /* validation level */
FT_Error error; /* error returned. 0 means success */ FT_Error error; /* error returned. 0 means success */
ft_jmp_buf jump_buffer; /* used for exception handling */ ft_jmp_buf jump_buffer; /* used for exception handling */
} FT_ValidatorRec; } FT_ValidatorRec;

10
src/cff/cffgload.c
View File

@ -1724,16 +1724,16 @@
case cff_op_random: case cff_op_random:
{ {
FT_Fixed rand; FT_Fixed Rand;
FT_TRACE4(( " rand" )); FT_TRACE4(( " rand" ));
rand = seed; Rand = seed;
if ( rand >= 0x8000 ) if ( Rand >= 0x8000 )
rand++; Rand++;
args[0] = rand; args[0] = Rand;
seed = FT_MulFix( seed, 0x10000L - seed ); seed = FT_MulFix( seed, 0x10000L - seed );
if ( seed == 0 ) if ( seed == 0 )
seed += 0x2873; seed += 0x2873;

4
src/cid/cidload.c
View File

@ -283,8 +283,8 @@
is_alpha( char c ) is_alpha( char c )
{ {
return ( ft_isalnum( (int)c ) || return ( ft_isalnum( (int)c ) ||
c == '.' || c == '.' ||
c == '_' ); c == '_' );
} }

2
src/cid/cidparse.c
View File

@ -72,7 +72,7 @@
goto Exit; goto Exit;
if ( ft_strncmp( (char *)stream->cursor, if ( ft_strncmp( (char *)stream->cursor,
"%!PS-Adobe-3.0 Resource-CIDFont", 31 ) ) "%!PS-Adobe-3.0 Resource-CIDFont", 31 ) )
{ {
FT_TRACE2(( "[not a valid CID-keyed font]\n" )); FT_TRACE2(( "[not a valid CID-keyed font]\n" ));
error = CID_Err_Unknown_File_Format; error = CID_Err_Unknown_File_Format;

6
src/pcf/pcfdriver.c
View File

@ -315,9 +315,9 @@ THE SOFTWARE.
if ( ( charset_registry != NULL ) && if ( ( charset_registry != NULL ) &&
( charset_encoding != NULL ) ) ( charset_encoding != NULL ) )
{ {
if ( !ft_strcmp( face->charset_registry, "ISO10646" ) || if ( !ft_strcmp( face->charset_registry, "ISO10646" ) ||
( !ft_strcmp( face->charset_registry, "ISO8859" ) && ( !ft_strcmp( face->charset_registry, "ISO8859" ) &&
!ft_strcmp( face->charset_encoding, "1" ) ) ) !ft_strcmp( face->charset_encoding, "1" ) ) )
unicode_charmap = 1; unicode_charmap = 1;
} }

10
src/psaux/t1cmap.c
View File

@ -80,8 +80,8 @@
const char* gname = cmap->glyph_names[n]; const char* gname = cmap->glyph_names[n];
if ( gname && gname[0] == glyph_name[0] && if ( gname && gname[0] == glyph_name[0] &&
ft_strcmp( gname, glyph_name ) == 0 ) ft_strcmp( gname, glyph_name ) == 0 )
{ {
result = n; result = n;
break; break;
@ -337,9 +337,9 @@
/* sort the pairs table to allow efficient binary searches */ /* sort the pairs table to allow efficient binary searches */
ft_qsort( cmap->pairs, ft_qsort( cmap->pairs,
new_count, new_count,
sizeof ( T1_CMapUniPairRec ), sizeof ( T1_CMapUniPairRec ),
t1_cmap_uni_pair_compare ); t1_cmap_uni_pair_compare );
cmap->num_pairs = new_count; cmap->num_pairs = new_count;
} }

2
src/psaux/t1decode.c
View File

@ -142,7 +142,7 @@
FT_String* name = (FT_String*)decoder->glyph_names[n]; FT_String* name = (FT_String*)decoder->glyph_names[n];
if ( name && name[0] == glyph_name[0] && if ( name && name[0] == glyph_name[0] &&
ft_strcmp( name,glyph_name ) == 0 ) ft_strcmp( name,glyph_name ) == 0 )
return n; return n;
} }

2
src/raster/ftraster.c
View File

@ -2094,7 +2094,7 @@
{ {
target[0] |= f1; target[0] |= f1;
/* ft_memset() is slower than the following code on many platforms. */ /* memset() is slower than the following code on many platforms. */
/* This is due to the fact that, in the vast majority of cases, */ /* This is due to the fact that, in the vast majority of cases, */
/* the span length in bytes is relatively small. */ /* the span length in bytes is relatively small. */
c2--; c2--;

2
src/sfnt/ttload.c
View File

@ -1719,7 +1719,7 @@
if ( tt_kern_pair_compare( pair0, pair0 + 1 ) != -1 ) if ( tt_kern_pair_compare( pair0, pair0 + 1 ) != -1 )
{ {
ft_qsort( (void*)face->kern_pairs, (int)num_pairs, ft_qsort( (void*)face->kern_pairs, (int)num_pairs,
sizeof ( TT_Kern0_PairRec ), tt_kern_pair_compare ); sizeof ( TT_Kern0_PairRec ), tt_kern_pair_compare );
break; break;
} }
} }

11
src/smooth/ftgrays.c
View File

@ -99,17 +99,12 @@
#define ErrRaster_MemoryOverflow -4 #define ErrRaster_MemoryOverflow -4
#ifdef _STANDALONE_ #ifdef _STANDALONE_
#include <string.h> /* for ft_memcpy() */ #include <string.h> /* for ft_memcpy() */
#include <setjmp.h> #include <setjmp.h>
#include <limits.h> #include <limits.h>
#define FT_UINT_MAX UINT_MAX #define FT_UINT_MAX UINT_MAX
#define ErrRaster_Invalid_Mode -2 #define ErrRaster_Invalid_Mode -2
#define ErrRaster_Invalid_Outline -1 #define ErrRaster_Invalid_Outline -1
@ -312,7 +307,7 @@
int conic_level; int conic_level;
int cubic_level; int cubic_level;
void* memory; void* memory;
ft_jmp_buf jump_buffer; ft_jmp_buf jump_buffer;
#ifdef GRAYS_USE_GAMMA #ifdef GRAYS_USE_GAMMA
@ -1088,7 +1083,7 @@
#ifdef QUICK_SORT #ifdef QUICK_SORT
/* This is a non-recursive quicksort that directly process our cells */ /* This is a non-recursive quicksort that directly process our cells */
/* array. It should be faster than calling the stdlib ft_qsort(), and we */ /* array. It should be faster than calling the stdlib qsort(), and we */
/* can even tailor our insertion threshold... */ /* can even tailor our insertion threshold... */
#define QSORT_THRESHOLD 9 /* below this size, a sub-array will be sorted */ #define QSORT_THRESHOLD 9 /* below this size, a sub-array will be sorted */

6
src/type1/t1afm.c
View File

@ -46,8 +46,8 @@
#define IS_KERN_PAIR( p ) ( p[0] == 'K' && p[1] == 'P' ) #define IS_KERN_PAIR( p ) ( p[0] == 'K' && p[1] == 'P' )
#define IS_ALPHANUM( c ) ( ft_isalnum( c ) || \ #define IS_ALPHANUM( c ) ( ft_isalnum( c ) || \
c == '_' || \ c == '_' || \
c == '.' ) c == '.' )
/* read a glyph name and return the equivalent glyph index */ /* read a glyph name and return the equivalent glyph index */
@ -227,7 +227,7 @@
/* now, sort the kern pairs according to their glyph indices */ /* now, sort the kern pairs according to their glyph indices */
ft_qsort( afm->kern_pairs, count, sizeof ( T1_Kern_Pair ), ft_qsort( afm->kern_pairs, count, sizeof ( T1_Kern_Pair ),
compare_kern_pairs ); compare_kern_pairs );
Exit: Exit:
if ( error ) if ( error )

12
src/type1/t1load.c
View File

@ -1294,7 +1294,7 @@
/* record index of /.notdef */ /* record index of /.notdef */
if ( ft_strcmp( (const char*)".notdef", if ( ft_strcmp( (const char*)".notdef",
(const char*)(name_table->elements[n]) ) == 0 ) (const char*)(name_table->elements[n]) ) == 0 )
{ {
notdef_index = n; notdef_index = n;
notdef_found = 1; notdef_found = 1;
@ -1334,7 +1334,7 @@
/* if /.notdef is found but does not occupy index 0, do our magic. */ /* if /.notdef is found but does not occupy index 0, do our magic. */
if ( ft_strcmp( (const char*)".notdef", if ( ft_strcmp( (const char*)".notdef",
(const char*)name_table->elements[0] ) && (const char*)name_table->elements[0] ) &&
notdef_found ) notdef_found )
{ {
/* Swap glyph in index 0 with /.notdef glyph. First, add index 0 */ /* Swap glyph in index 0 with /.notdef glyph. First, add index 0 */
@ -1510,7 +1510,7 @@
cur2 = cur; cur2 = cur;
/* lookup the `known' keyword */ /* lookup the `known' keyword */
while ( cur < limit && *cur != 'k' && while ( cur < limit && *cur != 'k' &&
ft_strncmp( (char*)cur, "known", 5 ) ) ft_strncmp( (char*)cur, "known", 5 ) )
cur++; cur++;
@ -1559,7 +1559,7 @@
if ( !name ) if ( !name )
break; break;
if ( cur[0] == name[0] && if ( cur[0] == name[0] &&
len == (FT_Int)ft_strlen( (const char*)name ) ) len == (FT_Int)ft_strlen( (const char*)name ) )
{ {
FT_Int n; FT_Int n;
@ -1730,7 +1730,7 @@
{ {
glyph_name = (FT_Byte*)type1->glyph_names[idx]; glyph_name = (FT_Byte*)type1->glyph_names[idx];
if ( ft_strcmp( (const char*)char_name, if ( ft_strcmp( (const char*)char_name,
(const char*)glyph_name ) == 0 ) (const char*)glyph_name ) == 0 )
{ {
type1->encoding.char_index[charcode] = (FT_UShort)idx; type1->encoding.char_index[charcode] = (FT_UShort)idx;
type1->encoding.char_name [charcode] = (char*)glyph_name; type1->encoding.char_name [charcode] = (char*)glyph_name;
@ -1738,7 +1738,7 @@
/* Change min/max encoded char only if glyph name is */ /* Change min/max encoded char only if glyph name is */
/* not /.notdef */ /* not /.notdef */
if ( ft_strcmp( (const char*)".notdef", if ( ft_strcmp( (const char*)".notdef",
(const char*)glyph_name ) != 0 ) (const char*)glyph_name ) != 0 )
{ {
if (charcode < min_char) min_char = charcode; if (charcode < min_char) min_char = charcode;
if (charcode > max_char) max_char = charcode; if (charcode > max_char) max_char = charcode;

6
src/type1/t1parse.c
View File

@ -200,11 +200,11 @@
/* Now check font format; we must see `%!PS-AdobeFont-1' */ /* Now check font format; we must see `%!PS-AdobeFont-1' */
/* or `%!FontType' */ /* or `%!FontType' */
{ {
if ( size <= 16 || if ( size <= 16 ||
( ft_strncmp( (const char*)parser->base_dict, ( ft_strncmp( (const char*)parser->base_dict,
"%!PS-AdobeFont-1", 16 ) && "%!PS-AdobeFont-1", 16 ) &&
ft_strncmp( (const char*)parser->base_dict, ft_strncmp( (const char*)parser->base_dict,
"%!FontType", 10 ) ) ) "%!FontType", 10 ) ) )
{ {
FT_TRACE2(( "[not a Type1 font]\n" )); FT_TRACE2(( "[not a Type1 font]\n" ));
error = T1_Err_Unknown_File_Format; error = T1_Err_Unknown_File_Format;