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

11
ChangeLog
View File

@ -1,11 +1,16 @@
2006-02-09 Werner Lemberg <wl@gnu.org>
* src/cid/cidparse.c (cid_parse_new): Remove shadowing variable.
2006-02-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* 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): 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"
* 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>

13
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])
LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
-Xlinker -framework -Xlinker ApplicationServices"
AC_TRY_LINK([ ], [ ], [
AC_MSG_RESULT([ok])
], [
AC_MSG_RESULT([not found])
AC_TRY_LINK([],
[],
[AC_MSG_RESULT([ok])],
[AC_MSG_RESULT([not found])
LDFLAGS="${orig_LDFLAGS}"
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
])
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])
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])

8
src/cid/cidparse.c
View File

@ -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 ) ||