* 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:
Werner Lemberg 2006-10-24 05:46:26 +00:00
parent 715e96ecf4
commit e88c5261c3
3 changed files with 10 additions and 3 deletions

View File

@ -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>
* src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to

View File

@ -2574,6 +2574,9 @@
if ( !face )
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 */
/* charmap available, i.e., one with UCS-4 characters, if possible. */
/* */

View File

@ -1924,9 +1924,6 @@
}
else
{
FT_UInt i;
/* We take into account the fact a CFF font can use a predefined */
/* encoding without containing all of the glyphs encoded by this */
/* encoding (see the note at the end of section 12 in the CFF */