From ba4b4a5f6f13fb2bc4742c73f4bdb1efcc3e4d35 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Fri, 14 May 2010 12:24:09 +0000
Subject: [PATCH] Do not try to change image format
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35338 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../transforms/oood_commandtransform.py | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/product/ERP5OOo/transforms/oood_commandtransform.py b/product/ERP5OOo/transforms/oood_commandtransform.py
index bdd1e058a8..21ef5a8d1c 100644
--- a/product/ERP5OOo/transforms/oood_commandtransform.py
+++ b/product/ERP5OOo/transforms/oood_commandtransform.py
@@ -111,19 +111,21 @@ class OOOdCommandTransform(commandtransform):
if image is not None:
odt_content_modified = True
content_type = image.getContentType()
- mimetype_list = getToolByName(self.context,
- 'mimetypes_registry').lookup(content_type)
- #Need to improve default format handling
- format = 'png'
- if mimetype_list:
- format = mimetype_list[0].minor()
+ mimetype_list = getToolByName(self.context.getPortalObject(),
+ 'mimetypes_registry').lookup(content_type)
+
+ format = image_parameter_dict.pop('format', None)
+ for mimetype_object in mimetype_list:
+ if mimetype_object.extensions:
+ format = mimetype_object.extensions[0]
+ break
+ elif mimetype_object.globs:
+ format = mimetype_object.globs.strip('*.')
+ break
if getattr(image, 'meta_type', None) == 'ERP5 Image':
#ERP5 API
- if 'format' in image_parameter_dict:
- format = image_parameter_dict.pop('format')
-
- # convert image according parameters
- mime, image_data = image.convert(format, **image_parameter_dict)
+ # resize image according parameters
+ mime, image_data = image.convert(None, **image_parameter_dict)
image = OFSImage(image.getId(), image.getTitle(), image_data)
# image should be OFSImage
--
2.30.9