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

* src/sfnt/ttcmap0.c (tt_cmap4_char_index): Fix serious typo 

(0xFFFU -> 0xFFFFU).

* docs/INSTALL: Fix URL of makepp.

formatting
This commit is contained in:
Werner Lemberg 2002-05-02 06:50:58 +00:00
parent 2062286fa8
commit 948ee807e1
6 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ChangeLog
View File

@ -1,42 +1,49 @@
2002-05-02 Werner Lemberg <wl@gnu.org>
* src/sfnt/ttcmap0.c (tt_cmap4_char_index): Fix serious typo
(0xFFFU -> 0xFFFFU).
2002-05-01 Werner Lemberg <wl@gnu.org>
* docs/INSTALL: Fix URL of makepp.
2002-05-01 David Turner <david@freetype.org> 2002-05-01 David Turner <david@freetype.org>
* src/sfnt/sfobjs.c (tt_face_get_name): fixing a bug that * src/sfnt/sfobjs.c (tt_face_get_name): Fixing a bug that caused
caused FreeType to crash when certain broken fonts (e.g. FreeType to crash when certain broken fonts (e.g. "hya6gb.ttf")
"hya6gb.ttf") were opened. were opened.
* src/sfnt/ttload.c (TT_Load_Names): applied a small work-around to * src/sfnt/ttload.c (TT_Load_Names): Applied a small work-around to
manage fonts containing a broken name table (e.g. "hya6gb.ttf") manage fonts containing a broken name table (e.g. "hya6gb.ttf").
* src/sfnt/ttcmap0.c (tt_cmap4_validate): * src/sfnt/ttcmap0.c (tt_cmap4_validate): Fixed over-restrictive
fixed over-restrictive validation test. the charmap validator validation test. The charmap validator now accepts overlapping
now accepts overlapping ranges in format 4 charmaps. ranges in format 4 charmaps.
* src/sfnt/ttcmap0.c (tt_cmap4_char_index): * src/sfnt/ttcmap0.c (tt_cmap4_char_index): Switched to a binary
switched to a binary search algorithm. Certain fonts contain search algorithm. Certain fonts contain more than 170 distinct
more than 170 distinct segments !! segments!
* include/freetype/config/ftstdlib.h: adding an alias for the * include/freetype/config/ftstdlib.h: Adding an alias for the `exit'
'exit' function. This will be used in the near future to panic function. This will be used in the near future to panic in case of
in case of un-expected exception (which shouldn't happen in unexpected exception (which shouldn't happen in theory).
theory, but as everyone knows, shit happens :-) )
* include/freetype/internal/fthash.h, src/base/fthash.c: * include/freetype/internal/fthash.h, src/base/fthash.c: Adding a
adding a generic implementation of dynamic hash tables using generic implementation of dynamic hash tables using a linear
linear algorithm (to get rid of 'stalls' during resizes). This algorithm (to get rid of `stalls' during resizes). This will be
will be used in the future in at least three parts of the used in the future in at least three parts of the library: the cache
library: the cache sub-system, the object sub-system and sub-system, the object sub-system, and the memory debugger.
the memory debugger.
* include/freetype/internal/ftcore.h: added this header file to * include/freetype/internal/ftcore.h: Added this header file to
group all new definitions related to exception handling and group all new definitions related to exception handling and memory
memory management. It's very likely that this file will disappear management. It is very likely that this file will disappear or be
or be renamed in the future.. renamed in the future.
* include/freetype/internal/ftobject.h, include/freetype/ftsysmem.h: * include/freetype/internal/ftobject.h, include/freetype/ftsysmem.h:
adding comments to better explain the object sub-system as well Adding comments to better explain the object sub-system as well as
as the new memory manager interface. the new memory manager interface.
2002-04-30 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com> 2002-04-30 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com>
* src/base/ftmac.c (p2c_str): Removed. * src/base/ftmac.c (p2c_str): Removed.
(file_spec_from_path) [TARGET_API_MAC_CARBON]: Added support for (file_spec_from_path) [TARGET_API_MAC_CARBON]: Added support for
@ -167,10 +174,10 @@
2002-04-18 David Turner <david@freetype.org> 2002-04-18 David Turner <david@freetype.org>
* src/base/ftobjs.c, builds/win32/ftdebug.c, * src/base/ftobjs.c, builds/win32/ftdebug.c,
builds/amiga/src/base/ftdebug.c: Version 2.1.0 couldn't be linked builds/amiga/src/base/ftdebug.c: Version 2.1.0 couldn't be linked
against applications in Win32 and Amiga builds due to changes to against applications in Win32 and Amiga builds due to changes to
"src/base/ftdebug.c" that were not properly propagated to "src/base/ftdebug.c" that were not properly propagated to
"builds/win32" and "builds/amiga". This has been fixed. "builds/win32" and "builds/amiga". This has been fixed.
* include/freetype/internal/ftobject.h, * include/freetype/internal/ftobject.h,
include/freetype/internal/ftexcept.h, include/freetype/ftsysmem.h, include/freetype/internal/ftexcept.h, include/freetype/ftsysmem.h,

4
builds/freetype.mk
View File

@ -3,7 +3,7 @@
# #
# Copyright 1996-2000 by # Copyright 1996-2000, 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, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -276,7 +276,7 @@ distclean_project_std: clean_project_std
# The Dos command shell does not support very long list of arguments, so # The Dos command shell does not support very long list of arguments, so
# we are stuck with wildcards. # we are stuck with wildcards.
# #
# Don't break the command lines with; this prevents the "del" command from # Don't break the command lines with \; this prevents the "del" command from
# working correctly on Win9x. # working correctly on Win9x.
# #
clean_project_dos: clean_project_dos:

2
docs/INSTALL
View File

@ -70,7 +70,7 @@ II. From the command line
[Well, this is not really correct. Recently, a perl implementation [Well, this is not really correct. Recently, a perl implementation
of make called `makepp' has appeared which can also build FreeType 2 of make called `makepp' has appeared which can also build FreeType 2
successfully on Unix platforms. See http://LNC.usc.edu/~holt/makepp successfully on Unix platforms. See http://makepp.sourceforge.net
for more details.] for more details.]
- Go to the `freetype2' directory. - Go to the `freetype2' directory.

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

@ -98,6 +98,7 @@
#define ft_qsort qsort #define ft_qsort qsort
#define ft_exit exit /* only used to exit from un-handled exceptions */ #define ft_exit exit /* only used to exit from un-handled exceptions */
/**********************************************************************/ /**********************************************************************/
/* */ /* */
/* execution control */ /* execution control */

29
src/sfnt/ttcmap0.c
View File

@ -670,9 +670,9 @@
if ( start > end ) if ( start > end )
FT_INVALID_DATA; FT_INVALID_DATA;
/* this test should be performed at default validation level */ /* this test should be performed at default validation level; */
/* unfortunately, some popular asian fonts present overlapping */ /* unfortunately, some popular Asian fonts present overlapping */
/* ranges in their charmaps.. */ /* ranges in their charmaps */
/* */ /* */
if ( valid->level >= FT_VALIDATE_TIGHT ) if ( valid->level >= FT_VALIDATE_TIGHT )
{ {
@ -735,19 +735,19 @@
num_segs2 = TT_PEEK_USHORT( p ) & -2; /* be paranoid! */ num_segs2 = TT_PEEK_USHORT( p ) & -2; /* be paranoid! */
#if 1 #if 1
/* some fonts have more than 170 segments in their charmaps !! */ /* Some fonts have more than 170 segments in their charmaps! */
/* we changed this function to use a more efficient binary */ /* We changed this function to use a more efficient binary */
/* search to boost its performance */ /* search for improving performance */
{ {
FT_UInt min = 0; FT_UInt min = 0;
FT_UInt max = num_segs2 >> 1; FT_UInt max = num_segs2 >> 1;
FT_UInt mid, start, end, offset; FT_UInt mid, start, end, offset;
while ( min < max ) while ( min < max )
{ {
mid = ( min + max ) >> 1; mid = ( min + max ) >> 1;
p = table + 14 + mid*2; p = table + 14 + mid * 2;
end = TT_NEXT_USHORT( p ); end = TT_NEXT_USHORT( p );
p += num_segs2; p += num_segs2;
start = TT_PEEK_USHORT( p); start = TT_PEEK_USHORT( p);
@ -756,7 +756,7 @@
max = mid; max = mid;
else if ( code > end ) else if ( code > end )
min = mid+1; min = mid + 1;
else else
{ {
@ -771,12 +771,12 @@
if ( offset != 0 ) if ( offset != 0 )
{ {
p += offset + 2*( idx - start ); p += offset + 2 * ( idx - start );
idx = TT_PEEK_USHORT( p ); idx = TT_PEEK_USHORT( p );
} }
if ( idx != 0 ) if ( idx != 0 )
result = (FT_UInt)( idx + delta ) & 0xFFFU; result = (FT_UInt)( idx + delta ) & 0xFFFFU;
goto Exit; goto Exit;
} }
@ -784,6 +784,7 @@
} }
#else /* 0 - old code */ #else /* 0 - old code */
{ {
FT_UInt n; FT_UInt n;
FT_Byte* q; FT_Byte* q;
@ -823,7 +824,9 @@
} }
} }
} }
#endif /* 0 */ #endif /* 0 */
} }
Exit: Exit:

4
src/sfnt/ttload.c
View File

@ -988,8 +988,8 @@
/* check the 'storageOffset' field */ /* check the 'storageOffset' field */
storageOffset = names->storageOffset; storageOffset = names->storageOffset;
/* some broken asian fonts have a storage offset whose value is */ /* Some broken Asian fonts have a storage offset whose value is */
/* 12*numNameRecords. We deal with them here.. */ /* 12 * numNameRecords. We deal with them here. */
if ( storageOffset == (FT_ULong)(12 * names->numNameRecords) ) if ( storageOffset == (FT_ULong)(12 * names->numNameRecords) )
storageOffset += 6; storageOffset += 6;