[cff] Correct cmap format reporting (#24819).
* src/cff/cffdrivr.c (cff_get_cmap_info): Throw an error on synthetic charmap instead of guessing its format and language.
This commit is contained in:
parent
5081674c5f
commit
c5f1bc4b36
|
@ -1,3 +1,10 @@
|
||||||
|
2016-10-25 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
|
[cff] Correct cmap format reporting (#24819).
|
||||||
|
|
||||||
|
* src/cff/cffdrivr.c (cff_get_cmap_info): Throw an error on synthetic
|
||||||
|
charmap instead of guessing its format and language.
|
||||||
|
|
||||||
2016-10-22 Werner Lemberg <wl@gnu.org>
|
2016-10-22 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[truetype] Fix SCANTYPE instruction (#49394).
|
[truetype] Fix SCANTYPE instruction (#49394).
|
||||||
|
|
|
@ -494,9 +494,6 @@
|
||||||
FT_Library library = FT_FACE_LIBRARY( face );
|
FT_Library library = FT_FACE_LIBRARY( face );
|
||||||
|
|
||||||
|
|
||||||
cmap_info->language = 0;
|
|
||||||
cmap_info->format = 0;
|
|
||||||
|
|
||||||
if ( cmap->clazz != &CFF_CMAP_ENCODING_CLASS_REC_GET &&
|
if ( cmap->clazz != &CFF_CMAP_ENCODING_CLASS_REC_GET &&
|
||||||
cmap->clazz != &CFF_CMAP_UNICODE_CLASS_REC_GET )
|
cmap->clazz != &CFF_CMAP_UNICODE_CLASS_REC_GET )
|
||||||
{
|
{
|
||||||
|
@ -509,6 +506,8 @@
|
||||||
if ( service && service->get_cmap_info )
|
if ( service && service->get_cmap_info )
|
||||||
error = service->get_cmap_info( charmap, cmap_info );
|
error = service->get_cmap_info( charmap, cmap_info );
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
error = FT_THROW( Invalid_CharMap_Format );
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue