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

* src/sfnt/ttcmap.c (code_to_index2): Handle code values with 

hi-byte == 0 correctly.

* builds/link-std.mk ($(PROJECT_LIBRARY)): Fix typo.
This commit is contained in:
Werner Lemberg 2001-09-10 13:11:52 +00:00
parent ec342907b3
commit 20abe742a7
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-09-10 Yao Zhang <yzhang@sharemedia.com>
* src/sfnt/ttcmap.c (code_to_index2): Handle code values with
hi-byte == 0 correctly.
2001-09-10 Werner Lemberg <wl@gnu.org>
* builds/link-std.mk ($(PROJECT_LIBRARY)): Fix typo.
2001-08-30 Martin Muskens <mmuskens@aurelon.com>
* src/type1/t1load.c (parse_font_matrix): A new way to compute the

2
builds/link_dos.mk
View File

@ -34,7 +34,7 @@ ifdef BUILD_PROJECT
ifdef CLEAN_LIBRARY
-$(CLEAN_LIBRARY) $(NO_OUTPUT)
endif
$(LINK_LIBRARY)
$(LINK_LIBRARY)
endif

4
builds/link_std.mk
View File

@ -32,9 +32,9 @@ ifdef BUILD_PROJECT
#
$(PROJECT_LIBRARY): $(OBJECTS_LIST)
ifdef CLEAN_LIBRARY
-$(CLEAN_LIBRARY) xx $(NO_OUTPUT)
-$(CLEAN_LIBRARY) $(NO_OUTPUT)
endif
$(LINK_LIBRARY)
$(LINK_LIBRARY)
endif

33
src/sfnt/ttcmap.c
View File

@ -503,28 +503,29 @@
{
/* an 8-bit character code -- we use the subHeader 0 in this case */
/* to test whether the character code is in the charmap */
if ( cmap2->subHeaderKeys[char_lo] == 0 )
result = cmap2->glyphIdArray[char_lo];
index1 = cmap2->subHeaderKeys[char_lo];
if ( index1 != 0 )
return 0;
}
else
{
/* a 16-bit character code */
index1 = cmap2->subHeaderKeys[char_hi & 0xFF];
if ( index1 )
{
sh2 = cmap2->subHeaders + index1;
char_lo -= sh2->firstCode;
if ( index1 == 0 )
return 0;
}
if ( char_lo < (FT_UInt)sh2->entryCount )
{
offset = sh2->idRangeOffset / 2 + char_lo;
if ( offset < (FT_UInt)cmap2->numGlyphId )
{
result = cmap2->glyphIdArray[offset];
if ( result )
result = ( result + sh2->idDelta ) & 0xFFFF;
}
}
sh2 = cmap2->subHeaders + index1;
char_lo -= sh2->firstCode;
if ( char_lo < (FT_UInt)sh2->entryCount )
{
offset = sh2->idRangeOffset / 2 + char_lo;
if ( offset < (FT_UInt)cmap2->numGlyphId )
{
result = cmap2->glyphIdArray[offset];
if ( result )
result = ( result + sh2->idDelta ) & 0xFFFF;
}
}