python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-28 10:56:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6368 from radarhere/fpx

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-06-16 12:03:54 +03:00 committed by GitHub
commit b3bc4a7bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/input_bw_one_band.fpx Normal file
View File

Binary file not shown.

BIN
Tests/images/input_bw_one_band.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 477 B

11
Tests/test_file_fpx.py
View File

@ -2,11 +2,22 @@ import pytest
from PIL import Image from PIL import Image
from .helper import assert_image_equal_tofile
FpxImagePlugin = pytest.importorskip( FpxImagePlugin = pytest.importorskip(
"PIL.FpxImagePlugin", reason="olefile not installed" "PIL.FpxImagePlugin", reason="olefile not installed"
) )
def test_sanity():
with Image.open("Tests/images/input_bw_one_band.fpx") as im:
assert im.mode == "L"
assert im.size == (70, 46)
assert im.format == "FPX"
assert_image_equal_tofile(im, "Tests/images/input_bw_one_band.png")
def test_invalid_file(): def test_invalid_file():
# Test an invalid OLE file # Test an invalid OLE file
invalid_file = "Tests/images/flower.jpg" invalid_file = "Tests/images/flower.jpg"

9
src/PIL/FpxImagePlugin.py
View File

@ -154,13 +154,16 @@ class FpxImageFile(ImageFile.ImageFile):
for i in range(0, len(s), length): for i in range(0, len(s), length):
x1 = min(xsize, x + xtile)
y1 = min(ysize, y + ytile)
compression = i32(s, i + 8) compression = i32(s, i + 8)
if compression == 0: if compression == 0:
self.tile.append( self.tile.append(
( (
"raw", "raw",
(x, y, x + xtile, y + ytile), (x, y, x1, y1),
i32(s, i) + 28, i32(s, i) + 28,
(self.rawmode,), (self.rawmode,),
) )
@ -172,7 +175,7 @@ class FpxImageFile(ImageFile.ImageFile):
self.tile.append( self.tile.append(
( (
"fill", "fill",
(x, y, x + xtile, y + ytile), (x, y, x1, y1),
i32(s, i) + 28, i32(s, i) + 28,
(self.rawmode, s[12:16]), (self.rawmode, s[12:16]),
) )
@ -201,7 +204,7 @@ class FpxImageFile(ImageFile.ImageFile):
self.tile.append( self.tile.append(
( (
"jpeg", "jpeg",
(x, y, x + xtile, y + ytile), (x, y, x1, y1),
i32(s, i) + 28, i32(s, i) + 28,
(rawmode, jpegmode), (rawmode, jpegmode),
) )