Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

When listing fonts also get the CIDToGIDMap

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-12 12:09:58 +05:30
parent c683535752
commit 22f200fd10
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/utils/podofo/fonts.cpp
View File

@ -170,7 +170,7 @@ list_fonts(PDFDoc *self, PyObject *args) {
unsigned long num = ref.ObjectNumber(), generation = ref.GenerationNumber(); unsigned long num = ref.ObjectNumber(), generation = ref.GenerationNumber();
const PdfObject *descriptor = it->GetIndirectKey("FontDescriptor"); const PdfObject *descriptor = it->GetIndirectKey("FontDescriptor");
pyunique_ptr descendant_font, stream_ref, encoding, w, w2; pyunique_ptr descendant_font, stream_ref, encoding, w, w2;
PyBytesOutputStream stream_data, to_unicode; PyBytesOutputStream stream_data, to_unicode, cid_gid_map;
if (dict.HasKey("W")) { if (dict.HasKey("W")) {
w.reset(convert_w_array(dict.GetKey("W")->GetArray())); w.reset(convert_w_array(dict.GetKey("W")->GetArray()));
if (!w) return NULL; if (!w) return NULL;
@ -183,6 +183,10 @@ list_fonts(PDFDoc *self, PyObject *args) {
encoding.reset(PyUnicode_FromString(dict.GetKey("Encoding")->GetName().GetName().c_str())); encoding.reset(PyUnicode_FromString(dict.GetKey("Encoding")->GetName().GetName().c_str()));
if (!encoding) return NULL; if (!encoding) return NULL;
} }
if (dict.HasKey("CIDToGIDMap") && (!dict.GetKey("CIDToGIDMap")->IsName() || strcmp(dict.GetKey("CIDToGIDMap")->GetName().GetName().c_str(), "Identity") != 0)) {
const PdfStream *stream = dict.GetKey("CIDToGIDMap")->GetStream();
if (stream) stream->GetFilteredCopy(&cid_gid_map);
}
if (descriptor) { if (descriptor) {
const PdfObject *ff = get_font_file(descriptor); const PdfObject *ff = get_font_file(descriptor);
if (ff) { if (ff) {
@ -208,7 +212,7 @@ list_fonts(PDFDoc *self, PyObject *args) {
} }
#define V(x) (x ? x.get() : Py_None) #define V(x) (x ? x.get() : Py_None)
pyunique_ptr d(Py_BuildValue( pyunique_ptr d(Py_BuildValue(
"{ss ss s(kk) sO sO sO sO sO sO sO}", "{ss ss s(kk) sO sO sO sO sO sO sO sO}",
"BaseFont", name.c_str(), "BaseFont", name.c_str(),
"Subtype", subtype.c_str(), "Subtype", subtype.c_str(),
"Reference", num, generation, "Reference", num, generation,
@ -217,7 +221,8 @@ list_fonts(PDFDoc *self, PyObject *args) {
"StreamRef", V(stream_ref), "StreamRef", V(stream_ref),
"Encoding", V(encoding), "Encoding", V(encoding),
"ToUnicode", V(to_unicode), "ToUnicode", V(to_unicode),
"W", V(w), "W2", V(w2) "W", V(w), "W2", V(w2),
"CIDToGIDMap", V(cid_gid_map)
)); ));
#undef V #undef V
if (!d) { return NULL; } if (!d) { return NULL; }