changeset 587:1b06afc3a430

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Mon, 16 Apr 2012 16:56:57 +0200
parents d6a7c36f06f5 (current diff) 588965ee2c63 (diff)
children 50f81f786081
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/macro/Image.py	Fri Mar 30 09:21:24 2012 +0200
+++ b/data/plugin/macro/Image.py	Mon Apr 16 16:56:57 2012 +0200
@@ -170,9 +170,9 @@
         """
         if content_type is None:
             content_type = self.content_type
-        if content_type == 'image/jpeg':
+        if content_type in ('image/jpeg', 'image/pjpeg'):
             output_type = 'JPEG'
-        elif content_type == 'image/png':
+        elif content_type in ('image/png', 'image/x-png'):
             output_type = 'PNG'
         elif content_type == 'image/gif':
             output_type = 'GIF'