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

texlive-core-2017-luatex-poppler-0.75.patch (text/plain), 5.88 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-05-08 01:57:37 UTC

--- /texk/web2c/luatexdir/image/pdftoepdf.w
+++ /texk/web2c/luatexdir/image/pdftoepdf.w
@@ -351,7 +351,7 @@
     return a;
 }
 
-static void copyObject(PDF, PdfDocument *, Object *);
+static void copyObject(PDF, PdfDocument *, const Object *);
 
 void copyReal(PDF pdf, double d)
 {
@@ -409,10 +409,9 @@
 static void copyArray(PDF pdf, PdfDocument * pdf_doc, Array * array)
 {
     int i, l;
-    Object obj1;
     pdf_begin_array(pdf);
     for (i = 0, l = array->getLength(); i < l; ++i) {
-        obj1 = array->getNF(i);
+        const Object &obj1 = array->getNF(i);
         copyObject(pdf, pdf_doc, &obj1);
     }
     pdf_end_array(pdf);
@@ -421,11 +420,10 @@
 static void copyDict(PDF pdf, PdfDocument * pdf_doc, Dict * dict)
 {
     int i, l;
-    Object obj1;
     pdf_begin_dict(pdf);
     for (i = 0, l = dict->getLength(); i < l; ++i) {
         copyName(pdf, dict->getKey(i));
-        obj1 = dict->getValNF(i);
+        const Object &obj1 = dict->getValNF(i);
         copyObject(pdf, pdf_doc, &obj1);
     }
     pdf_end_dict(pdf);
@@ -454,7 +452,7 @@
     pdf_end_stream(pdf);
 }
 
-static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
+static void copyObject(PDF pdf, PdfDocument * pdf_doc, const Object * obj)
 {
     switch (obj->getType()) {
     case objBool:
@@ -788,16 +786,16 @@
         Now all relevant parts of the Page dictionary are copied. Metadata validity
         check is needed(as a stream it must be indirect).
     */
-    obj1 = pageDict->lookupNF("Metadata");
-    if (!obj1.isNull() && !obj1.isRef())
+    const Object &page_dict_metadata = pageDict->lookupNF("Metadata");
+    if (!page_dict_metadata.isNull() && !page_dict_metadata.isRef())
         formatted_warning("pdf inclusion","/Metadata must be indirect object");
     /* copy selected items in Page dictionary */
     for (i = 0; pagedictkeys[i] != NULL; i++) {
-        obj1 = pageDict->lookupNF(pagedictkeys[i]);
-        if (!obj1.isNull()) {
+        const Object &page_dict_item = pageDict->lookupNF(pagedictkeys[i]);
+        if (!page_dict_item.isNull()) {
             pdf_add_name(pdf, pagedictkeys[i]);
             /* preserves indirection */
-            copyObject(pdf, pdf_doc, &obj1);
+            copyObject(pdf, pdf_doc, &page_dict_item);
         }
     }
     /*
@@ -806,16 +804,16 @@
         PDF file, climbing up the tree until the Resources are found.
         (This fixes a problem with Scribus 1.3.3.14.)
     */
-    obj1 = pageDict->lookupNF("Resources");
-    if (obj1.isNull()) {
+    const Object &page_dict_resources = pageDict->lookupNF("Resources");
+    if (page_dict_resources.isNull()) {
         op1 = &pagesobj1;
         op2 = &pagesobj2;
         *op1 = pageDict->lookup("Parent");
         while (op1->isDict()) {
-            obj1 = op1->dictLookupNF("Resources");
-            if (!obj1.isNull()) {
+            const Object &op1_dict_resources = op1->dictLookupNF("Resources");
+            if (!op1_dict_resources.isNull()) {
                 pdf_add_name(pdf, "Resources");
-                copyObject(pdf, pdf_doc, &obj1);
+                copyObject(pdf, pdf_doc, &op1_dict_resources);
                 break;
             }
             *op2 = op1->dictLookup("Parent");
--- /texk/web2c/luatexdir/lua/lepdflib.cc
+++ /texk/web2c/luatexdir/lua/lepdflib.cc
@@ -735,8 +735,7 @@
     len = ((Array *) uin->d)->getLength();
     if (i > 0 && i <= len) {
         uout = new_Object_userdata(L);
-        uout->d = new Object();
-        *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1);
+        uout->d = (void *) &((Array *) uin->d)->getNF(i - 1);
         uout->atype = ALLOC_LEPDF;
         uout->pc = uin->pc;
         uout->pd = uin->pd;
@@ -1036,8 +1035,7 @@
         pdfdoc_changed_error(L);
     s = luaL_checkstring(L, 2);
     uout = new_Object_userdata(L);
-    uout->d = new Object();
-    *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s);
+    uout->d = (void *) &((Dict *) uin->d)->lookupNF(s);
     uout->atype = ALLOC_LEPDF;
     uout->pc = uin->pc;
     uout->pd = uin->pd;
@@ -1109,8 +1107,7 @@
     len = ((Dict *) uin->d)->getLength();
     if (i > 0 && i <= len) {
         uout = new_Object_userdata(L);
-        uout->d = new Object();
-        *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1);
+        uout->d = (void *) &((Dict *) uin->d)->getValNF(i - 1);
         uout->atype = ALLOC_LEPDF;
         uout->pc = uin->pc;
         uout->pd = uin->pd;
@@ -1500,7 +1497,8 @@
         pdfdoc_changed_error(L);
     num = luaL_checkint(L, 2);
     gen = luaL_checkint(L, 3);
-    *((Object *) uin->d) = Object(num, gen);
+    const Ref ref = {num, gen};
+    *((Object *) uin->d) = Object(ref);
     return 0;
 }
 
@@ -1853,8 +1851,7 @@
         len = ((Object *) uin->d)->arrayGetLength();
         if (i > 0 && i <= len) {
             uout = new_Object_userdata(L);
-            uout->d = new Object();
-            *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1);
+            uout->d = (void *) &((Object *) uin->d)->arrayGetNF(i - 1);
             uout->atype = ALLOC_LEPDF;
             uout->pc = uin->pc;
             uout->pd = uin->pd;
@@ -1946,8 +1943,7 @@
     s = luaL_checkstring(L, 2);
     if (((Object *) uin->d)->isDict()) {
         uout = new_Object_userdata(L);
-        uout->d = new Object();
-        *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s);
+        uout->d = (void *) &((Object *) uin->d)->dictLookupNF(s);
         uout->atype = ALLOC_LEPDF;
         uout->pc = uin->pc;
         uout->pd = uin->pd;
@@ -2011,8 +2007,7 @@
         len = ((Object *) uin->d)->dictGetLength();
         if (i > 0 && i <= len) {
             uout = new_Object_userdata(L);
-            uout->d = new Object();
-            *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1);
+            uout->d = (void *) &((Object *) uin->d)->dictGetValNF(i - 1);
             uout->atype = ALLOC_LEPDF;
             uout->pc = uin->pc;
             uout->pd = uin->pd;