mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3187 from PySimpleGUI/Dev-latest 

changed convert_to_bytes function to use a context manager for better…
This commit is contained in:
PySimpleGUI 2020-07-25 17:45:38 -04:00 committed by GitHub
parent 21459019bd 7731b07f1f
commit 1678576eb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DemoPrograms/Demo_Image_Elem_Image_Viewer_PIL_Based.py
View File

@ -20,6 +20,7 @@ import base64
""" """
def convert_to_bytes(file_or_bytes, resize=None): def convert_to_bytes(file_or_bytes, resize=None):
''' '''
Will convert into bytes and optionally resize an image that is a file or a base64 bytes object. Will convert into bytes and optionally resize an image that is a file or a base64 bytes object.
@ -34,17 +35,22 @@ def convert_to_bytes(file_or_bytes, resize=None):
if isinstance(file_or_bytes, str): if isinstance(file_or_bytes, str):
img = PIL.Image.open(file_or_bytes) img = PIL.Image.open(file_or_bytes)
else: else:
img = PIL.Image.open(io.BytesIO(base64.b64decode(file_or_bytes))) try:
img = PIL.Image.open(io.BytesIO(base64.b64decode(file_or_bytes)))
except Exception as e:
dataBytesIO = io.BytesIO(file_or_bytes)
img = PIL.Image.open(dataBytesIO)
cur_width, cur_height = img.size cur_width, cur_height = img.size
if resize: if resize:
new_width, new_height = resize new_width, new_height = resize
scale = min(new_height/cur_height, new_width/cur_width) scale = min(new_height/cur_height, new_width/cur_width)
img = img.resize((int(cur_width*scale), int(cur_height*scale)), PIL.Image.ANTIALIAS) img = img.resize((int(cur_width*scale), int(cur_height*scale)), PIL.Image.ANTIALIAS)
bio = io.BytesIO() with io.BytesIO() as bio:
img.save(bio, format="PNG") img.save(bio, format="PNG")
del img del img
return bio.getvalue() return bio.getvalue()
# --------------------------------- Define Layout --------------------------------- # --------------------------------- Define Layout ---------------------------------

8
DemoPrograms/Demo_Matplotlib_Grid_of_Graphs_Using_PIL.py
View File

@ -891,10 +891,10 @@ def convert_to_bytes(file_or_bytes, resize=None):
new_width, new_height = resize new_width, new_height = resize
scale = min(new_height/cur_height, new_width/cur_width) scale = min(new_height/cur_height, new_width/cur_width)
img = img.resize((int(cur_width*scale), int(cur_height*scale)), PIL.Image.ANTIALIAS) img = img.resize((int(cur_width*scale), int(cur_height*scale)), PIL.Image.ANTIALIAS)
bio = io.BytesIO() with io.BytesIO() as bio:
img.save(bio, format="PNG") img.save(bio, format="PNG")
del img del img
return bio.getvalue() return bio.getvalue()