From: cristy Date: Tue, 14 Sep 2010 18:38:51 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8926 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3df34d623a8325937429953f9aadd91469368eb9;p=imagemagick --- diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index c2a6b0401..a408cdbd0 100644 --- 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 ce271b5f3..0e5382b51 100644 --- 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 dfa5a7c81..0eb4362c2 100644 --- 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 c9882e017..3f372a36a 100644 --- 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 + 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 + 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 efea9f9e9..4c32a3951 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/magick/version.h b/magick/version.h index 9690b24be..a46eb91e7 100644 --- 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 47094752a..470897cb3 100644 --- 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 2f519ce26..641e3643a 100644 --- 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