Merge pull request #776 from wiredfool/palm

Palm image test

.travis.yml

@@ -14,7 +14,7 @@ python:
   - 3.4
 
 install:
-  - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake"
+  - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick"
   - "pip install cffi"
   - "pip install coveralls nose pyroma"
   - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi

PIL/PalmImagePlugin.py

@@ -77,6 +77,7 @@ _Palm8BitColormapValues = (
     (  0,   0,   0), (  0,   0,   0), (  0,   0,   0), (  0,   0,   0),
     (  0,   0,   0), (  0,   0,   0), (  0,   0,   0), (  0,   0,   0))
 
+
 # so build a prototype image to be used for palette resampling
 def build_prototype_image():
     image = Image.new("L", (1, len(_Palm8BitColormapValues),))
@@ -91,7 +92,8 @@ def build_prototype_image():
 
 Palm8BitColormapImage = build_prototype_image()
 
-# OK, we now have in Palm8BitColormapImage, a "P"-mode image with the right palette
+# OK, we now have in Palm8BitColormapImage,
+# a "P"-mode image with the right palette
 #
 # --------------------------------------------------------------------
 
@@ -110,6 +112,7 @@ _COMPRESSION_TYPES = {
 o8 = _binary.o8
 o16b = _binary.o16be
 
+
 #
 # --------------------------------------------------------------------
 
@@ -127,12 +130,16 @@ def _save(im, fp, filename, check=0):
         bpp = 8
         version = 1
 
-    elif im.mode == "L" and "bpp" in im.encoderinfo and im.encoderinfo["bpp"] in (1, 2, 4):
+    elif (im.mode == "L" and
+          "bpp" in im.encoderinfo and
+          im.encoderinfo["bpp"] in (1, 2, 4)):
 
-        # this is 8-bit grayscale, so we shift it to get the high-order bits, and invert it because
+        # this is 8-bit grayscale, so we shift it to get the high-order bits,
+        # and invert it because
         # Palm does greyscale from white (0) to black (1)
         bpp = im.encoderinfo["bpp"]
-        im = im.point(lambda x, shift=8-bpp, maxval=(1 << bpp)-1: maxval - (x >> shift))
+        im = im.point(
+            lambda x, shift=8-bpp, maxval=(1 << bpp)-1: maxval - (x >> shift))
         # we ignore the palette here
         im.mode = "P"
         rawmode = "P;" + str(bpp)
@@ -140,8 +147,9 @@ def _save(im, fp, filename, check=0):
 
     elif im.mode == "L" and "bpp" in im.info and im.info["bpp"] in (1, 2, 4):
 
-        # here we assume that even though the inherent mode is 8-bit grayscale, only
+        # here we assume that even though the inherent mode is 8-bit grayscale,
-        # the lower bpp bits are significant.  We invert them to match the Palm.
+        # only the lower bpp bits are significant.
+        # We invert them to match the Palm.
         bpp = im.info["bpp"]
         im = im.point(lambda x, maxval=(1 << bpp)-1: maxval - (x & maxval))
         # we ignore the palette here
@@ -172,7 +180,7 @@ def _save(im, fp, filename, check=0):
     cols = im.size[0]
     rows = im.size[1]
 
-    rowbytes = ((cols + (16//bpp - 1)) / (16 // bpp)) * 2
+    rowbytes = int((cols + (16//bpp - 1)) / (16 // bpp)) * 2
     transparent_index = 0
     compression_type = _COMPRESSION_TYPES["none"]
 
@@ -205,12 +213,19 @@ def _save(im, fp, filename, check=0):
         for i in range(256):
             fp.write(o8(i))
             if colormapmode == 'RGB':
-                fp.write(o8(colormap[3 * i]) + o8(colormap[3 * i + 1]) + o8(colormap[3 * i + 2]))
+                fp.write(
+                    o8(colormap[3 * i]) +
+                    o8(colormap[3 * i + 1]) +
+                    o8(colormap[3 * i + 2]))
             elif colormapmode == 'RGBA':
-                fp.write(o8(colormap[4 * i]) + o8(colormap[4 * i + 1]) + o8(colormap[4 * i + 2]))
+                fp.write(
+                    o8(colormap[4 * i]) +
+                    o8(colormap[4 * i + 1]) +
+                    o8(colormap[4 * i + 2]))
 
     # now convert data to raw form
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, rowbytes, 1))])
+    ImageFile._save(
+        im, fp, [("raw", (0, 0)+im.size, 0, (rawmode, rowbytes, 1))])
 
     fp.flush()
 

Tests/helper.py

@@ -123,6 +123,21 @@ class PillowTestCase(unittest.TestCase):
             self.assertTrue(found)
         return result
 
+    def skipKnownBadTest(self, msg=None, platform=None, travis=None):
+        # Skip if platform/travis matches, and
+        # PILLOW_RUN_KNOWN_BAD is not true in the environment.
+        if bool(os.environ.get('PILLOW_RUN_KNOWN_BAD', False)):
+            print (os.environ.get('PILLOW_RUN_KNOWN_BAD', False))
+            return
+
+        skip = True
+        if platform is not None:
+            skip = sys.platform.startswith(platform)
+        if travis is not None:
+            skip = skip and (travis == bool(os.environ.get('TRAVIS',False)))
+        if skip:
+            self.skipTest(msg or "Known Bad Test")
+
     def tempfile(self, template):
         assert template[:5] in ("temp.", "temp_")
         (fd, path) = tempfile.mkstemp(template[4:], template[:4])
@@ -131,6 +146,17 @@ class PillowTestCase(unittest.TestCase):
         self.addCleanup(self.delete_tempfile, path)      
         return path
 
+    def open_withImagemagick(self, f):
+        if not imagemagick_available():
+            raise IOError()
+
+        outfile = self.tempfile("temp.png")
+        if command_succeeds(['convert', f, outfile]):
+            from PIL import Image
+            return Image.open(outfile)
+        raise IOError()
+    
+        
 # helpers
 
 import sys
@@ -194,4 +220,7 @@ def netpbm_available():
     return command_succeeds(["ppmquant", "--help"]) and \
            command_succeeds(["ppmtogif", "--help"])
 
+def imagemagick_available():
+    return command_succeeds(['convert', '-version'])
+                            
 # End of file

Tests/test_file_palm.py

@@ -0,0 +1,61 @@
+from helper import unittest, PillowTestCase, tearDownModule, lena, imagemagick_available
+
+import os.path
+
+
+class TestFilePalm(PillowTestCase):
+    _roundtrip = imagemagick_available()
+    
+    def helper_save_as_palm(self, mode):
+        # Arrange
+        im = lena(mode)
+        outfile = self.tempfile("temp_" + mode + ".palm")
+
+        # Act
+        im.save(outfile)
+
+        # Assert
+        self.assertTrue(os.path.isfile(outfile))
+        self.assertGreater(os.path.getsize(outfile), 0)
+
+    def roundtrip(self, mode):
+        if not self._roundtrip:
+            return
+        
+        im = lena(mode)
+        outfile = self.tempfile("temp.palm")
+
+        im.save(outfile)
+        converted = self.open_withImagemagick(outfile)
+        self.assert_image_equal(converted, im)
+        
+
+    def test_monochrome(self):
+        # Arrange
+        mode = "1"
+
+        # Act / Assert
+        self.helper_save_as_palm(mode)
+        self.roundtrip(mode)
+
+    def test_p_mode(self):
+        # Arrange
+        mode = "P"
+
+        # Act / Assert
+        self.helper_save_as_palm(mode)
+        self.skipKnownBadTest("Palm P image is wrong")
+        self.roundtrip(mode)
+        
+    def test_rgb_ioerror(self):
+        # Arrange
+        mode = "RGB"
+
+        # Act / Assert
+        self.assertRaises(IOError, lambda: self.helper_save_as_palm(mode))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file