image.save() checks if transparency is int

sq9mev · Mar 12, 2012 · cd718fa · cd718fa
1 parent 63add48
commit cd718fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/TileCache/.gitignore b/TileCache/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/TileCache/Layer.py b/TileCache/Layer.py
@@ -431,7 +431,7 @@ def renderMetaTile (self, metatile, tile):
                 miny = maxy - self.size[1]
                 subimage = image.crop((minx, miny, maxx, maxy))
                 buffer = StringIO.StringIO()
-                if image.info.has_key('transparency'): 
+                if image.info.has_key('transparency') and isinstance(image.info['transparency'], int):
                     subimage.save(buffer, self.extension, transparency=image.info['transparency'])
                 else:
                     subimage.save(buffer, self.extension)
@@ -485,7 +485,7 @@ def watermark (self, img):
         watermarkedImage.paste(wmark, (0,0))
         watermarkedImage = Image.composite(watermarkedImage, tileImage, watermarkedImage)
         buffer = StringIO.StringIO()
-        if watermarkedImage.info.has_key('transparency'):
+        if watermarkedImage.info.has_key('transparency') and isinstance(watermarkedImage.info['transparency'], int):
             watermarkedImage.save(buffer, self.extension, transparency=compositeImage.info['transparency'])
         else:
             watermarkedImage.save(buffer, self.extension)

diff --git a/TileCache/Layers/Image.py b/TileCache/Layers/Image.py
@@ -61,7 +61,7 @@ def renderTile(self, tile):
         sub = sub.resize(size, scaling)
 
         buffer = StringIO.StringIO()
-        if self.image.info.has_key('transparency'):
+        if self.image.info.has_key('transparency') and isinstance(self.image.info['transparency'], int):
             sub.save(buffer, self.extension, transparency=self.image.info['transparency'])
         else:
             sub.save(buffer, self.extension)