Changeset 11641 for ImageMagick/trunk

Timestamp:

07/15/08 11:47:05 (6 weeks ago)

Author:

cristy

Message:

 

Files:

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

ImageMagick/trunk/magick/resize.c

@@ -2179 +2179 @@
     quantum;
 
+  /*
+    Acquire filter and contribution info.
+  */
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -2185 +2188 @@
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  /*
-    Initialize resize image attributes.
-  */
   if ((columns == 0) || (rows == 0))
     ThrowImageException(ImageError,"NegativeOrZeroImageSize");
@@ -2193 +2193 @@
       (filter == UndefinedFilter) && (blur == 1.0))
     return(CloneImage(image,0,0,MagickTrue,exception));
-  resize_image=CloneImage(image,columns,rows,MagickTrue,exception);
-  if (resize_image == (Image *) NULL)
-    return((Image *) NULL);
-  /*
-    Scaling, Acquire filter, and contribution info
-  */
-  x_factor=(MagickRealType) resize_image->columns/(MagickRealType)
-    image->columns;
-  y_factor=(MagickRealType) resize_image->rows/(MagickRealType) image->rows;
+  x_factor=(MagickRealType) columns/(MagickRealType) image->columns;
+  y_factor=(MagickRealType) rows/(MagickRealType) image->rows;
   filter_type=LanczosFilter;
   if (filter != UndefinedFilter)
@@ -2217 +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;
-  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_image=DestroyImage(resize_image);
-          resize_filter=DestroyResizeFilter(resize_filter);
-          return((Image *) NULL);
-        }
-      span=(MagickSizeType) (filter_image->columns+resize_image->rows);
-      status=HorizontalFilter(resize_filter,image,filter_image,x_factor,span,
-        &quantum,exception);
-      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_image=DestroyImage(resize_image);
-          resize_filter=DestroyResizeFilter(resize_filter);
-          return((Image *) NULL);
-        }
-      span=(MagickSizeType) (resize_image->columns+filter_image->rows);
-      status=VerticalFilter(resize_filter,image,filter_image,y_factor,span,
-        &quantum,exception);
-      status|=HorizontalFilter(resize_filter,filter_image,resize_image,x_factor,
-        span,&quantum,exception);
-    }
+  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);
   /*
-    Free allocated memory.
+    Free resources.
   */
   filter_image=DestroyImage(filter_image);