forked from minhngoc25a/freetype2
* 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:
parent
ec342907b3
commit
20abe742a7
|
@ -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>
|
2001-08-30 Martin Muskens <mmuskens@aurelon.com>
|
||||||
|
|
||||||
* src/type1/t1load.c (parse_font_matrix): A new way to compute the
|
* src/type1/t1load.c (parse_font_matrix): A new way to compute the
|
||||||
|
|
|
@ -32,7 +32,7 @@ ifdef BUILD_PROJECT
|
||||||
#
|
#
|
||||||
$(PROJECT_LIBRARY): $(OBJECTS_LIST)
|
$(PROJECT_LIBRARY): $(OBJECTS_LIST)
|
||||||
ifdef CLEAN_LIBRARY
|
ifdef CLEAN_LIBRARY
|
||||||
-$(CLEAN_LIBRARY) xx $(NO_OUTPUT)
|
-$(CLEAN_LIBRARY) $(NO_OUTPUT)
|
||||||
endif
|
endif
|
||||||
$(LINK_LIBRARY)
|
$(LINK_LIBRARY)
|
||||||
|
|
||||||
|
|
|
@ -503,15 +503,18 @@
|
||||||
{
|
{
|
||||||
/* an 8-bit character code -- we use the subHeader 0 in this case */
|
/* an 8-bit character code -- we use the subHeader 0 in this case */
|
||||||
/* to test whether the character code is in the charmap */
|
/* to test whether the character code is in the charmap */
|
||||||
if ( cmap2->subHeaderKeys[char_lo] == 0 )
|
index1 = cmap2->subHeaderKeys[char_lo];
|
||||||
result = cmap2->glyphIdArray[char_lo];
|
if ( index1 != 0 )
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* a 16-bit character code */
|
/* a 16-bit character code */
|
||||||
index1 = cmap2->subHeaderKeys[char_hi & 0xFF];
|
index1 = cmap2->subHeaderKeys[char_hi & 0xFF];
|
||||||
if ( index1 )
|
if ( index1 == 0 )
|
||||||
{
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
sh2 = cmap2->subHeaders + index1;
|
sh2 = cmap2->subHeaders + index1;
|
||||||
char_lo -= sh2->firstCode;
|
char_lo -= sh2->firstCode;
|
||||||
|
|
||||||
|
@ -525,8 +528,6 @@
|
||||||
result = ( result + sh2->idDelta ) & 0xFFFF;
|
result = ( result + sh2->idDelta ) & 0xFFFF;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue