(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index c2a6b0401387d2ac2ffc11ceaa0c69c0ca219032..a408cdbd01f26bc99fd1d8402973b520a2b4aa70 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -1069,29 +1069,6 @@ void Magick::Image::flop ( void )
   (void) DestroyExceptionInfo( &exceptionInfo );
 }
 
-// Implements the discrete Fourier transform (DFT) of the image either as a
-// magnitude / phase or real / imaginary image pair.
-void Magick::Image::forwardFourierTransform ( void )
-{
-  ExceptionInfo exceptionInfo;
-  GetExceptionInfo( &exceptionInfo );
-  MagickCore::Image* newImage = ForwardFourierTransformImage ( image(),
-    MagickTrue, &exceptionInfo );
-  replaceImage( newImage );
-  throwException( exceptionInfo );
-  (void) DestroyExceptionInfo( &exceptionInfo );
-}
-void Magick::Image::forwardFourierTransform ( const bool magnitude_ )
-{
-  ExceptionInfo exceptionInfo;
-  GetExceptionInfo( &exceptionInfo );
-  MagickCore::Image* newImage = ForwardFourierTransformImage ( image(),
-    magnitude_ == true ? MagickTrue : MagickFalse, &exceptionInfo );
-  replaceImage( newImage );
-  throwException( exceptionInfo );
-  (void) DestroyExceptionInfo( &exceptionInfo );
-}
-
 // Frame image
 void Magick::Image::frame ( const Geometry &geometry_ )
 {

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index ce271b5f3ce4c2bc48cce9b46256788fbe91321e..0e5382b5174edfdb5fcad05ea14b6ad2ce021310 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -361,11 +361,6 @@ namespace Magick
     // Flop image (reflect each scanline in the horizontal direction)
     void            flop ( void );
     
-    // Implements the discrete Fourier transform (DFT) of the image either as a
-    // magnitude / phase or real / imaginary image pair.
-    void            forwardFourierTransform ( void );
-    void            forwardFourierTransform ( const bool magnitude );
-    
     // Frame image
     void            frame ( const Geometry &geometry_ = frameGeometryDefault );
     void            frame ( const size_t width_,

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index dfa5a7c8167764bbeb69fb90c515cf349f2576ba..0eb4362c2c232b490a7c8ee0a06e175ed70f0e31 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -584,6 +584,7 @@ namespace Magick
   using MagickCore::CorruptImageWarning;
   using MagickCore::CropImage;
   using MagickCore::CycleColormapImage;
+  using MagickCore::DeconstructImages;
   using MagickCore::DelegateError;
   using MagickCore::DelegateFatalError;
   using MagickCore::DelegateWarning;

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index c9882e0177b584dbf7619d53d136306615ced095..3f372a36a193b5c650b5094abf7ab5a26a0c7f88 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -2153,8 +2153,8 @@ namespace Magick
 
     // Build image list
     linkImages( first_, last_ );
-    MagickCore::Image* images = MagickCore::DeconstructImages( first_->image(),
-                                                             &exceptionInfo);
+    MagickCore::Image* images = DeconstructImages( first_->image(),
+                                                   &exceptionInfo);
     // Unlink image list
     unlinkImages( first_, last_ );
 
@@ -2202,6 +2202,49 @@ namespace Magick
     (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
   }
 
+  // Implements the discrete Fourier transform (DFT) of the image either as a
+  // magnitude / phase or real / imaginary image pair.
+  template <class InputIterator, class Container >
+  void forwardFourierTransformImage( Container *fourierImages_,
+    const Image &image_ ) {
+    MagickCore::ExceptionInfo exceptionInfo;
+    MagickCore::GetExceptionInfo( &exceptionInfo );
+
+    // Build image list
+    MagickCore::Image* images = ForwardFourierTransformImage(
+      image_.constImage(), MagickTrue, &exceptionInfo);
+
+    // Ensure container is empty
+    fourierImages_->clear();
+
+    // Move images to container
+    insertImages( fourierImages_, images );
+
+    // Report any error
+    throwException( exceptionInfo );
+    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+  }
+  template <class InputIterator, class Container >
+  void forwardFourierTransformImage( Container *fourierImages_,
+    const Image &image_, const bool magnitude_ ) {
+    MagickCore::ExceptionInfo exceptionInfo;
+    MagickCore::GetExceptionInfo( &exceptionInfo );
+
+    // Build image list
+    MagickCore::Image* images = ForwardFourierTransformImage(
+      image_.constImage(), MagickTrue, &exceptionInfo);
+
+    // Ensure container is empty
+    fourierImages_->clear();
+
+    // Move images to container
+    insertImages( fourierImages_, images );
+
+    // Report any error
+    throwException( exceptionInfo );
+    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+  }
+
   // Replace the colors of a sequence of images with the closest color
   // from a reference image.
   // Set dither_ to true to enable dithering.  Set measureError_ to

diff --git a/config/configure.xml b/config/configure.xml
index efea9f9e95f9263979c9027aa39028beb0db78aa..4c32a39514e402dfbcb07aaa8286fceb38a304d5 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x664"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,4,2"/>
-  <configure name="RELEASE_DATE" value="2010-09-12"/>
+  <configure name="RELEASE_DATE" value="2010-09-14"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index 9690b24beadbe0e61c071e78d588651a119b3581..a46eb91e7da4b2dbf0a57233ab73084913b2220e 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-2"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-09-12"
-#define MagickChangeDate   "20100909"
+#define MagickReleaseDate  "2010-09-14"
+#define MagickChangeDate   "20100914"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures  "OpenMP "
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.4/index.html"

diff --git a/utilities/convert.1 b/utilities/convert.1
index 47094752a37385ecaa29845d501496c9cb61a213..470897cb365b2ea5f00f4e5837be9a6b648dd7ef 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -222,7 +222,7 @@ Image Operators:
 
 Image Sequence Operators:
   \-affinity filename   transform image colors to match this set of colors
-  \-append              append an image sequence top to bottom
+  \-append              append an image sequence top to bottom (use +append for left to right)
   \-clut                apply a color lookup table to the image
   \-coalesce            merge a sequence of images
   \-combine             combine a sequence of images

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 2f519ce263efc04891515979c2672eb0bb2acdf3..641e3643aec7d68c0f24c1bacc7899e2556d7351 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -224,7 +224,7 @@ Image Operators:
 
 Image Sequence Operators:
   \-affinity filename   transform image colors to match this set of colors
-  \-append              append an image sequence top to bottom
+  \-append              append an image sequence top to botto (use +append for left to right)
   \-clut                apply a color lookup table to the image
   \-coalesce            merge a sequence of images
   \-combine             combine a sequence of images