* src/cid/cidparse.c (cid_parse_new): Remove shadowing variable. Formatting.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261
diff --git a/ChangeLog b/ChangeLog
index 785b3e7..b9a7f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
- 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 <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"
- 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 <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>
@@ -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 <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
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 <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_cfm.make.txt,
@@ -1451,7 +1456,7 @@
* src/autofit/aflatin.c (af_latin_metrics_scale): Initialize
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.
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index 529da51..a5836ad 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -144,13 +144,12 @@ if test x$with_old_mac_fonts = xyes; then
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 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Files.h>
#endif
- ],
- [
+ ],
+ [
FCBPBPtr paramBlock;
short vRefNum;
@@ -187,11 +186,11 @@ elif test x$with_old_mac_fonts = xyes; then
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 @@ if test x$with_fsref = xno; then
*** 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 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Files.h>
#endif
- ],
- [
+ ],
+ [
FCBPBPtr paramBlock;
short vRefNum;
@@ -250,11 +249,11 @@ elif test x$with_old_mac_fonts = xyes; then
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 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Fonts.h>
#endif
- ],
- [
+ ],
+ [
Str255 familyName;
SInt16 familyID = 0;
@@ -290,11 +289,11 @@ elif test x$with_old_mac_fonts = xyes; then
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 @@ elif test x$with_old_mac_fonts = xyes; then
# include <Fonts.h>
#endif
- ],
- [
+ ],
+ [
FMFontFamilyIterator famIter;
FMFontFamily family;
@@ -339,11 +338,11 @@ elif test x$with_old_mac_fonts = xyes; then
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 @@ elif test x$with_old_mac_fonts = xyes; then
#include <Carbon/Carbon.h>
- ],
- [
+ ],
+ [
FSSpec* pathSpec;
@@ -370,11 +369,11 @@ elif test x$with_old_mac_fonts = xyes; then
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
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 7fd6c3c..ac56363 100644
--- 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 ) ||