(no commit message)

diff --git a/ChangeLog b/ChangeLog
index abfe2831438962fd6ad6a4d80cd13a5de8ceaff7..fa195599438a9169d8c3455494594af4bcf7e543 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-15  6.6.1-4 Cristy  <quetzlzacatenango@image...>
+  * Do not set the resample virtual pixel method when undefined.
+
 2010-04-12  6.6.1-3 Cristy  <quetzlzacatenango@image...>
   * For HSL to RGB, if color temperature is less than 0, set RGB to lightness.
   * Do not flip BMP image with negative height when pinging.

diff --git a/magick/distort.c b/magick/distort.c
index f27003bcfddd571c6262388666168639e64e96a9..abb8f220f8a6dc6f52f150d064f678e2c6f4fcb0 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1935,6 +1935,9 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
   { /* ----- MAIN CODE -----
        Sample the source image to each pixel in the distort image.
      */
+    CacheView
+      *distort_view;
+
     long
       j,
       progress,
@@ -1946,9 +1949,6 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
     ResampleFilter
       **restrict resample_filter;
 
-    CacheView
-      *distort_view;
-
     status=MagickTrue;
     progress=0;
     GetMagickPixelPacket(distort_image,&zero);

diff --git a/magick/resample-private.h b/magick/resample-private.h
index 5f4840583da5b029c2b621c6029f5bdd978e8b16..1a1c8aa3be68107c84496367d24a7d30cfcc1f77 100644 (file)
--- a/magick/resample-private.h
+++ b/magick/resample-private.h
@@ -62,7 +62,8 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
     filter[i]=AcquireResampleFilter(image,exception);
     if (filter[i] == (ResampleFilter *) NULL)
       return(DestroyResampleFilterThreadSet(filter));
-    (void) SetResampleFilterVirtualPixelMethod(filter[i],method);
+    if (method != UndefinedVirtualPixelMethod)
+      (void) SetResampleFilterVirtualPixelMethod(filter[i],method);
     if (interpolate != MagickFalse)
       SetResampleFilter(filter[i],PointFilter,1.0);
   }