From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 17 Nov 2011 13:04:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c53413df5789700e14e1a67e6cc2716d1716a387;p=imagemagick

---

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 94d41aeeb..3e3a71ec6 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -53,6 +53,7 @@
 #include "MagickCore/delegate.h"
 #include "MagickCore/display.h"
 #include "MagickCore/display-private.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/effect.h"
 #include "MagickCore/enhance.h"
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 26492ee9b..26bb60c68 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -49,6 +49,7 @@
 #include "MagickCore/colorspace.h"
 #include "MagickCore/constitute.h"
 #include "MagickCore/decorate.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/enhance.h"
 #include "MagickCore/exception.h"
@@ -79,7 +80,6 @@
 #include "MagickCore/resize.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/segment.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/signature-private.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/thread-private.h"
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 85ff6609b..967aec088 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -50,6 +50,7 @@
 #include "MagickCore/color-private.h"
 #include "MagickCore/composite.h"
 #include "MagickCore/decorate.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/effect.h"
 #include "MagickCore/enhance.h"
@@ -80,7 +81,6 @@
 #include "MagickCore/resample.h"
 #include "MagickCore/resample-private.h"
 #include "MagickCore/resize.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 5c770bd16..66519e767 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1009,6 +1009,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
             }
         }
       /* Convert B,C values into Cubic Coefficents. See CubicBC(). */
+     {
         double
           B_squared;
 
@@ -1020,7 +1021,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
         resize_filter->coefficient[4]=-8.0*C-B_squared;
         resize_filter->coefficient[5]=B+5.0*C;
         resize_filter->coefficient[6]=(-1.0/6.0)*B-C;
-      }
+     }
     }
 
   /*
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 6556d43ba..a55d0d6ce 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -50,6 +50,7 @@
 #include "MagickCore/colormap.h"
 #include "MagickCore/composite.h"
 #include "MagickCore/display.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/geometry.h"
@@ -71,7 +72,6 @@
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/resize.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
diff --git a/coders/mat.c b/coders/mat.c
index 2a9dfde0e..875e0e0f7 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -55,6 +55,7 @@
 #include "MagickCore/color-private.h"
 #include "MagickCore/colormap.h"
 #include "MagickCore/colorspace-private.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/image.h"
@@ -69,7 +70,6 @@
 #include "MagickCore/option.h"
 #include "MagickCore/pixel.h"
 #include "MagickCore/resource_.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/module.h"
diff --git a/coders/msl.c b/coders/msl.c
index c9d51d6c1..6b11a049d 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -55,6 +55,7 @@
 #include "MagickCore/constitute.h"
 #include "MagickCore/decorate.h"
 #include "MagickCore/display.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/effect.h"
 #include "MagickCore/enhance.h"
@@ -80,7 +81,6 @@
 #include "MagickCore/resize.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/segment.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/signature.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
diff --git a/coders/pcd.c b/coders/pcd.c
index 2ed5b5190..2ebdb902e 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -49,6 +49,7 @@
 #include "MagickCore/colorspace-private.h"
 #include "MagickCore/constitute.h"
 #include "MagickCore/decorate.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/gem.h"
@@ -63,7 +64,6 @@
 #include "MagickCore/montage.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/resize.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
diff --git a/coders/wpg.c b/coders/wpg.c
index 743049d4f..7a313f9db 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -48,6 +48,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/cache.h"
+#include "MagickCore/distort.h"
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/list.h"
@@ -57,7 +58,6 @@
 #include "MagickCore/resource_.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum-private.h"
-#include "MagickCore/shear.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/module.h"