diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-12 11:57:52 -0500 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-16 15:30:17 -0700 |
| commit | af51c423fb4c808b46afbec12d3aa832c53c0034 (patch) | |
| tree | c7981505a7d4c61283a4f53173fb909e72aa3eed /mediagoblin | |
| parent | 916db96edba66a4deb0ec290e378031a85e2e7e0 (diff) | |
| download | mediagoblin-af51c423fb4c808b46afbec12d3aa832c53c0034.tar.lz mediagoblin-af51c423fb4c808b46afbec12d3aa832c53c0034.tar.xz mediagoblin-af51c423fb4c808b46afbec12d3aa832c53c0034.zip | |
Fix (by Rodney Ewing) for processing, specifically the way resize_tool was being called
Thanks for fixing, Rodney :)
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/media_types/image/processing.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 6c6c7708..01e5cce5 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -82,11 +82,8 @@ def resize_image(entry, resized, keyname, target_name, new_size, def resize_tool(entry, - force, keyname, target_name, + force, keyname, orig_file, target_name, 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 if not new_size: max_width = mgg.global_config['media:' + keyname]['max_width'] @@ -98,7 +95,7 @@ def resize_tool(entry, # entry. # Also created if the file needs rotation, or if forced. try: - im = Image.open(filename) + im = Image.open(orig_file) except IOError: raise BadMediaFail() if force \ |