Changeset 11642 for ImageMagick/trunk

Timestamp:

07/15/08 15:41:02 (3 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/resize.c (modified) (3 diffs)

ImageMagick/trunk/magick/resize.c

@@ -2180 +2180 @@
 
   /*
-    Acquire filter and contribution info.
+    Acquire resize filter.
   */
   assert(image != (Image *) NULL);
@@ -2210 +2210 @@
     Resize image.
   */
-  filter_image=CloneImage(image,columns,image->rows,MagickTrue,exception);
-  if (filter_image == (Image *) NULL)
-    {
-      resize_filter=DestroyResizeFilter(resize_filter);
-      return((Image *) NULL);
-    }
-  span=(MagickSizeType) (filter_image->columns+rows);
   quantum=0;
-  status=HorizontalFilter(resize_filter,image,filter_image,x_factor,span,
-    &quantum,exception);
-  resize_image=CloneImage(image,columns,rows,MagickTrue,exception);
-  if (resize_image == (Image *) NULL)
-    {
-      filter_image=DestroyImage(filter_image);
-      resize_filter=DestroyResizeFilter(resize_filter);
-      return((Image *) NULL);
-    }
-  status|=VerticalFilter(resize_filter,filter_image,resize_image,y_factor,span,
-    &quantum,exception);
+  if ((columns*((MagickSizeType) image->rows+rows)) >
+      (rows*((MagickSizeType) image->columns+columns)))
+    {
+      filter_image=CloneImage(image,columns,image->rows,MagickTrue,exception);
+      if (filter_image == (Image *) NULL)
+        {
+          resize_filter=DestroyResizeFilter(resize_filter);
+          return((Image *) NULL);
+        }
+      span=(MagickSizeType) (filter_image->columns+rows);
+      status=HorizontalFilter(resize_filter,image,filter_image,x_factor,span,
+        &quantum,exception);
+      resize_image=CloneImage(image,columns,rows,MagickTrue,exception);
+      if (resize_image != (Image *) NULL)
+        status|=VerticalFilter(resize_filter,filter_image,resize_image,y_factor,
+          span,&quantum,exception);
+    }
+  else
+    {
+      filter_image=CloneImage(image,image->columns,rows,MagickTrue,exception);
+      if (filter_image == (Image *) NULL)
+        {
+          resize_filter=DestroyResizeFilter(resize_filter);
+          return((Image *) NULL);
+        }
+      span=(MagickSizeType) (filter_image->rows+columns);
+      status=VerticalFilter(resize_filter,image,filter_image,y_factor,span,
+        &quantum,exception);
+      resize_image=CloneImage(image,columns,rows,MagickTrue,exception);
+      if (resize_image != (Image *) NULL)
+        status|=HorizontalFilter(resize_filter,filter_image,resize_image,
+          x_factor,span,&quantum,exception);
+    }
   /*
     Free resources.
@@ -2236 +2251 @@
   if (status == MagickFalse)
     {
-      resize_image=DestroyImage(resize_image);
+      if (resize_image != (Image *) NULL)
+        resize_image=DestroyImage(resize_image);
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }