ref: 6be99f9104c458eeda48a51adeb65ce20ade45c3
parent: 4f41d63b02c58bf3512878f71f4f0a07ca2359fa
author: Werner Lemberg <[email protected]>
date: Thu Feb 9 02:38:57 EST 2006
* src/cid/cidparse.c (cid_parse_new): Remove shadowing variable. Formatting.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,18 @@
-2006-02-09 suzuki toshiya <[email protected]>
+2006-02-09 Werner Lemberg <[email protected]>
- * src/cid/cidparse.c: Fix for abnormally short or broken CIDFont.
- The issue was found by Taek Kwan(TK) Lee (See ft-devel 2005-11-02).
+ * src/cid/cidparse.c (cid_parse_new): Remove shadowing variable.
-2006-02-08 suzuki toshiya <[email protected]>
+2006-02-09 suzuki toshiya <[email protected]>
- * builds/unix/configure.ac: Fix bug for "--with-old-mac-fonts"
- option on UNIX platform. It has been broken since 2006-01-11.
+ * src/cid/cidparse.c (cid_parse_new): Fix for abnormally short or
+ broken CIDFont. Reported by Taek Kwan(TK) Lee (see ft-devel
+ 2005-11-02).
+2006-02-08 suzuki toshiya <[email protected]>
+
+ * 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 <[email protected]>
* src/otvalid/module.mk: s/otvalid_module_class/otv_module_class/.
@@ -664,7 +669,7 @@
* freetype/freetype.h: Updating the documentation for
FT_LOAD_TARGET_XXX and FT_Render_Mode values.
-2005-12-23 suzuki toshiya <[email protected]>
+2005-12-23 suzuki toshiya <[email protected]>
* src/base/ftmac.c (FT_New_Face_From_Suitcase): Count scalable faces
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
errors in font files.
-2005-11-24 suzuki toshiya <[email protected]>
+2005-11-24 suzuki toshiya <[email protected]>
* builds/mac/FreeType.m68k_far.make.txt,
builds/mac/FreeType.m68k_cfm.make.txt,
@@ -1451,7 +1456,7 @@
* src/autofit/aflatin.c (af_latin_metrics_scale): Initialize
render mode properly. Reported by [email protected].
-2005-08-23 suzuki toshiya <[email protected]>
+2005-08-23 suzuki toshiya <[email protected]>
Add gxvalid module to validate TrueType GX/AAT tables.
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -144,13 +144,12 @@
AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X])
LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
-Xlinker -framework -Xlinker ApplicationServices"
- AC_TRY_LINK([ ], [ ], [
- AC_MSG_RESULT([ok])
- ], [
- AC_MSG_RESULT([not found])
- LDFLAGS="${orig_LDFLAGS}"- CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
- ])
+ AC_TRY_LINK([],
+ [],
+ [AC_MSG_RESULT([ok])],
+ [AC_MSG_RESULT([not found])
+ LDFLAGS="${orig_LDFLAGS}"+ CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])
fi
@@ -173,8 +172,8 @@
# include <Files.h>
#endif
- ],
- [
+ ],
+ [
FCBPBPtr paramBlock;
short vRefNum;
@@ -187,11 +186,11 @@
PBGetFCBInfoSync( paramBlock );
FSMakeFSSpec( vRefNum, dirID, fileName, spec );
- ],
- [AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"],
- [AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_FSSPEC=0"])
fi
@@ -205,7 +204,7 @@
*** WARNING
FreeType2 built without FSRef API cannot load
data-fork fonts on MacOS, except of XXX.dfont.
-])
+ ])
CFLAGS="$CFLAGS -DHAVE_FSREF=0"
elif test x$with_old_mac_fonts = xyes; then
AC_MSG_CHECKING([FSRef-based FileManager])
@@ -219,8 +218,8 @@
# include <Files.h>
#endif
- ],
- [
+ ],
+ [
FCBPBPtr paramBlock;
short vRefNum;
@@ -250,11 +249,11 @@
outForkName, spec, ref );
FSPathMakeRef( path, ref, isDirectory );
- ],
- [AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_FSREF=1"],
- [AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_FSREF=0"])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_FSREF=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_FSREF=0"])
fi
@@ -277,8 +276,8 @@
# include <Fonts.h>
#endif
- ],
- [
+ ],
+ [
Str255 familyName;
SInt16 familyID = 0;
@@ -290,11 +289,11 @@
GetFNum( familyName, &familyID );
fmOut = FMSwapFont( fmIn );
- ],
- [AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"],
- [AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0"])
fi
@@ -317,8 +316,8 @@
# include <Fonts.h>
#endif
- ],
- [
+ ],
+ [
FMFontFamilyIterator famIter;
FMFontFamily family;
@@ -339,11 +338,11 @@
FMDisposeFontFamilyIterator( &famIter );
FMGetFontContainer( font, pathSpec );
- ],
- [AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"],
- [AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0"])
fi
@@ -361,8 +360,8 @@
#include <Carbon/Carbon.h>
- ],
- [
+ ],
+ [
FSSpec* pathSpec;
@@ -370,11 +369,11 @@
ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope );
ATSFontGetFileSpecification( 0, pathSpec );
- ],
- [AC_MSG_RESULT([ok])
- CFLAGS="$CFLAGS -DHAVE_ATS=1"],
- [AC_MSG_RESULT([not found])
- CFLAGS="$CFLAGS -DHAVE_ATS=0"])
+ ],
+ [AC_MSG_RESULT([ok])
+ CFLAGS="$CFLAGS -DHAVE_ATS=1"],
+ [AC_MSG_RESULT([not found])
+ CFLAGS="$CFLAGS -DHAVE_ATS=0"])
fi
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -4,7 +4,7 @@
/* */
/* 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. */
/* */
/* 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 )
{FT_Int stream_len;
- FT_Byte* limit;
stream_len = stream->size - FT_STREAM_POS();
@@ -126,9 +125,8 @@
}
Found:
- /* we have found the start of the binary data. We will now */
- /* rewind and extract the frame corresponding to the PostScript */
- /* section */
+ /* We have found the start of the binary data. Now rewind and */
+ /* extract the frame corresponding to the PostScript section. */
ps_len = offset - base_offset;
if ( FT_STREAM_SEEK( base_offset ) ||