aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoar Wandborg <joar@wandborg.se>2013-01-22 23:02:06 +0100
committerJoar Wandborg <joar@wandborg.se>2013-01-22 23:28:17 +0100
commitd63cc34e7122a9d34fbc36967365ecfef6761f24 (patch)
tree83fdd2f0d04b3a35913a5024ef097e01790083d1
parent124081040b37c665c69d20f7cb55a7a81f091f78 (diff)
downloadmediagoblin-d63cc34e7122a9d34fbc36967365ecfef6761f24.tar.lz
mediagoblin-d63cc34e7122a9d34fbc36967365ecfef6761f24.tar.xz
mediagoblin-d63cc34e7122a9d34fbc36967365ecfef6761f24.zip
Made pil_filters a PIL_FILTERS (global)
-rw-r--r--mediagoblin/media_types/image/processing.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index f5fb9a72..99be848f 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -28,6 +28,12 @@ from mediagoblin.tools.exif import exif_fix_image_orientation, \
_log = logging.getLogger(__name__)
+PIL_FILTERS = {
+ 'NEAREST': Image.NEAREST,
+ 'BILINEAR': Image.BILINEAR,
+ 'BICUBIC': Image.BICUBIC,
+ 'ANTIALIAS': Image.ANTIALIAS}
+
def resize_image(entry, filename, new_path, exif_tags, workdir, new_size,
size_limits=(0, 0)):
@@ -48,22 +54,16 @@ def resize_image(entry, filename, new_path, exif_tags, workdir, new_size,
raise BadMediaFail()
resized = exif_fix_image_orientation(resized, exif_tags) # Fix orientation
- pil_filters = {
- 'NEAREST': Image.NEAREST,
- 'BILINEAR': Image.BILINEAR,
- 'BICUBIC': Image.BICUBIC,
- 'ANTIALIAS': Image.ANTIALIAS}
-
filter_config = \
mgg.global_config['media_type:mediagoblin.media_types.image']\
['resize_filter']
try:
- resize_filter = pil_filters[filter_config.upper()]
+ resize_filter = PIL_FILTERS[filter_config.upper()]
except KeyError:
raise Exception('Filter "{0}" not found, choose one of {1}'.format(
unicode(filter_config),
- u', '.join(pil_filters.keys())))
+ u', '.join(PIL_FILTERS.keys())))
resized.thumbnail(new_size, resize_filter)