* src/cff/cffcmap.c (cff_cmap_unicode_init): Don't try to build
a cmap for a CID-keyed font which doesn't have SIDs.
This commit is contained in:
parent
1d565fb01b
commit
8e58ff26d2
|
@ -1,3 +1,8 @@
|
||||||
|
2005-02-14 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* src/cff/cffcmap.c (cff_cmap_unicode_init): Don't try to build
|
||||||
|
a cmap for a CID-keyed font which doesn't have SIDs.
|
||||||
|
|
||||||
2005-02-13 Werner Lemberg <wl@gnu.org>
|
2005-02-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* src/type1/t1load.c (read_binary_data): Return more meaningful
|
* src/type1/t1load.c (read_binary_data): Return more meaningful
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* CFF character mapping table (cmap) support (body). */
|
/* CFF character mapping table (cmap) support (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2002, 2003, 2004 by */
|
/* Copyright 2002, 2003, 2004, 2005 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, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -149,6 +149,13 @@
|
||||||
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)cff->psnames;
|
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)cff->psnames;
|
||||||
|
|
||||||
|
|
||||||
|
/* can't build Unicode map for CID-keyed font */
|
||||||
|
if ( !charset->sids )
|
||||||
|
{
|
||||||
|
error = CFF_Err_Invalid_Argument;
|
||||||
|
goto Exit;
|
||||||
|
}
|
||||||
|
|
||||||
cmap->num_pairs = 0;
|
cmap->num_pairs = 0;
|
||||||
cmap->pairs = NULL;
|
cmap->pairs = NULL;
|
||||||
|
|
||||||
|
@ -213,6 +220,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Exit:
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue