python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-01 02:13:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
wiredfool 2025-04-17 22:22:31 +01:00
parent c729d4e208
commit ac500460df
2 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Tests/test_pyarrow.py
View File

@ -9,8 +9,8 @@ from PIL import Image
from .helper import ( from .helper import (
assert_deep_equal, assert_deep_equal,
assert_image_equal, assert_image_equal,
is_big_endian,
hopper, hopper,
is_big_endian,
) )
pyarrow = pytest.importorskip("pyarrow", reason="PyArrow not installed") pyarrow = pytest.importorskip("pyarrow", reason="PyArrow not installed")
@ -37,7 +37,10 @@ def _test_img_equals_pyarray(
if elts_per_pixel == 1: if elts_per_pixel == 1:
assert pixel[ix] == arr[y * img.width + x].as_py()[elt] assert pixel[ix] == arr[y * img.width + x].as_py()[elt]
else: else:
assert pixel[ix] == arr[(y * img.width + x) * elts_per_pixel + elt].as_py() assert (
pixel[ix]
== arr[(y * img.width + x) * elts_per_pixel + elt].as_py()
)
else: else:
assert_deep_equal(px[x, y], arr[y * img.width + x].as_py()) assert_deep_equal(px[x, y], arr[y * img.width + x].as_py())
@ -169,33 +172,27 @@ INT32 = (
"mode, data_tp, mask", "mode, data_tp, mask",
( (
("L", (pyarrow.uint8(), 3, 1), None), ("L", (pyarrow.uint8(), 3, 1), None),
("I", (pyarrow.int32(), 1<<24, 1), None), ("I", (pyarrow.int32(), 1 << 24, 1), None),
("F", (pyarrow.float32(), 3.14159, 1), None), ("F", (pyarrow.float32(), 3.14159, 1), None),
("LA", UINT_ARR, [0, 3]), ("LA", UINT_ARR, [0, 3]),
("LA", UINT, [0, 3]), ("LA", UINT, [0, 3]),
("RGB", UINT_ARR, [0, 1, 2]), ("RGB", UINT_ARR, [0, 1, 2]),
("RGBA", UINT_ARR, None), ("RGBA", UINT_ARR, None),
("RGBA", UINT_ARR, None),
("CMYK", UINT_ARR, None), ("CMYK", UINT_ARR, None),
("YCbCr", UINT_ARR, [0, 1, 2]), ("YCbCr", UINT_ARR, [0, 1, 2]),
("HSV", UINT_ARR, [0, 1, 2]), ("HSV", UINT_ARR, [0, 1, 2]),
("RGB", UINT, [0, 1, 2]), ("RGB", UINT, [0, 1, 2]),
("RGBA", UINT, None), ("RGBA", UINT, None),
("RGBA", UINT, None),
("CMYK", UINT, None), ("CMYK", UINT, None),
("YCbCr", UINT, [0, 1, 2]), ("YCbCr", UINT, [0, 1, 2]),
("HSV", UINT, [0, 1, 2]), ("HSV", UINT, [0, 1, 2]),
), ),
) )
def test_fromarray(mode: str, def test_fromarray(mode: str, data_tp: tuple, mask: list[int] | None) -> None:
data_tp: tuple, (dtype, elt, elts_per_pixel) = data_tp
mask:list[int] | None) -> None:
(dtype,
elt,
elts_per_pixel) = data_tp
ct_pixels = TEST_IMAGE_SIZE[0] * TEST_IMAGE_SIZE[1] ct_pixels = TEST_IMAGE_SIZE[0] * TEST_IMAGE_SIZE[1]
arr = pyarrow.array([elt]*(ct_pixels*elts_per_pixel), type=dtype) arr = pyarrow.array([elt] * (ct_pixels * elts_per_pixel), type=dtype)
img = Image.fromarrow(arr, mode, TEST_IMAGE_SIZE) img = Image.fromarrow(arr, mode, TEST_IMAGE_SIZE)
_test_img_equals_pyarray(img, arr, mask, elts_per_pixel) _test_img_equals_pyarray(img, arr, mask, elts_per_pixel)
@ -207,21 +204,16 @@ def test_fromarray(mode: str,
("LA", INT32, [0, 3]), ("LA", INT32, [0, 3]),
("RGB", INT32, [0, 1, 2]), ("RGB", INT32, [0, 1, 2]),
("RGBA", INT32, None), ("RGBA", INT32, None),
("RGBA", INT32, None),
("CMYK", INT32, None), ("CMYK", INT32, None),
("YCbCr", INT32, [0, 1, 2]), ("YCbCr", INT32, [0, 1, 2]),
("HSV", INT32, [0, 1, 2]), ("HSV", INT32, [0, 1, 2]),
), ),
) )
def test_from_int32array(mode: str, def test_from_int32array(mode: str, data_tp: tuple, mask: list[int] | None) -> None:
data_tp: tuple, (dtype, elt, elts_per_pixel) = data_tp
mask:list[int] | None) -> None:
(dtype,
elt,
elts_per_pixel) = data_tp
ct_pixels = TEST_IMAGE_SIZE[0] * TEST_IMAGE_SIZE[1] ct_pixels = TEST_IMAGE_SIZE[0] * TEST_IMAGE_SIZE[1]
arr = pyarrow.array([elt]*(ct_pixels*elts_per_pixel), type=dtype) arr = pyarrow.array([elt] * (ct_pixels * elts_per_pixel), type=dtype)
img = Image.fromarrow(arr, mode, TEST_IMAGE_SIZE) img = Image.fromarrow(arr, mode, TEST_IMAGE_SIZE)
_test_img_equals_int32_pyarray(img, arr, mask, elts_per_pixel) _test_img_equals_int32_pyarray(img, arr, mask, elts_per_pixel)

10
src/libImaging/Storage.c
View File

@ -754,11 +754,11 @@ ImagingNewArrow(
} }
} }
// Stored as [r,g,b,a,r,g,b,a....] // Stored as [r,g,b,a,r,g,b,a....]
if (strcmp(schema->format, "C") == 0 // uint8 if (strcmp(schema->format, "C") == 0 // uint8
&& im->pixelsize == 4 // storage as 32 bpc && im->pixelsize == 4 // storage as 32 bpc
&& schema->n_children == 0 // make sure schema is well formed. && schema->n_children == 0 // make sure schema is well formed.
&& strcmp(im->arrow_band_format, "C") == 0 // Expected Format && strcmp(im->arrow_band_format, "C") == 0 // Expected Format
&& 4* pixels == external_array->length) { // expected length && 4 * pixels == external_array->length) { // expected length
// single flat array, interleaved storage. // single flat array, interleaved storage.
if (ImagingBorrowArrow(im, external_array, 1, array_capsule)) { if (ImagingBorrowArrow(im, external_array, 1, array_capsule)) {
return im; return im;