X-Git-Url: https://svn.cri.ensmp.fr/git/Photo.git/blobdiff_plain/a18ca54d896fa2f98cf2b7fb8955120ff5e0aa37..b0a7e10b4f32cf74864bb53268ca4d3080f23bc0:/Photo.py?ds=inline

diff --git a/Photo.py b/Photo.py
index 2161eaf..787e4ee 100755
--- a/Photo.py
+++ b/Photo.py
@@ -19,8 +19,8 @@
 #######################################################################################
 """ Photo zope object
 
-$Id: Photo.py 1281 2009-08-13 10:44:40Z pin $
-$URL: http://svn.luxia.fr/svn/labo/projects/zope/Photo/trunk/Photo.py $
+
+
 """
 
 from Globals import InitializeClass, DTMLFile
@@ -118,12 +118,11 @@ class Photo(Image, TileSupport, Metadata):
 		# 2 means: tiling is not available is this photo (deliberated choice of the owner)
 		# -1 means: no data tiles cannot be generated
 		self.tiles_available = 0
-		super(Photo, self).__init__(id, title, file, content_type='', precondition='')
-
 		self.auto_update_thumb = kw.get('auto_update_thumb', 1)
 		self.thumb_height = kw.get('thumb_height', 180)
-		self.thumb_width = kw.get('thumb_width', 120)
+		self.thumb_width = kw.get('thumb_width', 180)
 		self.prop_filter = kw.get('prop_filter', 'ANTIALIAS')
+		super(Photo, self).__init__(id, title, file, content_type='', precondition='')
 
 		defaultBlankThumbnail = kw.get('defaultBlankThumbnail', None)
 		if defaultBlankThumbnail :
@@ -194,7 +193,7 @@ class Photo(Image, TileSupport, Metadata):
 	
 	def _rotateOrFlip(self, im) :
 		orientation = self.tiffOrientation()
-		rotation, flip = TIFF_ORIENTATIONS[orientation]
+		rotation, flip = TIFF_ORIENTATIONS.get(orientation, (0, False))
 		if rotation :
 			im = im.rotate(-rotation)
 		if flip :