Commit 72508a8d authored by comfyanonymous's avatar comfyanonymous
Browse files

Only set LOAD_TRUNCATED_IMAGES when if the Image open fails.

Document which PIL issues this works around.
parent 0d45efb7
from PIL import Image, ImageFile from PIL import Image, ImageFile, UnidentifiedImageError
def conditioning_set_values(conditioning, values={}): def conditioning_set_values(conditioning, values={}):
c = [] c = []
...@@ -11,14 +11,15 @@ def conditioning_set_values(conditioning, values={}): ...@@ -11,14 +11,15 @@ def conditioning_set_values(conditioning, values={}):
return c return c
def open_image(path): def open_image(path):
try : prev_value = None
ImageFile.LOAD_TRUNCATED_IMAGES = False
try:
img = Image.open(path) img = Image.open(path)
except (UnidentifiedImageError, ValueError): #PIL issues #4472 and #2445
except: prev_value = ImageFile.LOAD_TRUNCATED_IMAGES
ImageFile.LOAD_TRUNCATED_IMAGES = True ImageFile.LOAD_TRUNCATED_IMAGES = True
img = Image.open(path) img = Image.open(path)
finally: finally:
ImageFile.LOAD_TRUNCATED_IMAGES = False if prev_value is not None:
ImageFile.LOAD_TRUNCATED_IMAGES = prev_value
return img return img
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment