Bug fixing PDF string escapes (#153)

Author: JorjMcKie

.travis.yml

@@ -46,7 +46,7 @@ script:
 - cibuildwheel --output-dir wheelhouse
 
 before_deploy:
-  - git tag "v1.12.4"
+  - git tag "v1.12.5"
 deploy:
   provider: releases
   api_key:

README.md

@@ -1,4 +1,4 @@
-# PyMuPDF 1.12.4 [![Build Status](https://travis-ci.org/rk700/PyMuPDF.svg?branch=master)](https://travis-ci.org/rk700/PyMuPDF)
+# PyMuPDF 1.12.5 [![Build Status](https://travis-ci.org/rk700/PyMuPDF.svg?branch=master)](https://travis-ci.org/rk700/PyMuPDF)
 
 ![logo](https://github.com/rk700/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
@@ -10,7 +10,7 @@ Release date: January 15, 2018
 
 # Introduction
 
-This is **version 1.12.4 of PyMuPDF (formerly python-fitz)**, a Python binding which supports [MuPDF 1.12](http://mupdf.com/) - "a lightweight PDF and XPS viewer".
+This is **version 1.12.5 of PyMuPDF (formerly python-fitz)**, a Python binding which supports [MuPDF 1.12](http://mupdf.com/) - "a lightweight PDF and XPS viewer".
 
 MuPDF can access files in PDF, XPS, OpenXPS, CBZ, EPUB and FB2 (e-books) formats, and it is known for its top performance and high rendering quality.
 

fitz/fitz.i

@@ -1021,65 +1021,21 @@ if links:
             return Py_BuildValue("(l, l)", objnum, objgen);
         }
 
-        //---------------------------------------------------------------------
-        // Returns the list of images used on a page.
-        // Each image entry contains
-        // [xref, smask, width, height, bpc, colorspace, altcs, name]
-        //---------------------------------------------------------------------
-        FITZEXCEPTION(getPageImageList, !result)
-        CLOSECHECK(getPageImageList)
-        %feature("autodoc","Show the images used on a page.") getPageImageList;
-        %pythonappend getPageImageList %{
-        x = []
-        for v in val:
-            if v not in x:
-                x.append(v)
-        val = x%}
-        PyObject *getPageImageList(int pno)
-        {
-            pdf_document *pdf = pdf_specifics(gctx, $self);
-            int pageCount = fz_count_pages(gctx, $self);
-            pdf_obj *pageref, *rsrc;
-            PyObject *imagelist;            // returned object
-            int n = pno;                    // pno < 0 is allowed
-            while (n < 0) n += pageCount;
-            fz_try(gctx)
-            {
-                if (n >= pageCount) THROWMSG("invalid page number(s)");
-                assert_PDF(pdf);
-                pageref = pdf_lookup_page_obj(gctx, pdf, n);
-                rsrc = pdf_dict_get(gctx, pageref, PDF_NAME_Resources);
-                if (!pageref || !rsrc) THROWMSG("cannot retrieve page info");
-                imagelist = PyList_New(0);
-                JM_imagelist(gctx, pdf, rsrc, imagelist);
-            }
-            fz_catch(gctx)
-            {
-                Py_DECREF(imagelist);
-                return NULL;
-            }
-            return imagelist;
-        }
-
-        //---------------------------------------------------------------------
-        // Returns the list of fonts used on a page.
-        // Each font entry contains [xref, extension, type, basename, name]
-        //---------------------------------------------------------------------
-        FITZEXCEPTION(getPageFontList, !result)
-        CLOSECHECK(getPageFontList)
-        %feature("autodoc","Show the fonts used on a page.") getPageFontList;
-        %pythonappend getPageFontList %{
+        FITZEXCEPTION(_getPageInfo, !result)
+        CLOSECHECK(_getPageInfo)
+        %feature("autodoc","Show fonts or images used on a page.") _getPageInfo;
+        %pythonappend _getPageInfo %{
         x = []
         for v in val:
             if v not in x:
                 x.append(v)
         val = x%}
-        PyObject *getPageFontList(int pno)
+        PyObject *_getPageInfo(int pno, int what)
         {
             pdf_document *pdf = pdf_specifics(gctx, $self);
             int pageCount = fz_count_pages(gctx, $self);
             pdf_obj *pageref, *rsrc;
-            PyObject *fontlist;             // returned object
+            PyObject *liste;                // returned object
             int n = pno;                    // pno < 0 is allowed
             while (n < 0) n += pageCount;
             fz_try(gctx)
@@ -1089,15 +1045,15 @@ if links:
                 pageref = pdf_lookup_page_obj(gctx, pdf, n);
                 rsrc = pdf_dict_get(gctx, pageref, PDF_NAME_Resources);
                 if (!pageref || !rsrc) THROWMSG("cannot retrieve page info");
-                fontlist = PyList_New(0);
-                JM_fontlist(gctx, pdf, rsrc, fontlist);
+                liste = PyList_New(0);
+                JM_ScanResources(gctx, pdf, rsrc, liste, what);
             }
             fz_catch(gctx)
             {
-                Py_DECREF(fontlist);
+                Py_DECREF(liste);
                 return NULL;
             }
-            return fontlist;
+            return liste;
         }
 
         FITZEXCEPTION(extractFont, !result)
@@ -1461,6 +1417,16 @@ if links:
             outline = property(lambda self: self._outline)
             _getPageXref = _getPageObjNumber
 
+            def getPageFontList(self, pno):
+                """Retrieve a list of fonts used on a page.
+                """
+                return self._getPageInfo(pno, 1)
+
+            def getPageImageList(self, pno):
+                """Retrieve a list of images used on a page.
+                """
+                return self._getPageInfo(pno, 2)
+
             def saveIncr(self):
                 """ Save PDF incrementally"""
                 return self.save(self.name, incremental = True)
@@ -2933,6 +2899,8 @@ struct fz_pixmap_s
             fz_pixmap *pm = NULL;
             fz_try(gctx)
             {
+                if (!fz_pixmap_colorspace(gctx, spix))
+                    THROWMSG("cannot copy pixmap with NULL colorspace");
                 pm = fz_convert_pixmap(gctx, spix, cs, NULL, NULL, NULL, alpha);
             }
             fz_catch(gctx) return NULL;
@@ -2942,7 +2910,7 @@ struct fz_pixmap_s
         //---------------------------------------------------------------------
         // create pixmap as scaled copy of another one
         //---------------------------------------------------------------------
-        fz_pixmap_s(fz_pixmap *spix, float w, float h, struct fz_irect_s *clip = NULL)
+        fz_pixmap_s(struct fz_pixmap_s *spix, float w, float h, struct fz_irect_s *clip = NULL)
         {
             fz_pixmap *pm = NULL;
             fz_try(gctx)
@@ -3101,33 +3069,48 @@ struct fz_pixmap_s
         //---------------------------------------------------------------------
         void shrink(int factor)
         {
-            if (factor < 0) return;
-            fz_try(gctx)
+            if (factor < 1)
             {
-                fz_subsample_pixmap(gctx, $self, factor);
+                PySys_WriteStdout("warning: ignoring shrink factor < 1\n");
+                return;
             }
-            fz_catch(gctx) return;
+            fz_subsample_pixmap(gctx, $self, factor);
         }
 
         /***************************/
         /* apply gamma correction  */
         /***************************/
         void gammaWith(float gamma)
         {
+            if (!fz_pixmap_colorspace(gctx, $self))
+            {
+                PySys_WriteStdout("warning: colorspace invalid for function\n");
+                return;
+            }
             fz_gamma_pixmap(gctx, $self, gamma);
         }
 
         /***************************/
         /* tint pixmap with color  */
         /***************************/
         %pythonprepend tintWith%{
-            if self.colorspace.n > 3:
-                raise TypeError("CMYK colorspace cannot be tinted")%}
+            if not self.colorspace or self.colorspace.n > 3:
+                print("warning: colorspace invalid for function")
+                return%}
         void tintWith(int red, int green, int blue)
         {
             fz_tint_pixmap(gctx, $self, red, green, blue);
         }
 
+        //----------------------------------------------------------------------
+        // Pixmap.setResolution
+        //----------------------------------------------------------------------
+        void setResolution(int xres, int yres)
+        {
+            $self->xres = xres;
+            $self->yres = yres;
+        }
+
         //----------------------------------------------------------------------
         // clear total pixmap with 0x00 */
         //----------------------------------------------------------------------
@@ -3155,9 +3138,17 @@ struct fz_pixmap_s
         //----------------------------------------------------------------------
         // copy pixmaps 
         //----------------------------------------------------------------------
-        void copyPixmap(struct fz_pixmap_s *src, const struct fz_irect_s *bbox)
+        FITZEXCEPTION(copyPixmap, !result)
+        PyObject *copyPixmap(struct fz_pixmap_s *src, const struct fz_irect_s *bbox)
         {
-            fz_copy_pixmap_rect(gctx, $self, src, bbox, NULL);
+            fz_try(gctx)
+            {
+                if (!fz_pixmap_colorspace(gctx, src))
+                    THROWMSG("cannot copy pixmap with NULL colorspace");
+                fz_copy_pixmap_rect(gctx, $self, src, bbox, NULL);
+            }
+            fz_catch(gctx) return NULL;
+            return NONE;
         }
 
         //----------------------------------------------------------------------