* src/cff/cffload.c (cff_encoding_load): Remove unused variable.
* src/base/ftobjs.c (FT_Select_Charmap): Disallow FT_ENCODING_NONE as argument.
This commit is contained in:
parent
715e96ecf4
commit
e88c5261c3
|
@ -1,3 +1,10 @@
|
||||||
|
2006-10-24 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* src/cff/cffload.c (cff_encoding_load): Remove unused variable.
|
||||||
|
|
||||||
|
* src/base/ftobjs.c (FT_Select_Charmap): Disallow FT_ENCODING_NONE
|
||||||
|
as argument.
|
||||||
|
|
||||||
2006-10-23 Zhe Su <zsu@novell.com>
|
2006-10-23 Zhe Su <zsu@novell.com>
|
||||||
|
|
||||||
* src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to
|
* src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to
|
||||||
|
|
|
@ -2574,6 +2574,9 @@
|
||||||
if ( !face )
|
if ( !face )
|
||||||
return FT_Err_Invalid_Face_Handle;
|
return FT_Err_Invalid_Face_Handle;
|
||||||
|
|
||||||
|
if ( encoding == FT_ENCODING_NONE )
|
||||||
|
return FT_Err_Invalid_Argument;
|
||||||
|
|
||||||
/* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
|
/* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
|
||||||
/* charmap available, i.e., one with UCS-4 characters, if possible. */
|
/* charmap available, i.e., one with UCS-4 characters, if possible. */
|
||||||
/* */
|
/* */
|
||||||
|
|
|
@ -1924,9 +1924,6 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FT_UInt i;
|
|
||||||
|
|
||||||
|
|
||||||
/* We take into account the fact a CFF font can use a predefined */
|
/* We take into account the fact a CFF font can use a predefined */
|
||||||
/* encoding without containing all of the glyphs encoded by this */
|
/* encoding without containing all of the glyphs encoded by this */
|
||||||
/* encoding (see the note at the end of section 12 in the CFF */
|
/* encoding (see the note at the end of section 12 in the CFF */
|
||||||
|
|
Loading…
Reference in New Issue