Changeset 165:6811f8d6cb25 for cachers

Timestamp:

08/23/07 15:23:15 (11 months ago)

Author:

mercurial@…

Message:

merge

Location:

cachers

Files:

• cached_image.py (modified) (1 diff)
• thumbnail.py (modified) (2 diffs)

cachers/cached_image.py

@@ -5 +5 @@
 from StringIO import StringIO
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s %(levelname)s %(message)s',
-                    filename='cached.log',
-                    filemode='w')
+#logging.basicConfig(level=logging.DEBUG,
+#                    format='%(asctime)s %(levelname)s %(message)s',
+#                    filename='cached.log',
+#                    filemode='w')
 
 console = logging.StreamHandler()

cachers/thumbnail.py

@@ -27 +27 @@
 def _new_size(image, width, height, scale):
     """calculate new size"""
+    if width == -1:
+        width = None
+    if height == -1:
+        height = None  
     img_width, img_height = image.size
     if width is None and height is None and scale is None:
         return image.size
+
+    if width is not None and height is not None:
+        return width, height
 
     if width is not None or height is not None:
@@ -49 +56 @@
     width, height = _new_size(image, width, height, scale)
 
-    image.thumbnail((width, height), Image.ANTIALIAS)
+    #image.thumbnail((width, height), Image.ANTIALIAS)
+    #image.resize((width, height), Image.ANTIALIAS)
+    image.load()
+    image = image._new(image.im.stretch((width, height), Image.NEAREST))
 
     data = StringIO()