averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-06-08 15:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mapImages.

Browse Source
This commit is contained in:
dirk
2014-08-06 05:16:39 +00:00
parent f781e34db4
commit ddf4cd623c
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Magick++/lib/Magick++/STL.h
+38 -29
View File
@@ -2356,50 +2356,59 @@ namespace Magick
// from a reference image.
// Set dither_ to true to enable dithering. Set measureError_ to
// true in order to evaluate quantization error.
template <class InputIterator>
void mapImages( InputIterator first_,
InputIterator last_,
const Image& mapImage_,
bool dither_ = false,
bool measureError_ = false ) {
template<class InputIterator>
void mapImages(InputIterator first_,InputIterator last_,
const Image& mapImage_,bool dither_=false,bool measureError_=false)
{
MagickCore::Image
*image;
MagickCore::QuantizeInfo quantizeInfo;
MagickCore::GetQuantizeInfo( &quantizeInfo );
MagickCore::QuantizeInfo
quantizeInfo;
GetPPException;
MagickCore::GetQuantizeInfo(&quantizeInfo);
quantizeInfo.dither_method = dither_ ? MagickCore::RiemersmaDitherMethod :
MagickCore::NoDitherMethod;
linkImages( first_, last_ );
GetPPException;
MagickCore::RemapImages( &quantizeInfo, first_->image(),
(mapImage_.isValid() ? mapImage_.constImage() :
(const MagickCore::Image*) NULL),exceptionInfo);
unlinkImages( first_, last_ );
ThrowPPException;
linkImages(first_,last_);
MagickCore::RemapImages(&quantizeInfo,first_->image(),
(mapImage_.isValid() ? mapImage_.constImage() :
(const MagickCore::Image*) NULL),exceptionInfo);
unlinkImages(first_,last_);
if (exceptionInfo->severity != MagickCore::UndefinedException)
{
unlinkImages(first_,last_);
throwException(exceptionInfo);
}
MagickCore::Image* image = first_->image();
while( image )
image=first_->image();
while(image != (MagickCore::Image *) NULL)
{
// Calculate quantization error
GetPPException;
if ( measureError_ )
if (measureError_)
{
MagickCore::GetImageQuantizeError( image, exceptionInfo );
if ( exceptionInfo->severity > MagickCore::UndefinedException )
MagickCore::GetImageQuantizeError(image,exceptionInfo);
if (exceptionInfo->severity > MagickCore::UndefinedException)
{
unlinkImages( first_, last_ );
throwException( exceptionInfo );
unlinkImages(first_,last_);
throwException(exceptionInfo);
}
}
// Udate DirectClass representation of pixels
MagickCore::SyncImage( image, exceptionInfo );
unlinkImages( first_, last_ );
ThrowPPException;
// Update DirectClass representation of pixels
MagickCore::SyncImage(image,exceptionInfo);
if (exceptionInfo->severity > MagickCore::UndefinedException)
{
unlinkImages(first_,last_);
throwException(exceptionInfo);
}
// Next image
image=image->next;
}
unlinkImages( first_, last_ );
unlinkImages(first_,last_);
(void) MagickCore::DestroyExceptionInfo(exceptionInfo);
}
// Composes all the image layers from the current given