From 170ed0c49740abf48dfcd2938532241fb760e910 Mon Sep 17 00:00:00 2001 From: dirk Date: Sun, 1 Feb 2015 16:26:13 +0000 Subject: [PATCH] Minor changes in throwing exceptions. --- Magick++/lib/Magick++/Exception.h | 2 +- Magick++/lib/Magick++/STL.h | 4 ++-- Magick++/lib/Options.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Magick++/lib/Magick++/Exception.h b/Magick++/lib/Magick++/Exception.h index a059dfb22..eb77f40e9 100644 --- a/Magick++/lib/Magick++/Exception.h +++ b/Magick++/lib/Magick++/Exception.h @@ -418,7 +418,7 @@ namespace Magick // Thow exception based on ImageMagick's ExceptionInfo extern MagickPPExport void throwException( - MagickCore::ExceptionInfo *exception_,const bool quiet_); + MagickCore::ExceptionInfo *exception_,const bool quiet_=false); } // namespace Magick diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index 8c67aba2d..6262f20c0 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -2084,7 +2084,7 @@ namespace Magick MagickCore::GetMagickList( "*", &number_formats, exceptionInfo ); if( !coder_list ) { - throwException( exceptionInfo, true ); + throwException(exceptionInfo); throwExceptionExplicit(MagickCore::MissingDelegateError, "Coder array not returned!", 0 ); } @@ -2134,7 +2134,7 @@ namespace Magick } } coder_list=(char **) MagickCore::RelinquishMagickMemory( coder_list ); - ThrowPPException(true); + ThrowPPException(false); } // diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index 576ec08a5..c96be56a8 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -609,7 +609,7 @@ void Magick::Options::strokePattern(const MagickCore::Image *strokePattern_) GetPPException; _drawInfo->stroke_pattern=CloneImage(const_cast( strokePattern_),0,0,MagickTrue,exceptionInfo); - ThrowPPException(true); + ThrowPPException(_quiet); } } -- 2.40.0