fix pdf rendering with correct output. PythonMagick is currently broken, and dont allow to tweak the output writter. So we are unable to set our preference for interlace, depth... so use a png

Author: tito

kivy/core/image/img_pdf.py

@@ -2,21 +2,18 @@
 PDF: PDF image loader
 '''
 
-try:
-    from PIL import Image as PILImage
-except:
-    raise
-
 from kivy.cache import Cache
 from kivy.logger import Logger
 from kivy.core.image import ImageLoaderBase, ImageData, ImageLoader
 
-from kivy.graphics.texture import Texture, TextureRegion
+from kivy.graphics.texture import Texture
 Debug = False
 
 import io
 from pyPdf import PdfFileWriter, PdfFileReader
 import PythonMagick as pm
+import pygame
+
 
 class ImageLoaderPDF(ImageLoaderBase):
     '''Image loader for PDF'''
@@ -33,35 +30,46 @@ def extensions():
     def load(self, filename):
         try:
             print "load pdf!", self.page
+
             # first extract the page from the pdf
-            pdf = PdfFileReader(open(filename, 'rb'))
-            p = pdf.getPage(self.page)
-            size = p.mediaBox[2:]
-            print p.trimBox, p.mediaBox, p.cropBox, p.bleedBox, p.artBox
+            with open(filename, 'rb') as fd:
+                pdf = PdfFileReader(fd)
+                page = pdf.getPage(self.page)
 
-            w = PdfFileWriter()
-            w.addPage(p)
-            f = io.BytesIO()
-            w.write(f)
-            f.seek(0)
+                pfw = PdfFileWriter()
+                pfw.addPage(page)
+                f = io.BytesIO()
+                pfw.write(f)
+                f.seek(0)
 
             # then convert the one page pdf filebuffer to an image
             blob = pm.Blob(f.read())
-            blobrgb = pm.Blob()
-            pm.Image(blob).write(blobrgb,'rgba')
-            #blobpng.data
+            blobresult = pm.Blob()
+
+            # export as a png. raw rgb/rgba might output interlaced/depth that
+            # we don't want. current PythonMagick bindings don't allow to change
+            # it. so rely as a png.
+            pmi = pm.Image(blob)
+            pmi.write(blobresult, 'png')
 
-            im = PILImage.frombuffer(
-                    'RGBA',
-                    (size[0] * 2, size[1]),
-                    blobrgb.data).resize(size)
+            # load the png though pygame
+            fd = io.BytesIO()
+            fd.write(blobresult.data)
+            fd.seek(0)
+            im = pygame.image.load(fd, 'bleh.png')
+            assert(im.get_bytesize() == 3)
+
+            # update internals
+            self.filename = filename
+            data = pygame.image.tostring(im, 'RGB', True)
+
+            # result a list of one image available
+            return [ImageData(im.get_width(), im.get_height(), 'rgb', data)]
 
         except:
             Logger.warning('Image: Unable to load image <%s>' % filename)
             raise
 
-        return (ImageData(size[0], size[1], 'rgba', im.tostring()),)
-
     def populate(self):
         self._textures = []
         if __debug__: