From a798820cf180ac7a5c620e6b06e72eba916b3f67 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 9 Jul 2013 11:29:15 +0000 Subject: [PATCH] --- Magick++/lib/Geometry.cpp | 6 ++++++ Magick++/lib/Magick++/Geometry.h | 8 ++++++++ Magick++/lib/Magick++/Include.h | 1 + Magick++/lib/Magick++/STL.h | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp index 05bfc0746..e5f75a5bb 100644 --- a/Magick++/lib/Geometry.cpp +++ b/Magick++/lib/Geometry.cpp @@ -269,6 +269,12 @@ Magick::Geometry::operator = ( const std::string &geometry_ ) if ( ( flags & MinimumValue ) != 0 ) _fillArea = true; + if ( ( flags & MinimumValue ) != 0 ) + _fillArea = true; + + if ( ( flags & AreaValue ) != 0 ) + _limitPixels = true; + return *this; } diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h index 8e77bc34a..d3a602e57 100644 --- a/Magick++/lib/Magick++/Geometry.h +++ b/Magick++/lib/Magick++/Geometry.h @@ -86,6 +86,14 @@ namespace Magick void fillArea ( bool fillArea_ ); bool fillArea ( void ) const; + // Resize the image based on the smallest fitting dimension (^) + void fillArea ( bool fillArea_ ); + bool fillArea ( void ) const; + + // Resize using a pixel area count limit (@) + void limitPixels ( bool limitPixels_ ); + bool limitPixels ( void ) const; + // Does object contain valid geometry? void isValid ( bool isValid_ ); bool isValid ( void ) const; diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index 4d366d80c..169d11251 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -576,6 +576,7 @@ namespace Magick using MagickCore::AcquireVirtualCacheView; using MagickCore::GetCacheViewVirtualPixels; using MagickCore::AcquireImage; + using MagickCore::AreaValue; using MagickCore::GetVirtualPixels; using MagickCore::AcquireKernelInfo; using MagickCore::AcquireMagickMemory; diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index b40c9b18e..fd79786cc 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -2583,7 +2583,7 @@ namespace Magick MagickCore::ExceptionInfo exceptionInfo; MagickCore::GetExceptionInfo( &exceptionInfo ); - MagickCore::Image* images = MagickCore::SeparateImages( image_.constImage(), channel_, &exceptionInfo ); + MagickCore::Image* images = MagickCore::SeparateImages( image_.constImage(), &exceptionInfo ); separatedImages_->clear(); -- 2.40.0