mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 03:18:57 +03:00
23a847c532
The DIB image format uses the 40 byte BMP header, followed by 3 masks for RGB channels. We were reading 4 masks, consuming the first pixel of the image. Mostly fixes issue #1293. Remaining issue: alpha channel is actually a transparency mask.
85 lines
2.3 KiB
Python
85 lines
2.3 KiB
Python
from helper import unittest, PillowTestCase, hopper
|
|
|
|
from PIL import Image, BmpImagePlugin
|
|
import io
|
|
|
|
|
|
class TestFileBmp(PillowTestCase):
|
|
|
|
def roundtrip(self, im):
|
|
outfile = self.tempfile("temp.bmp")
|
|
|
|
im.save(outfile, 'BMP')
|
|
|
|
reloaded = Image.open(outfile)
|
|
reloaded.load()
|
|
self.assertEqual(im.mode, reloaded.mode)
|
|
self.assertEqual(im.size, reloaded.size)
|
|
self.assertEqual(reloaded.format, "BMP")
|
|
|
|
def test_sanity(self):
|
|
self.roundtrip(hopper())
|
|
|
|
self.roundtrip(hopper("1"))
|
|
self.roundtrip(hopper("L"))
|
|
self.roundtrip(hopper("P"))
|
|
self.roundtrip(hopper("RGB"))
|
|
|
|
def test_invalid_file(self):
|
|
with open("Tests/images/flower.jpg", "rb") as fp:
|
|
self.assertRaises(SyntaxError,
|
|
lambda: BmpImagePlugin.BmpImageFile(fp))
|
|
|
|
def test_save_to_bytes(self):
|
|
output = io.BytesIO()
|
|
im = hopper()
|
|
im.save(output, "BMP")
|
|
|
|
output.seek(0)
|
|
reloaded = Image.open(output)
|
|
|
|
self.assertEqual(im.mode, reloaded.mode)
|
|
self.assertEqual(im.size, reloaded.size)
|
|
self.assertEqual(reloaded.format, "BMP")
|
|
|
|
def test_dpi(self):
|
|
dpi = (72, 72)
|
|
|
|
output = io.BytesIO()
|
|
im = hopper()
|
|
im.save(output, "BMP", dpi=dpi)
|
|
|
|
output.seek(0)
|
|
reloaded = Image.open(output)
|
|
|
|
self.assertEqual(reloaded.info["dpi"], dpi)
|
|
|
|
def test_save_bmp_with_dpi(self):
|
|
# Test for #1301
|
|
# Arrange
|
|
outfile = self.tempfile("temp.jpg")
|
|
im = Image.open("Tests/images/hopper.bmp")
|
|
|
|
# Act
|
|
im.save(outfile, 'JPEG', dpi=im.info['dpi'])
|
|
|
|
# Assert
|
|
reloaded = Image.open(outfile)
|
|
reloaded.load()
|
|
self.assertEqual(im.info['dpi'], reloaded.info['dpi'])
|
|
self.assertEqual(im.size, reloaded.size)
|
|
self.assertEqual(reloaded.format, "JPEG")
|
|
|
|
def test_load_dib(self):
|
|
# test for #1293, Imagegrab returning Unsupported Bitfields Format
|
|
im = BmpImagePlugin.DibImageFile('Tests/images/clipboard.dib')
|
|
target = Image.open('Tests/images/clipboard_target.png')
|
|
self.assert_image_equal(im.convert('RGB'), target.convert('RGB'))
|
|
self.assert_image_similar(im, target, 1)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|
|
|
|
# End of file
|