Ticket #8307: images.1.diff

images.py

@@ -21 +21 @@
 
     def _get_image_dimensions(self):
         if not hasattr(self, '_dimensions_cache'):
-            self._dimensions_cache = get_image_dimensions(self)
+            if self.field.width_field and self.field.height_field:
+                width = getattr(self.instance, self.field.width_field)
+                height = getattr(self.instance, self.field.height_field)
+                #check if the fields have proper values
+                if isinstance(width,int) and isinstance(height,int):
+                    self._dimensions_cache = (width, height)
+                else:
+                    self._dimensions_cache = get_image_dimensions(self)
+            else:
+                self._dimensions_cache = get_image_dimensions(self)
         return self._dimensions_cache
 
 def get_image_dimensions(file_or_path):