BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-23 14:24:19 +00:00
Code Releases Wiki Activity

Fix black shapes appearing round transparent images

Browse Source
This commit is contained in:
Daniel Grana 2010-09-16 14:19:32 -03:00
parent 4cecbcdc5b
commit cad077574b
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scrapy/contrib/pipeline/images.py
View File

@ -272,7 +272,11 @@ class ImagesPipeline(MediaPipeline):
stats.inc_value('image_status_count/%s' % status, spider=spider) stats.inc_value('image_status_count/%s' % status, spider=spider)
def convert_image(self, image, size=None): def convert_image(self, image, size=None):
if image.mode != 'RGB': if image.format == 'PNG' and image.mode == 'RGBA':
background = Image.new('RGBA', image.size, (255, 255, 255))
background.paste(image, image)
image = background.convert('RGB')
elif image.mode != 'RGB':
image = image.convert('RGB') image = image.convert('RGB')
if size: if size:

46
scrapy/tests/test_pipeline_images.py
View File

@ -1,4 +1,5 @@
import os import os
from cStringIO import StringIO
from tempfile import mkdtemp from tempfile import mkdtemp
from shutil import rmtree from shutil import rmtree
@ -7,13 +8,18 @@ from twisted.trial import unittest
from scrapy.crawler import Crawler from scrapy.crawler import Crawler
from scrapy.conf import settings from scrapy.conf import settings
try:
import Image
skip = False
except ImportError, e:
skip = True
class ImagesPipelineTestCase(unittest.TestCase): class ImagesPipelineTestCase(unittest.TestCase):
skip = skip
def setUp(self): def setUp(self):
try:
import Image
except ImportError, e:
raise unittest.SkipTest(e)
from scrapy.contrib.pipeline.images import ImagesPipeline from scrapy.contrib.pipeline.images import ImagesPipeline
self.crawler = Crawler(settings) self.crawler = Crawler(settings)
@ -59,8 +65,36 @@ class ImagesPipelineTestCase(unittest.TestCase):
key = 'some/image/key.jpg' key = 'some/image/key.jpg'
path = os.path.join(self.tempdir, 'some', 'image', 'key.jpg') path = os.path.join(self.tempdir, 'some', 'image', 'key.jpg')
self.assertEqual(self.pipeline.store._get_filesystem_path(key), self.assertEqual(self.pipeline.store._get_filesystem_path(key), path)
path)
def test_convert_image(self):
SIZE = (100, 100)
# straigh forward case: RGB and JPEG
COLOUR = (0, 127, 255)
im = _create_image('JPEG', 'RGB', SIZE, COLOUR)
converted, _ = self.pipeline.convert_image(im)
self.assertEquals(converted.mode, 'RGB')
self.assertEquals(converted.getcolors(), [(10000, COLOUR)])
# check that thumbnail keep image ratio
thumbnail, _ = self.pipeline.convert_image(converted, size=(10, 25))
self.assertEquals(thumbnail.mode, 'RGB')
self.assertEquals(thumbnail.size, (10, 10))
# transparency case: RGBA and PNG
COLOUR = (0, 127, 255, 50)
im = _create_image('PNG', 'RGBA', SIZE, COLOUR)
converted, _ = self.pipeline.convert_image(im)
self.assertEquals(converted.mode, 'RGB')
self.assertEquals(converted.getcolors(), [(10000, (205, 230, 255))])
def _create_image(format, *a, **kw):
buf = StringIO()
Image.new(*a, **kw).save(buf, format)
buf.seek(0)
return Image.open(buf)
if __name__ == "__main__": if __name__ == "__main__":