From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 15 Apr 2010 16:27:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9645
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b65a5b83785ab7b6a8f6fc2d47ba5dca776143bb;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index abfe28314..fa1955994 100644
--- 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 f27003bcf..abb8f220f 100644
--- 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 5f4840583..1a1c8aa3b 100644
--- 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);
   }