64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From 595178cf57b80b977401460a147602832157b303 Mon Sep 17 00:00:00 2001
|
|
From: Eli Schwartz <eschwartz93@gmail.com>
|
|
Date: Fri, 5 Apr 2019 11:28:45 -0400
|
|
Subject: [PATCH] PIL: remove unnnecessary version check and code fork (#8496)
|
|
|
|
The Image.VERSION variable was deprecated some time ago and is now gone
|
|
entirely. But its only use was to determine whether we were using at
|
|
least the latest version of PIL, or any version of its fork, Pillow. And
|
|
PIL was last developed in 2009 and does not support python3 at all, so
|
|
we are guaranteed to be using Pillow.
|
|
|
|
Moreover, the check does not really matter, as Pillow is guaranteed to
|
|
load any image it opens, without the user doing so manually.
|
|
|
|
Fixes #8495
|
|
---
|
|
.../cinnamon/cinnamon-settings/bin/imtools.py | 27 +------------------
|
|
1 file changed, 1 insertion(+), 26 deletions(-)
|
|
|
|
diff --git a/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py b/files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
|
|
index 05605001f7..c386fe3847 100644
|
|
--- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
|
|
+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
|
|
@@ -620,31 +620,6 @@ def has_transparency(image):
|
|
has_alpha(image)
|
|
|
|
|
|
-if Image.VERSION == '1.1.7':
|
|
-
|
|
- def split(image):
|
|
- """Work around for bug in Pil 1.1.7
|
|
-
|
|
- :param image: input image
|
|
- :type image: PIL image object
|
|
- :returns: the different color bands of the image (eg R, G, B)
|
|
- :rtype: tuple
|
|
- """
|
|
- image.load()
|
|
- return image.split()
|
|
-else:
|
|
-
|
|
- def split(image):
|
|
- """Work around for bug in Pil 1.1.7
|
|
-
|
|
- :param image: input image
|
|
- :type image: PIL image object
|
|
- :returns: the different color bands of the image (eg R, G, B)
|
|
- :rtype: tuple
|
|
- """
|
|
- return image.split()
|
|
-
|
|
-
|
|
def get_alpha(image):
|
|
"""Gets the image alpha band. Can handles P mode images with transpareny.
|
|
Returns a band with all values set to 255 if no alpha band exists.
|
|
@@ -655,7 +630,7 @@ def get_alpha(image):
|
|
:rtype: single band image object
|
|
"""
|
|
if has_alpha(image):
|
|
- return split(image)[-1]
|
|
+ return image.split()[-1]
|
|
if image.mode == 'P' and 'transparency' in image.info:
|
|
return image.convert('RGBA').split()[-1]
|
|
# No alpha layer, create one.
|