pygeek
diff --git a/‎sorl/thumbnail/engines/base.py
Lines changed: 2 additions & 0 deletions b/‎sorl/thumbnail/engines/base.py
Lines changed: 2 additions & 0 deletions
diff --git a/‎sorl/thumbnail/engines/convert_engine.py
Lines changed: 2 additions & 0 deletions b/‎sorl/thumbnail/engines/convert_engine.py
Lines changed: 2 additions & 0 deletions
diff --git a/‎tests/thumbnail_tests/tests.py
Lines changed: 10 additions & 0 deletions b/‎tests/thumbnail_tests/tests.py
Lines changed: 10 additions & 0 deletions
@@ -57,6 +57,8 @@ def crop(self, image, geometry, options):
         if not crop or crop == 'noop':
             return image
         x_image, y_image = self.get_image_size(image)
+        if geometry[0] > x_image or geometry[1] > y_image:
+            return image
         x_offset, y_offset = parse_crop(crop, (x_image, y_image), geometry)
         return self._crop(image, geometry[0], geometry[1], x_offset, y_offset)
 
 
@@ -85,6 +85,8 @@ def is_valid_image(self, raw_data):
         return retcode == 0
 
     def _orientation(self, image):
+        return image
+        # XXX need to get the dimensions right after a transpose.
         if settings.THUMBNAIL_CONVERT.endswith('gm convert'):
             args = settings.THUMBNAIL_IDENTIFY.split()
             args.extend([ '-format', '%[exif:orientation]', image['source'] ])
 
@@ -105,6 +105,7 @@ def setUp(self):
         dims = [
             (500, 500),
             (100, 100),
+            (200, 100),
         ]
         for dim in dims:
             name = '%sx%s.jpg' % dim
@@ -136,6 +137,15 @@ def testUpscale(self):
         self.assertEqual(t.x, 300)
         self.assertEqual(t.y, 300)
 
+    def testUpscaleCrop(self):
+        item = Item.objects.get(image='200x100.jpg')
+        t = self.backend.get_thumbnail(item.image, '400x300', crop='center', upscale=False)
+        self.assertEqual(t.x, 200)
+        self.assertEqual(t.y, 100)
+        t = self.backend.get_thumbnail(item.image, '400x300', crop='center', upscale=True)
+        self.assertEqual(t.x, 400)
+        self.assertEqual(t.y, 300)
+
     def testKVStore(self):
         im = ImageFile(Item.objects.get(image='500x500.jpg').image)
         self.kvstore.delete_thumbnails(im)