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

* src/cid/cidparse.c (cid_parse_new): Remove shadowing variable. 

Formatting.
This commit is contained in:
Werner Lemberg 2006-02-09 07:38:57 +00:00
parent 4f41d63b02
commit 6be99f9104
3 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,12 +1,17 @@
2006-02-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-02-09 Werner Lemberg <wl@gnu.org>
* src/cid/cidparse.c: Fix for abnormally short or broken CIDFont. * src/cid/cidparse.c (cid_parse_new): Remove shadowing variable.
The issue was found by Taek Kwan(TK) Lee (See ft-devel 2005-11-02).
2006-02-08 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-02-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/unix/configure.ac: Fix bug for "--with-old-mac-fonts" * src/cid/cidparse.c (cid_parse_new): Fix for abnormally short or
option on UNIX platform. It has been broken since 2006-01-11. broken CIDFont. Reported by Taek Kwan(TK) Lee (see ft-devel
2005-11-02).
2006-02-08 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/unix/configure.ac: Fix bug for `--with-old-mac-fonts'
option on UNIX platform. It has been broken since 2006-01-11.
2006-02-01 Werner Lemberg <wl@gnu.org> 2006-02-01 Werner Lemberg <wl@gnu.org>
@ -664,7 +669,7 @@
* freetype/freetype.h: Updating the documentation for * freetype/freetype.h: Updating the documentation for
FT_LOAD_TARGET_XXX and FT_Render_Mode values. FT_LOAD_TARGET_XXX and FT_Render_Mode values.
2005-12-23 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2005-12-23 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/ftmac.c (FT_New_Face_From_Suitcase): Count scalable faces * src/base/ftmac.c (FT_New_Face_From_Suitcase): Count scalable faces
in supported formats (sfnt, LWFN) only, and ignore bitmap faces in in supported formats (sfnt, LWFN) only, and ignore bitmap faces in
@ -834,7 +839,7 @@
in the file cache was off by one byte which could cause false in the file cache was off by one byte which could cause false
errors in font files. errors in font files.
2005-11-24 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2005-11-24 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/mac/FreeType.m68k_far.make.txt, * builds/mac/FreeType.m68k_far.make.txt,
builds/mac/FreeType.m68k_cfm.make.txt, builds/mac/FreeType.m68k_cfm.make.txt,
@ -1451,7 +1456,7 @@
* src/autofit/aflatin.c (af_latin_metrics_scale): Initialize * src/autofit/aflatin.c (af_latin_metrics_scale): Initialize
render mode properly. Reported by chris@dokein.co.uk. render mode properly. Reported by chris@dokein.co.uk.
2005-08-23 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2005-08-23 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Add gxvalid module to validate TrueType GX/AAT tables. Add gxvalid module to validate TrueType GX/AAT tables.

85
builds/unix/configure.ac
View File

@ -144,13 +144,12 @@ if test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X]) AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X])
LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \ LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
-Xlinker -framework -Xlinker ApplicationServices" -Xlinker -framework -Xlinker ApplicationServices"
AC_TRY_LINK([ ], [ ], [ AC_TRY_LINK([],
AC_MSG_RESULT([ok]) [],
], [ [AC_MSG_RESULT([ok])],
AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
LDFLAGS="${orig_LDFLAGS}" LDFLAGS="${orig_LDFLAGS}"
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])
])
fi fi
@ -173,8 +172,8 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Files.h> # include <Files.h>
#endif #endif
], ],
[ [
FCBPBPtr paramBlock; FCBPBPtr paramBlock;
short vRefNum; short vRefNum;
@ -187,11 +186,11 @@ elif test x$with_old_mac_fonts = xyes; then
PBGetFCBInfoSync( paramBlock ); PBGetFCBInfoSync( paramBlock );
FSMakeFSSpec( vRefNum, dirID, fileName, spec ); FSMakeFSSpec( vRefNum, dirID, fileName, spec );
], ],
[AC_MSG_RESULT([ok]) [AC_MSG_RESULT([ok])
CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"], CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"]) CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"])
fi fi
@ -205,7 +204,7 @@ if test x$with_fsref = xno; then
*** WARNING *** WARNING
FreeType2 built without FSRef API cannot load FreeType2 built without FSRef API cannot load
data-fork fonts on MacOS, except of XXX.dfont. data-fork fonts on MacOS, except of XXX.dfont.
]) ])
CFLAGS="$CFLAGS -DHAVE_FSREF=0" CFLAGS="$CFLAGS -DHAVE_FSREF=0"
elif test x$with_old_mac_fonts = xyes; then elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([FSRef-based FileManager]) AC_MSG_CHECKING([FSRef-based FileManager])
@ -219,8 +218,8 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Files.h> # include <Files.h>
#endif #endif
], ],
[ [
FCBPBPtr paramBlock; FCBPBPtr paramBlock;
short vRefNum; short vRefNum;
@ -250,11 +249,11 @@ elif test x$with_old_mac_fonts = xyes; then
outForkName, spec, ref ); outForkName, spec, ref );
FSPathMakeRef( path, ref, isDirectory ); FSPathMakeRef( path, ref, isDirectory );
], ],
[AC_MSG_RESULT([ok]) [AC_MSG_RESULT([ok])
CFLAGS="$CFLAGS -DHAVE_FSREF=1"], CFLAGS="$CFLAGS -DHAVE_FSREF=1"],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
CFLAGS="$CFLAGS -DHAVE_FSREF=0"]) CFLAGS="$CFLAGS -DHAVE_FSREF=0"])
fi fi
@ -277,8 +276,8 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Fonts.h> # include <Fonts.h>
#endif #endif
], ],
[ [
Str255 familyName; Str255 familyName;
SInt16 familyID = 0; SInt16 familyID = 0;
@ -290,11 +289,11 @@ elif test x$with_old_mac_fonts = xyes; then
GetFNum( familyName, &familyID ); GetFNum( familyName, &familyID );
fmOut = FMSwapFont( fmIn ); fmOut = FMSwapFont( fmIn );
], ],
[AC_MSG_RESULT([ok]) [AC_MSG_RESULT([ok])
CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"], CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"]) CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"])
fi fi
@ -317,8 +316,8 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Fonts.h> # include <Fonts.h>
#endif #endif
], ],
[ [
FMFontFamilyIterator famIter; FMFontFamilyIterator famIter;
FMFontFamily family; FMFontFamily family;
@ -339,11 +338,11 @@ elif test x$with_old_mac_fonts = xyes; then
FMDisposeFontFamilyIterator( &famIter ); FMDisposeFontFamilyIterator( &famIter );
FMGetFontContainer( font, pathSpec ); FMGetFontContainer( font, pathSpec );
], ],
[AC_MSG_RESULT([ok]) [AC_MSG_RESULT([ok])
CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"], CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"]) CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"])
fi fi
@ -361,8 +360,8 @@ elif test x$with_old_mac_fonts = xyes; then
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
], ],
[ [
FSSpec* pathSpec; FSSpec* pathSpec;
@ -370,11 +369,11 @@ elif test x$with_old_mac_fonts = xyes; then
ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope ); ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope );
ATSFontGetFileSpecification( 0, pathSpec ); ATSFontGetFileSpecification( 0, pathSpec );
], ],
[AC_MSG_RESULT([ok]) [AC_MSG_RESULT([ok])
CFLAGS="$CFLAGS -DHAVE_ATS=1"], CFLAGS="$CFLAGS -DHAVE_ATS=1"],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
CFLAGS="$CFLAGS -DHAVE_ATS=0"]) CFLAGS="$CFLAGS -DHAVE_ATS=0"])
fi fi

8
src/cid/cidparse.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* CID-keyed Type1 parser (body). */ /* CID-keyed Type1 parser (body). */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 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, */
@ -93,7 +93,6 @@
for ( offset = (FT_ULong)FT_STREAM_POS(); ; offset += 256 ) for ( offset = (FT_ULong)FT_STREAM_POS(); ; offset += 256 )
{ {
FT_Int stream_len; FT_Int stream_len;
FT_Byte* limit;
stream_len = stream->size - FT_STREAM_POS(); stream_len = stream->size - FT_STREAM_POS();
@ -126,9 +125,8 @@
} }
Found: Found:
/* we have found the start of the binary data. We will now */ /* We have found the start of the binary data. Now rewind and */
/* rewind and extract the frame corresponding to the PostScript */ /* extract the frame corresponding to the PostScript section. */
/* section */
ps_len = offset - base_offset; ps_len = offset - base_offset;
if ( FT_STREAM_SEEK( base_offset ) || if ( FT_STREAM_SEEK( base_offset ) ||