heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix (by Rodney Ewing) for processing, specifically the way resize_tool was being called

Browse Source 
Thanks for fixing, Rodney :)
This commit is contained in:
Christopher Allan Webber 2013-08-12 11:57:52 -05:00 committed by Rodney Ewing
parent 916db96edb
commit af51c423fb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/media_types/image/processing.py
View File

@ -82,11 +82,8 @@ def resize_image(entry, resized, keyname, target_name, new_size,
def resize_tool(entry, def resize_tool(entry,
force, keyname, target_name, force, keyname, orig_file, target_name,
conversions_subdir, exif_tags, new_size=None): conversions_subdir, exif_tags, new_size=None):
# filename -- the filename of the original image being resized
filename = target_name
# Use the default size if new_size was not given # Use the default size if new_size was not given
if not new_size: if not new_size:
max_width = mgg.global_config['media:' + keyname]['max_width'] max_width = mgg.global_config['media:' + keyname]['max_width']
@ -98,7 +95,7 @@ def resize_tool(entry,
# entry. # entry.
# Also created if the file needs rotation, or if forced. # Also created if the file needs rotation, or if forced.
try: try:
im = Image.open(filename) im = Image.open(orig_file)
except IOError: except IOError:
raise BadMediaFail() raise BadMediaFail()
if force \ if force \