[patch] texlive-core-2017-pdftex-poppler-0.75.patch

texlive-core-2017-pdftex-poppler-0.75.patch (text/plain), 5.68 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-05-08 02:01:17 UTC

--- /texk/web2c/pdftexdir/pdftoepdf.cc
+++ /texk/web2c/pdftexdir/pdftoepdf.cc
@@ -268,7 +268,7 @@
 }
 #endif
 
-static void copyObject(Object *);
+static void copyObject(const Object *);
 
 static void copyName(const char *s)
 {
@@ -282,17 +282,16 @@
     }
 }
 
-static void copyDictEntry(Object * obj, int i)
+static void copyDictEntry(const Object * obj, int i)
 {
-    Object obj1;
     copyName((char *)obj->dictGetKey(i));
     pdf_puts(" ");
-    obj1 = obj->dictGetValNF(i);
+    const Object &obj1 = obj->dictGetValNF(i);
     copyObject(&obj1);
     pdf_puts("\n");
 }
 
-static void copyDict(Object * obj)
+static void copyDict(const Object * obj)
 {
     int i, l;
     if (!obj->isDict())
@@ -340,13 +339,12 @@
 static void copyProcSet(Object * obj)
 {
     int i, l;
-    Object procset;
     if (!obj->isArray())
         pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>",
                     obj->getTypeName());
     pdf_puts("/ProcSet [ ");
     for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
-        procset = obj->arrayGetNF(i);
+        const Object &procset = obj->arrayGetNF(i);
         if (!procset.isName())
             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
                         procset.getTypeName());
@@ -377,10 +375,11 @@
     return false;
 }
 
-static void copyFont(const char *tag, Object * fontRef)
+static void copyFont(const char *tag, const Object * fontRef)
 {
-    Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+    Object fontdict, subtype, basefont, fontdesc, charset,
         stemV;
+    const Object *fontdescRef = nullptr;
     GfxFont *gfont;
     fd_entry *fd;
     fm_entry *fontmap;
@@ -401,16 +400,17 @@
     if (fontdict.isDict()) {
         subtype = fontdict.dictLookup("Subtype");
         basefont = fontdict.dictLookup("BaseFont");
-        fontdescRef = fontdict.dictLookupNF("FontDescriptor");
-        if (fontdescRef.isRef()) {
-            fontdesc = fontdescRef.fetch(xref);
+        fontdescRef = &fontdict.dictLookupNF("FontDescriptor");
+        if (fontdescRef->isRef()) {
+            fontdesc = fontdescRef->fetch(xref);
         }
     }
     if (!fixedinclusioncopyfont && fontdict.isDict()
         && subtype.isName()
         && !strcmp(subtype.getName(), "Type1")
         && basefont.isName()
-        && fontdescRef.isRef()
+        && fontdescRef
+        && fontdescRef->isRef()
         && fontdesc.isDict()
         && embeddableFont(&fontdesc)
         && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
@@ -425,7 +425,7 @@
             epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
         else
             embed_whole_font(fd);
-        addFontDesc(fontdescRef.getRef(), fd);
+        addFontDesc(fontdescRef->getRef(), fd);
         copyName(tag);
         gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(),
                                   fontdict.getDict());
@@ -440,14 +440,13 @@
 
 static void copyFontResources(Object * obj)
 {
-    Object fontRef;
     int i, l;
     if (!obj->isDict())
         pdftex_fail("PDF inclusion: invalid font resources dict type <%s>",
                     obj->getTypeName());
     pdf_puts("/Font << ");
     for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
-        fontRef = obj->dictGetValNF(i);
+        const Object &fontRef = obj->dictGetValNF(i);
         if (fontRef.isRef())
             copyFont(obj->dictGetKey(i), &fontRef);
         else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
@@ -544,9 +543,8 @@
     return (char *) buf;
 }
 
-static void copyObject(Object * obj)
+static void copyObject(const Object * obj)
 {
-    Object obj1;
     int i, l, c;
     Ref ref;
     const char *p;
@@ -590,7 +588,7 @@
     } else if (obj->isArray()) {
         pdf_puts("[");
         for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
-            obj1 = obj->arrayGetNF(i);
+            const Object &obj1 = obj->arrayGetNF(i);
             if (!obj1.isName())
                 pdf_puts(" ");
             copyObject(&obj1);
@@ -928,23 +926,23 @@
     pdf_puts(stripzeros(s));
 
     // Metadata validity check (as a stream it must be indirect)
-    dictObj = pageDict->lookupNF("Metadata");
-    if (!dictObj.isNull() && !dictObj.isRef())
+    const Object &page_dict_metadata = pageDict->lookupNF("Metadata");
+    if (!page_dict_metadata.isNull() && !page_dict_metadata.isRef())
         pdftex_warn("PDF inclusion: /Metadata must be indirect object");
 
     // copy selected items in Page dictionary except Resources & Group
     for (i = 0; pageDictKeys[i] != NULL; i++) {
-        dictObj = pageDict->lookupNF(pageDictKeys[i]);
-        if (!dictObj.isNull()) {
+        const Object &page_dict_item = pageDict->lookupNF(pageDictKeys[i]);
+        if (!page_dict_item.isNull()) {
             pdf_newline();
             pdf_printf("/%s ", pageDictKeys[i]);
-            copyObject(&dictObj); // preserves indirection
+            copyObject(&page_dict_item); // preserves indirection
         }
     } 
 
     // handle page group
-    dictObj = pageDict->lookupNF("Group");
-    if (!dictObj.isNull()) {
+    const Object &page_dict_group = pageDict->lookupNF("Group");
+    if (!page_dict_group.isNull()) {
         if (pdfpagegroupval == 0) { 
             // another pdf with page group was included earlier on the
             // same page; copy the Group entry as is.  See manual for
@@ -955,7 +953,7 @@
             }
             pdf_newline();
             pdf_puts("/Group ");
-            copyObject(&dictObj);
+            copyObject(&page_dict_group);
         } else {
             // write Group dict as a separate object, since the Page dict also refers to it
             dictObj = pageDict->lookup("Group");