mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-30 22:48:07 -07:00
dev-python/pillow: remove unused patches.
This commit is contained in:
Michael Mair-Keimberger (asterix)
committed by
Patrice Clement
Patrice Clement
parent
0b8b7419b6
commit
51fe8cc459
@@ -1,36 +0,0 @@
|
||||
PIL/IcoImagePlugin.py | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/PIL/IcoImagePlugin.py b/PIL/IcoImagePlugin.py
|
||||
index b4817db..dff4efc 100644
|
||||
--- a/PIL/IcoImagePlugin.py
|
||||
+++ b/PIL/IcoImagePlugin.py
|
||||
@@ -49,7 +49,7 @@ def _save(im, fp, filename):
|
||||
filter(lambda x: False if (x[0] > width or x[1] > height or
|
||||
x[0] > 255 or x[1] > 255) else True, sizes)
|
||||
sizes = sorted(sizes, key=lambda x: x[0])
|
||||
- fp.write(struct.pack("H", len(sizes))) # idCount(2)
|
||||
+ fp.write(struct.pack("<H", len(sizes))) # idCount(2)
|
||||
offset = fp.tell() + len(sizes)*16
|
||||
for size in sizes:
|
||||
width, height = size
|
||||
@@ -58,7 +58,7 @@ def _save(im, fp, filename):
|
||||
fp.write(b"\0") # bColorCount(1)
|
||||
fp.write(b"\0") # bReserved(1)
|
||||
fp.write(b"\0\0") # wPlanes(2)
|
||||
- fp.write(struct.pack("H", 32)) # wBitCount(2)
|
||||
+ fp.write(struct.pack("<H", 32)) # wBitCount(2)
|
||||
|
||||
image_io = BytesIO()
|
||||
tmp = im.copy()
|
||||
@@ -67,8 +67,8 @@ def _save(im, fp, filename):
|
||||
image_io.seek(0)
|
||||
image_bytes = image_io.read()
|
||||
bytes_len = len(image_bytes)
|
||||
- fp.write(struct.pack("I", bytes_len)) # dwBytesInRes(4)
|
||||
- fp.write(struct.pack("I", offset)) # dwImageOffset(4)
|
||||
+ fp.write(struct.pack("<I", bytes_len)) # dwBytesInRes(4)
|
||||
+ fp.write(struct.pack("<I", offset)) # dwImageOffset(4)
|
||||
current = fp.tell()
|
||||
fp.seek(offset)
|
||||
fp.write(image_bytes)
|
||||
@@ -1,39 +0,0 @@
|
||||
From e0cb8f945e22d4f714f1c1de3aa04b3db39c5679 Mon Sep 17 00:00:00 2001
|
||||
From: wiredfool <eric-github@soroos.net>
|
||||
Date: Sat, 3 Oct 2015 22:46:01 +0100
|
||||
Subject: [PATCH] Flatten sampleformat to initial value, fixes #1466
|
||||
|
||||
---
|
||||
PIL/TiffImagePlugin.py | 9 +++++++--
|
||||
Tests/images/copyleft.tiff | Bin 0 -> 7926 bytes
|
||||
Tests/test_file_tiff.py | 5 +++++
|
||||
3 files changed, 12 insertions(+), 2 deletions(-)
|
||||
create mode 100644 Tests/images/copyleft.tiff
|
||||
|
||||
diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
|
||||
index 1f97422..a84d017 100644
|
||||
--- a/PIL/TiffImagePlugin.py
|
||||
+++ b/PIL/TiffImagePlugin.py
|
||||
@@ -180,8 +180,6 @@
|
||||
(MM, 2, (1,), 1, (8, 8, 8, 8), (2,)): ("RGBA", "RGBA"),
|
||||
(II, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10
|
||||
(MM, 2, (1,), 1, (8, 8, 8, 8), (999,)): ("RGBA", "RGBA"), # Corel Draw 10
|
||||
- (II, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab
|
||||
- (MM, 2, (1, 1, 1, 1), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBA"), # OSX Grab
|
||||
(II, 3, (1,), 1, (1,), ()): ("P", "P;1"),
|
||||
(MM, 3, (1,), 1, (1,), ()): ("P", "P;1"),
|
||||
(II, 3, (1,), 2, (1,), ()): ("P", "P;1R"),
|
||||
@@ -967,6 +965,13 @@ def _setup(self):
|
||||
print("- size:", self.size)
|
||||
|
||||
format = self.tag_v2.get(SAMPLEFORMAT, (1,))
|
||||
+ if len(format) > 1 and max(format) == min(format) == 1:
|
||||
+ # SAMPLEFORMAT is properly per band, so an RGB image will
|
||||
+ # be (1,1,1). But, we don't support per band pixel types,
|
||||
+ # and anything more than one band is a uint8. So, just
|
||||
+ # take the first element. Revisit this if adding support
|
||||
+ # for more exotic images.
|
||||
+ format = (1,)
|
||||
|
||||
# mode: check photometric interpretation and bits per pixel
|
||||
key = (
|
||||
@@ -1,63 +0,0 @@
|
||||
Tests/test_imagefont.py | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
|
||||
index dd22344..d0a0826 100644
|
||||
--- a/Tests/test_imagefont.py
|
||||
+++ b/Tests/test_imagefont.py
|
||||
@@ -112,6 +112,7 @@ try:
|
||||
self.assert_image_equal(img_path, img_filelike)
|
||||
self._clean()
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259")
|
||||
def test_textsize_equal(self):
|
||||
im = Image.new(mode='RGB', size=(300, 100))
|
||||
draw = ImageDraw.Draw(im)
|
||||
@@ -126,6 +127,7 @@ try:
|
||||
target_img = Image.open(target)
|
||||
self.assert_image_similar(im, target_img, .5)
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259")
|
||||
def test_render_multiline(self):
|
||||
im = Image.new(mode='RGB', size=(300, 100))
|
||||
draw = ImageDraw.Draw(im)
|
||||
@@ -145,6 +147,7 @@ try:
|
||||
# at epsilon = ~38.
|
||||
self.assert_image_similar(im, target_img, .5)
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259")
|
||||
def test_render_multiline_text(self):
|
||||
ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
|
||||
|
||||
@@ -200,6 +203,7 @@ try:
|
||||
draw.multiline_textsize("longest line\nline",
|
||||
font=ttf)[0])
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1259")
|
||||
def test_multiline_spacing(self):
|
||||
ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
|
||||
|
||||
@@ -255,6 +259,7 @@ try:
|
||||
# Check boxes a and b are same size
|
||||
self.assertEqual(box_size_a, box_size_b)
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456")
|
||||
def test_rotated_transposed_font_get_mask(self):
|
||||
# Arrange
|
||||
text = "mask this"
|
||||
@@ -269,6 +274,7 @@ try:
|
||||
# Assert
|
||||
self.assertEqual(mask.size, (13, 108))
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456")
|
||||
def test_unrotated_transposed_font_get_mask(self):
|
||||
# Arrange
|
||||
text = "mask this"
|
||||
@@ -316,6 +322,7 @@ try:
|
||||
# Assert
|
||||
self.assertEqual(offset, (0, 3))
|
||||
|
||||
+ @unittest.skip("https://github.com/python-pillow/Pillow/issues/1456")
|
||||
def test_free_type_font_get_mask(self):
|
||||
# Arrange
|
||||
font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
|
||||
Reference in New Issue
Block a user