From: dirk <dirk@git.imagemagick.org>
Date: Fri, 20 Jun 2014 11:03:07 +0000 (+0000)
Subject: Refactored methods to use AcquireExceptioInfo instead of GetExceptionInfo.
X-Git-Tag: 7.0.1-0~2210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e31feb8a39ea937a6328da579085cd2ee66ab4c0;p=imagemagick

Refactored methods to use AcquireExceptioInfo instead of GetExceptionInfo.
---

diff --git a/Magick++/lib/ChannelMoments.cpp b/Magick++/lib/ChannelMoments.cpp
index 9e637248a..ffbcf4784 100644
--- a/Magick++/lib/ChannelMoments.cpp
+++ b/Magick++/lib/ChannelMoments.cpp
@@ -144,7 +144,7 @@ Magick::ImageMoments::ImageMoments(const MagickCore::Image *image)
     channel_moments;
 
   GetPPException;
-  channel_moments=GetImageMoments(image,&exceptionInfo);
+  channel_moments=GetImageMoments(image,exceptionInfo);
   if (channel_moments != (MagickCore::ChannelMoments *) NULL)
     {
       switch(image->colorspace)
diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp
index 3c8fcfaff..00da4a94c 100644
--- a/Magick++/lib/CoderInfo.cpp
+++ b/Magick++/lib/CoderInfo.cpp
@@ -42,16 +42,12 @@ Magick::CoderInfo::CoderInfo(const std::string &name_)
     _isWritable(false),
     _isMultiFrame(false)
 {
-  ExceptionInfo
-    exceptionInfo;
-
   const Magick::MagickInfo
     *magickInfo;
 
-  GetExceptionInfo(&exceptionInfo);
-  magickInfo=GetMagickInfo(name_.c_str(),&exceptionInfo);
-  throwException(exceptionInfo);
-  (void) DestroyExceptionInfo(&exceptionInfo);
+  GetPPException;
+  magickInfo=GetMagickInfo(name_.c_str(),exceptionInfo);
+  ThrowPPException;
   if (magickInfo == 0)
     {
       throwExceptionExplicit(OptionError,"Coder not found",name_.c_str());
diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 3ec83b3d9..282304d11 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -169,16 +169,13 @@ const Magick::Color& Magick::Color::operator=(const MagickCore::PixelInfo &color
 
 const Magick::Color& Magick::Color::operator=(const std::string &color_)
 {
-  ExceptionInfo
-    exception;
-
   PixelInfo
     target_color;
 
   initPixel();
-  GetExceptionInfo(&exception);
+  GetPPException;
   if (QueryColorCompliance(color_.c_str(),AllCompliance,&target_color,
-      &exception))
+      exceptionInfo))
     {
       quantumRed(target_color.red);
       quantumGreen(target_color.green);
@@ -191,11 +188,8 @@ const Magick::Color& Magick::Color::operator=(const std::string &color_)
          _pixelType=RGBPixel;
     }
   else
-    {
-      _isValid = false;
-      throwException(exception);
-    }
-  (void) DestroyExceptionInfo( &exception );
+    _isValid = false;
+  ThrowPPException;
 
   return(*this);
 }
@@ -334,12 +328,12 @@ double Magick::Color::scaleQuantumToDouble(const Magick::Quantum quantum_)
 #endif
 }
 
-void Magick::Color::initPixel()
-{
-  _pixel->red=0;
-  _pixel->green=0;
-  _pixel->blue=0;
-  _pixel->alpha=TransparentAlpha;
+void Magick::Color::initPixel()
+{
+  _pixel->red=0;
+  _pixel->green=0;
+  _pixel->blue=0;
+  _pixel->alpha=TransparentAlpha;
 }
 
 Magick::ColorGray::ColorGray(void)
diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp
index 4927a9f5f..9a18448dc 100644
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -811,11 +811,11 @@ MagickPPExport void Magick::throwExceptionExplicit(
     return;
 
   GetPPException;
-  ThrowException(&exceptionInfo,severity_,reason_, description_);
+  ThrowException(exceptionInfo,severity_,reason_, description_);
   ThrowPPException;
 }
 
-MagickPPExport void Magick::throwException(ExceptionInfo &exception_)
+MagickPPExport void Magick::throwException(ExceptionInfo *exception_)
 {
   const ExceptionInfo
     *p;
@@ -827,30 +827,27 @@ MagickPPExport void Magick::throwException(ExceptionInfo &exception_)
   ExceptionType
     severity;
 
-  MagickBooleanType
-    relinquish;
-
   size_t
     index;
 
   // Just return if there is no reported error
-  if (exception_.severity == UndefinedException)
+  if (exception_->severity == UndefinedException)
     return;
 
-  std::string message=formatExceptionMessage(&exception_);
+  std::string message=formatExceptionMessage(exception_);
   nestedException=(Exception *) NULL;
-  LockSemaphoreInfo(exception_.semaphore);
-  if (exception_.exceptions != (void *) NULL)
+  LockSemaphoreInfo(exception_->semaphore);
+  if (exception_->exceptions != (void *) NULL)
     {
       index=GetNumberOfElementsInLinkedList((LinkedListInfo *)
-        exception_.exceptions);
+        exception_->exceptions);
       while(index > 0)
       {
         p=(const ExceptionInfo *) GetValueFromLinkedList((LinkedListInfo *)
-          exception_.exceptions,--index);
-        if ((p->severity != exception_.severity) || (LocaleCompare(p->reason,
-            exception_.reason) != 0) || (LocaleCompare(p->description,
-            exception_.description) != 0))
+          exception_->exceptions,--index);
+        if ((p->severity != exception_->severity) || (LocaleCompare(p->reason,
+            exception_->reason) != 0) || (LocaleCompare(p->description,
+            exception_->description) != 0))
           {
             if (nestedException == (Exception *) NULL)
               nestedException=createException(p);
@@ -863,12 +860,9 @@ MagickPPExport void Magick::throwException(ExceptionInfo &exception_)
           }
       }
     }
-  UnlockSemaphoreInfo(exception_.semaphore);
-  severity=exception_.severity;
-  relinquish=exception_.relinquish;
-  DestroyExceptionInfo(&exception_);
-  if (relinquish)
-    GetExceptionInfo(&exception_);
+  UnlockSemaphoreInfo(exception_->semaphore);
+  severity=exception_->severity;
+  DestroyExceptionInfo(exception_);
 
   switch (severity)
   {
diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp
index 8fc6926f8..36b7f41bf 100644
--- a/Magick++/lib/Functions.cpp
+++ b/Magick++/lib/Functions.cpp
@@ -28,7 +28,7 @@ MagickPPExport void Magick::DisableOpenCL(void)
 {
   GetPPException;
   MagickCore::InitImageMagickOpenCL(MagickCore::MAGICK_OPENCL_OFF,NULL,NULL,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -40,12 +40,12 @@ MagickPPExport bool Magick::EnableOpenCL(const bool useCache_)
   GetPPException;
   if (useCache_)
     status=MagickCore::InitImageMagickOpenCL(
-      MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO,NULL,NULL,&exceptionInfo) ==
+      MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO,NULL,NULL,exceptionInfo) ==
       MagickTrue;
   else
     status=MagickCore::InitImageMagickOpenCL(
       MagickCore::MAGICK_OPENCL_DEVICE_SELECT_AUTO_CLEAR_CACHE,NULL,NULL,
-      &exceptionInfo) == MagickTrue;
+      exceptionInfo) == MagickTrue;
   ThrowPPException;
   return(status);
 }
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index ead635062..e3301ca38 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -326,7 +326,7 @@ void Magick::Image::alpha(const bool matteFlag_)
   GetPPException;
   if ((matteFlag_ && !constImage()->alpha_trait) ||
       (constImage()->alpha_trait && !matteFlag_))
-    SetImageAlpha(image(),OpaqueAlpha,&exceptionInfo);
+    SetImageAlpha(image(),OpaqueAlpha,exceptionInfo);
   ThrowPPException;
 
   image()->alpha_trait=matteFlag_ ? BlendPixelTrait : UndefinedPixelTrait;
@@ -484,7 +484,7 @@ Magick::Geometry Magick::Image::boundingBox(void) const
     bbox;
 
   GetPPException;
-  bbox=GetImageBoundingBox(constImage(),&exceptionInfo);
+  bbox=GetImageBoundingBox(constImage(),exceptionInfo);
   ThrowPPException;
   return(Geometry(bbox));
 }
@@ -504,7 +504,7 @@ void Magick::Image::channelDepth(const size_t depth_)
 {
   modifyImage();
   GetPPException;
-  SetImageDepth(image(),depth_,&exceptionInfo);
+  SetImageDepth(image(),depth_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -514,7 +514,7 @@ size_t Magick::Image::channelDepth()
     channel_depth;
 
   GetPPException;
-  channel_depth=GetImageDepth(constImage(),&exceptionInfo);
+  channel_depth=GetImageDepth(constImage(),exceptionInfo);
   ThrowPPException;
   return(channel_depth);
 }
@@ -532,7 +532,7 @@ void Magick::Image::classType(const ClassType class_)
       // color map and then set to DirectClass type.
       modifyImage();
       GetPPException;
-      SyncImage(image(),&exceptionInfo);
+      SyncImage(image(),exceptionInfo);
       ThrowPPException;
       image()->colormap=(PixelInfo *)RelinquishMagickMemory(image()->colormap);
       image()->storage_class=static_cast<MagickCore::ClassType>(DirectClass);
@@ -560,9 +560,9 @@ void Magick::Image::clipMask(const Magick::Image &clipMask_)
 
   GetPPException;
   if (clipMask_.isValid())
-    SetImageMask(image(),clipMask_.constImage(),&exceptionInfo);
+    SetImageMask(image(),clipMask_.constImage(),exceptionInfo);
   else
-    SetImageMask(image(),0,&exceptionInfo);
+    SetImageMask(image(),0,exceptionInfo);
   ThrowPPException;
 }
 
@@ -572,7 +572,7 @@ Magick::Image Magick::Image::clipMask(void) const
     *image;
 
   GetPPException;
-  image=GetImageMask(constImage(),&exceptionInfo);
+  image=GetImageMask(constImage(),exceptionInfo);
   ThrowPPException;
   if (image == (MagickCore::Image *) NULL)
     return(Magick::Image());
@@ -600,7 +600,7 @@ void Magick::Image::colorMapSize(const size_t entries_)
 
   modifyImage();
   GetPPException;
-  (void) AcquireImageColormap(image(),entries_,&exceptionInfo);
+  (void) AcquireImageColormap(image(),entries_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -619,7 +619,7 @@ void Magick::Image::colorSpace(const ColorspaceType colorSpace_)
 
   modifyImage();
   GetPPException;
-  TransformImageColorspace(image(),colorSpace_,&exceptionInfo);
+  TransformImageColorspace(image(),colorSpace_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -632,7 +632,7 @@ void Magick::Image::colorSpaceType(const ColorspaceType colorSpace_)
 {
   modifyImage();
   GetPPException;
-  SetImageColorspace(image(),colorSpace_,&exceptionInfo);
+  SetImageColorspace(image(),colorSpace_,exceptionInfo);
   ThrowPPException;
   options()->colorspaceType(colorSpace_);
 }
@@ -651,9 +651,9 @@ void Magick::Image::comment(const std::string &comment_)
 {
   modifyImage();
   GetPPException;
-  SetImageProperty(image(),"Comment",NULL,&exceptionInfo);
+  SetImageProperty(image(),"Comment",NULL,exceptionInfo);
   if (comment_.length() > 0)
-    SetImageProperty(image(),"Comment",comment_.c_str(),&exceptionInfo);
+    SetImageProperty(image(),"Comment",comment_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -663,7 +663,7 @@ std::string Magick::Image::comment(void) const
     *value;
 
   GetPPException;
-  value=GetImageProperty(constImage(),"Comment",&exceptionInfo);
+  value=GetImageProperty(constImage(),"Comment",exceptionInfo);
   ThrowPPException;
 
   if (value)
@@ -798,7 +798,7 @@ void Magick::Image::exifProfile(const Magick::Blob &exifProfile_)
       exif_profile=AcquireStringInfo(exifProfile_.length());
       SetStringInfoDatum(exif_profile,(unsigned char *) exifProfile_.data());
       GetPPException;
-      (void) SetImageProfile(image(),"exif",exif_profile,&exceptionInfo);
+      (void) SetImageProfile(image(),"exif",exif_profile,exceptionInfo);
       exif_profile=DestroyStringInfo(exif_profile);
       ThrowPPException;
     }
@@ -889,7 +889,7 @@ Magick::Image Magick::Image::fillPattern(void) const
         *image;
 
       GetPPException;
-      image=CloneImage(tmpTexture,0,0,MagickTrue,&exceptionInfo);
+      image=CloneImage(tmpTexture,0,0,MagickTrue,exceptionInfo);
       texture.replaceImage(image);
       ThrowPPException;
     }
@@ -935,7 +935,7 @@ std::string Magick::Image::format(void) const
    *magick_info;
 
   GetPPException;
-  magick_info=GetMagickInfo(constImage()->magick,&exceptionInfo);
+  magick_info=GetMagickInfo(constImage()->magick,exceptionInfo);
   ThrowPPException;
 
   if ((magick_info != 0) && (*magick_info->description != '\0'))
@@ -955,7 +955,7 @@ std::string Magick::Image::formatExpression(const std::string expression)
 
   GetPPException;
   text=InterpretImageProperties(imageInfo(),image(),expression.c_str(),
-    &exceptionInfo);
+    exceptionInfo);
   if (text != (char *) NULL)
     {
       result=std::string(text);
@@ -1052,7 +1052,7 @@ void Magick::Image::iptcProfile(const Magick::Blob &iptcProfile_)
       iptc_profile=AcquireStringInfo(iptcProfile_.length());
       SetStringInfoDatum(iptc_profile,(unsigned char *) iptcProfile_.data());
       GetPPException;
-      (void) SetImageProfile(image(),"iptc",iptc_profile,&exceptionInfo);
+      (void) SetImageProfile(image(),"iptc",iptc_profile,exceptionInfo);
       iptc_profile=DestroyStringInfo(iptc_profile);
       ThrowPPException;
     }
@@ -1095,9 +1095,9 @@ void Magick::Image::label(const std::string &label_)
 {
   modifyImage();
   GetPPException;
-  (void) SetImageProperty(image(),"Label",NULL,&exceptionInfo);
+  (void) SetImageProperty(image(),"Label",NULL,exceptionInfo);
   if (label_.length() > 0)
-    (void) SetImageProperty(image(),"Label",label_.c_str(),&exceptionInfo);
+    (void) SetImageProperty(image(),"Label",label_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -1107,7 +1107,7 @@ std::string Magick::Image::label(void) const
     *value;
 
   GetPPException;
-  value=GetImageProperty(constImage(),"Label",&exceptionInfo);
+  value=GetImageProperty(constImage(),"Label",exceptionInfo);
   ThrowPPException;
 
   if (value)
@@ -1152,7 +1152,7 @@ void Magick::Image::modulusDepth(const size_t depth_)
 {
   modifyImage();
   GetPPException;
-  SetImageDepth(image(),depth_,&exceptionInfo);
+  SetImageDepth(image(),depth_,exceptionInfo);
   ThrowPPException;
   options()->depth(depth_);
 }
@@ -1163,7 +1163,7 @@ size_t Magick::Image::modulusDepth(void) const
     depth;
 
   GetPPException;
-  depth=GetImageDepth(constImage(),&exceptionInfo);
+  depth=GetImageDepth(constImage(),exceptionInfo);
   ThrowPPException;
   return(depth);
 }
@@ -1456,7 +1456,7 @@ Magick::Image Magick::Image::strokePattern(void) const
         *image;
 
       GetPPException;
-      image=CloneImage(tmpTexture,0,0,MagickTrue,&exceptionInfo);
+      image=CloneImage(tmpTexture,0,0,MagickTrue,exceptionInfo);
       texture.replaceImage(image);
       ThrowPPException;
     }
@@ -1573,7 +1573,7 @@ size_t Magick::Image::totalColors(void) const
     colors;
 
   GetPPException;
-  colors=GetNumberColors(constImage(),0,&exceptionInfo);
+  colors=GetNumberColors(constImage(),0,exceptionInfo);
   ThrowPPException;
   return colors;
 }
@@ -1611,7 +1611,7 @@ void Magick::Image::type(const Magick::ImageType type_)
   modifyImage();
   options()->type(type_);
   GetPPException;
-  SetImageType(image(),type_,&exceptionInfo);
+  SetImageType(image(),type_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -1642,7 +1642,7 @@ void Magick::Image::virtualPixelMethod(
 {
   modifyImage();
   GetPPException;
-  SetImageVirtualPixelMethod(image(),virtualPixelMethod_,&exceptionInfo);
+  SetImageVirtualPixelMethod(image(),virtualPixelMethod_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -1678,7 +1678,7 @@ void Magick::Image::adaptiveBlur(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=AdaptiveBlurImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=AdaptiveBlurImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1700,7 +1700,7 @@ void Magick::Image::adaptiveResize(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=AdaptiveResizeImage(constImage(),width,height,&exceptionInfo);
+  newImage=AdaptiveResizeImage(constImage(),width,height,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1711,7 +1711,7 @@ void Magick::Image::adaptiveSharpen(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=AdaptiveSharpenImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=AdaptiveSharpenImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1724,7 +1724,7 @@ void Magick::Image::adaptiveSharpenChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=AdaptiveSharpenImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=AdaptiveSharpenImage(constImage(),radius_,sigma_,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -1739,7 +1739,7 @@ void Magick::Image::adaptiveThreshold(const size_t width_,const size_t height_,
 
   GetPPException;
   newImage=AdaptiveThresholdImage(constImage(),width_,height_,offset_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1750,7 +1750,7 @@ void Magick::Image::addNoise(const NoiseType noiseType_)
     *newImage;
 
   GetPPException;
-  newImage=AddNoiseImage(constImage(),noiseType_,1.0,&exceptionInfo);
+  newImage=AddNoiseImage(constImage(),noiseType_,1.0,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1763,7 +1763,7 @@ void Magick::Image::addNoiseChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=AddNoiseImage(constImage(),noiseType_,1.0,&exceptionInfo);
+  newImage=AddNoiseImage(constImage(),noiseType_,1.0,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -1785,7 +1785,7 @@ void Magick::Image::affineTransform(const DrawableAffine &affine_)
   _affine.ty=affine_.ty();
 
   GetPPException;
-  newImage=AffineTransformImage(constImage(),&_affine,&exceptionInfo);
+  newImage=AffineTransformImage(constImage(),&_affine,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -1794,7 +1794,7 @@ void Magick::Image::alpha(const unsigned int alpha_)
 {
   modifyImage();
   GetPPException;
-  SetImageAlpha(image(),alpha_,&exceptionInfo);
+  SetImageAlpha(image(),alpha_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -1802,7 +1802,7 @@ void Magick::Image::alphaChannel(AlphaChannelOption alphaOption_)
 {
   modifyImage();
   GetPPException;
-  SetImageAlphaChannel(image(),alphaOption_,&exceptionInfo);
+  SetImageAlphaChannel(image(),alphaOption_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -1822,7 +1822,7 @@ void Magick::Image::alphaFloodfill(const Color &target_,
   GetPPException;
   SetPPChannelMask(AlphaChannel);
   FloodfillPaintImage(image(),options()->drawInfo(),&target,x_,y_,
-    method_ == FloodfillMethod ? MagickFalse : MagickTrue,&exceptionInfo);
+    method_ == FloodfillMethod ? MagickFalse : MagickTrue,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -1904,7 +1904,7 @@ void Magick::Image::annotate(const std::string &text_,
     }
 
   GetPPException;
-  AnnotateImage(image(),drawInfo,&exceptionInfo);
+  AnnotateImage(image(),drawInfo,exceptionInfo);
 
   // Restore original values
   drawInfo->affine=oaffine;
@@ -1927,7 +1927,7 @@ void Magick::Image::annotate(const std::string &text_,
   drawInfo->gravity=gravity_;
 
   GetPPException;
-  AnnotateImage(image(),drawInfo,&exceptionInfo);
+  AnnotateImage(image(),drawInfo,exceptionInfo);
 
   drawInfo->gravity=NorthWestGravity;
   drawInfo->text=0;
@@ -1956,7 +1956,7 @@ void Magick::Image::attribute(const std::string name_,const std::string value_)
 {
   modifyImage();
   GetPPException;
-  SetImageProperty(image(),name_.c_str(),value_.c_str(),&exceptionInfo);
+  SetImageProperty(image(),name_.c_str(),value_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -1966,7 +1966,7 @@ std::string Magick::Image::attribute(const std::string name_)
     *value;
 
   GetPPException;
-  value=GetImageProperty(constImage(),name_.c_str(),&exceptionInfo);
+  value=GetImageProperty(constImage(),name_.c_str(),exceptionInfo);
   ThrowPPException;
 
   if (value)
@@ -1979,8 +1979,8 @@ void Magick::Image::autoGamma(void)
 {
   modifyImage();
   GetPPException;
-  (void) SyncImageSettings(imageInfo(),image(),&exceptionInfo);
-  (void) AutoGammaImage(image(),&exceptionInfo);
+  (void) SyncImageSettings(imageInfo(),image(),exceptionInfo);
+  (void) AutoGammaImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -1989,8 +1989,8 @@ void Magick::Image::autoGammaChannel(const ChannelType channel_)
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  (void) SyncImageSettings(imageInfo(),image(),&exceptionInfo);
-  (void) AutoGammaImage(image(),&exceptionInfo);
+  (void) SyncImageSettings(imageInfo(),image(),exceptionInfo);
+  (void) AutoGammaImage(image(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -1999,8 +1999,8 @@ void Magick::Image::autoLevel(void)
 {
   modifyImage();
   GetPPException;
-  (void) SyncImageSettings(imageInfo(),image(),&exceptionInfo);
-  (void) AutoLevelImage(image(),&exceptionInfo);
+  (void) SyncImageSettings(imageInfo(),image(),exceptionInfo);
+  (void) AutoLevelImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2009,8 +2009,8 @@ void Magick::Image::autoLevelChannel(const ChannelType channel_)
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  (void) SyncImageSettings(imageInfo(),image(),&exceptionInfo);
-  (void) AutoLevelImage(image(),&exceptionInfo);
+  (void) SyncImageSettings(imageInfo(),image(),exceptionInfo);
+  (void) AutoLevelImage(image(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2025,8 +2025,8 @@ void Magick::Image::autoOrient(void)
     return;
 
   GetPPException;
-  (void) SyncImageSettings(imageInfo(),image(),&exceptionInfo);
-  newImage=AutoOrientImage(constImage(),image()->orientation,&exceptionInfo);
+  (void) SyncImageSettings(imageInfo(),image(),exceptionInfo);
+  newImage=AutoOrientImage(constImage(),image()->orientation,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2035,7 +2035,7 @@ void Magick::Image::blackThreshold(const std::string &threshold_)
 {
   modifyImage();
   GetPPException;
-  BlackThresholdImage(image(),threshold_.c_str(),&exceptionInfo);
+  BlackThresholdImage(image(),threshold_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2045,7 +2045,7 @@ void Magick::Image::blackThresholdChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  BlackThresholdImage(image(),threshold_.c_str(),&exceptionInfo);
+  BlackThresholdImage(image(),threshold_.c_str(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2056,7 +2056,7 @@ void Magick::Image::blueShift(const double factor_)
     *newImage;
 
   GetPPException;
-  newImage=BlueShiftImage(constImage(),factor_,&exceptionInfo);
+  newImage=BlueShiftImage(constImage(),factor_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2067,7 +2067,7 @@ void Magick::Image::blur(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=BlurImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=BlurImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2080,7 +2080,7 @@ void Magick::Image::blurChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=BlurImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=BlurImage(constImage(),radius_,sigma_,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -2096,7 +2096,7 @@ void Magick::Image::border(const Geometry &geometry_)
 
   GetPPException;
   newImage=BorderImage(constImage(),&borderInfo,image()->compose,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2106,7 +2106,7 @@ void Magick::Image::brightnessContrast(const double brightness_,
 {
   modifyImage();
   GetPPException;
-  BrightnessContrastImage(image(),brightness_,contrast_,&exceptionInfo);
+  BrightnessContrastImage(image(),brightness_,contrast_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2116,7 +2116,7 @@ void Magick::Image::brightnessContrastChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  BrightnessContrastImage(image(),brightness_,contrast_,&exceptionInfo);
+  BrightnessContrastImage(image(),brightness_,contrast_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2130,7 +2130,7 @@ void Magick::Image::cannyEdge(const double radius_,const double sigma_,
   modifyImage();
   GetPPException;
   newImage=CannyEdgeImage(constImage(),radius_,sigma_,lowerPercent_,
-    upperPercent_,&exceptionInfo);
+    upperPercent_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2141,7 +2141,7 @@ void Magick::Image::channel(const ChannelType channel_)
     *newImage;
 
   GetPPException;
-  newImage=SeparateImage(image(),channel_,&exceptionInfo);
+  newImage=SeparateImage(image(),channel_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2152,7 +2152,7 @@ void Magick::Image::charcoal(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=CharcoalImage(image(),radius_,sigma_,&exceptionInfo);
+  newImage=CharcoalImage(image(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2166,7 +2166,7 @@ void Magick::Image::chop(const Geometry &geometry_)
     chopInfo=geometry_;
 
   GetPPException;
-  newImage=ChopImage(image(),&chopInfo,&exceptionInfo);
+  newImage=ChopImage(image(),&chopInfo,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2227,7 +2227,7 @@ void Magick::Image::cdl(const std::string &cdl_)
 {
   modifyImage();
   GetPPException;
-  (void) ColorDecisionListImage(image(),cdl_.c_str(),&exceptionInfo);
+  (void) ColorDecisionListImage(image(),cdl_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2235,7 +2235,7 @@ void Magick::Image::clamp(void)
 {
   modifyImage();
   GetPPException;
-  ClampImage(image(),&exceptionInfo);
+  ClampImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2244,7 +2244,7 @@ void Magick::Image::clampChannel(const ChannelType channel_)
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  ClampImage(image(),&exceptionInfo);
+  ClampImage(image(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2253,7 +2253,7 @@ void Magick::Image::clip(void)
 {
   modifyImage();
   GetPPException;
-  ClipImage(image(),&exceptionInfo);
+  ClipImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2262,7 +2262,7 @@ void Magick::Image::clipPath(const std::string pathname_,const bool inside_)
   modifyImage();
   GetPPException;
   ClipImagePath(image(),pathname_.c_str(),(MagickBooleanType) inside_,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -2271,7 +2271,7 @@ void Magick::Image::clut(const Image &clutImage_,
 {
   modifyImage();
   GetPPException;
-  ClutImage(image(),clutImage_.constImage(),method,&exceptionInfo);
+  ClutImage(image(),clutImage_.constImage(),method,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2281,7 +2281,7 @@ void Magick::Image::clutChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  ClutImage(image(),clutImage_.constImage(),method,&exceptionInfo);
+  ClutImage(image(),clutImage_.constImage(),method,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2318,7 +2318,7 @@ void Magick::Image::colorize(const unsigned int alphaRed_,
   target.blue=pixel.blue;
   target.alpha=pixel.alpha;
   GetPPException;
-  newImage=ColorizeImage(image(),blend,&target,&exceptionInfo);
+  newImage=ColorizeImage(image(),blend,&target,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2382,7 +2382,7 @@ void Magick::Image::colorMatrix(const size_t order_,
 
           for (ssize_t i=0; i < (ssize_t) (order_*order_); i++)
             kernel_info->values[i]=color_matrix_[i];
-          newImage=ColorMatrixImage(image(),kernel_info,&exceptionInfo);
+          newImage=ColorMatrixImage(image(),kernel_info,exceptionInfo);
           replaceImage(newImage);
         }
       kernel_info=DestroyKernelInfo(kernel_info);
@@ -2401,7 +2401,7 @@ bool Magick::Image::compare(const Image &reference_)
   GetPPException;
   modifyImage();
   ref.modifyImage();
-  status=static_cast<bool>(IsImagesEqual(image(),ref.image(),&exceptionInfo));
+  status=static_cast<bool>(IsImagesEqual(image(),ref.image(),exceptionInfo));
   ThrowPPException;
   return(status);
 }
@@ -2413,7 +2413,7 @@ double Magick::Image::compare(const Image &reference_,const MetricType metric_)
 
   GetPPException;
   GetImageDistortion(image(),reference_.constImage(),metric_,&distortion,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
   return(distortion);
 }
@@ -2427,7 +2427,7 @@ double Magick::Image::compareChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   GetImageDistortion(image(),reference_.constImage(),metric_,&distortion,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
   return(distortion);
@@ -2441,7 +2441,7 @@ Magick::Image Magick::Image::compare(const Image &reference_,
 
   GetPPException;
   newImage=CompareImages(image(),reference_.constImage(),metric_,distortion,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
   if (newImage == (MagickCore::Image *) NULL)
     return(Magick::Image());
@@ -2458,7 +2458,7 @@ Magick::Image Magick::Image::compareChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   newImage=CompareImages(image(),reference_.constImage(),metric_,distortion,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
   if (newImage == (MagickCore::Image *) NULL)
@@ -2484,7 +2484,7 @@ void Magick::Image::composite(const Image &compositeImage_,
   modifyImage();
   GetPPException;
   CompositeImage(image(),compositeImage_.constImage(),compose_,MagickFalse,
-    x,y,&exceptionInfo);
+    x,y,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2500,7 +2500,7 @@ void Magick::Image::composite(const Image &compositeImage_,
 
   GetPPException;
   CompositeImage(image(),compositeImage_.constImage(),compose_,MagickFalse,
-    geometry.x,geometry.y,&exceptionInfo);
+    geometry.x,geometry.y,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2513,7 +2513,7 @@ void Magick::Image::composite(const Image &compositeImage_,
   modifyImage();
   GetPPException;
   CompositeImage(image(),compositeImage_.constImage(),compose_,MagickFalse,
-    xOffset_,yOffset_,&exceptionInfo);
+    xOffset_,yOffset_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2521,7 +2521,7 @@ void Magick::Image::contrast(const size_t sharpen_)
 {
   modifyImage();
   GetPPException;
-  ContrastImage(image(),(MagickBooleanType) sharpen_,&exceptionInfo);
+  ContrastImage(image(),(MagickBooleanType) sharpen_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2530,7 +2530,7 @@ void Magick::Image::contrastStretch(const double blackPoint_,
 {
   modifyImage();
   GetPPException;
-  ContrastStretchImage(image(),blackPoint_,whitePoint_,&exceptionInfo);
+  ContrastStretchImage(image(),blackPoint_,whitePoint_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2540,7 +2540,7 @@ void Magick::Image::contrastStretchChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  ContrastStretchImage(image(),blackPoint_,whitePoint_,&exceptionInfo);
+  ContrastStretchImage(image(),blackPoint_,whitePoint_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -2563,7 +2563,7 @@ void Magick::Image::convolve(const size_t order_,const double *kernel_)
 
       for (ssize_t i=0; i < (ssize_t) (order_*order_); i++)
         kernel_info->values[i]=kernel_[i];
-      newImage=ConvolveImage(image(),kernel_info,&exceptionInfo);
+      newImage=ConvolveImage(image(),kernel_info,exceptionInfo);
       replaceImage(newImage);
     }
   kernel_info=DestroyKernelInfo(kernel_info);
@@ -2579,7 +2579,7 @@ void Magick::Image::crop(const Geometry &geometry_)
     cropInfo=geometry_;
 
   GetPPException;
-  newImage=CropImage(constImage(),&cropInfo,&exceptionInfo);
+  newImage=CropImage(constImage(),&cropInfo,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2588,7 +2588,7 @@ void Magick::Image::cycleColormap(const ssize_t amount_)
 {
   modifyImage();
   GetPPException;
-  CycleColormapImage(image(),amount_,&exceptionInfo);
+  CycleColormapImage(image(),amount_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2596,7 +2596,7 @@ void Magick::Image::decipher(const std::string &passphrase_)
 {
   modifyImage();
   GetPPException;
-  DecipherImage(image(),passphrase_.c_str(),&exceptionInfo);
+  DecipherImage(image(),passphrase_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2665,7 +2665,7 @@ void Magick::Image::deskew(const double threshold_)
     *newImage;
 
   GetPPException;
-  newImage=DeskewImage(constImage(),threshold_,&exceptionInfo);
+  newImage=DeskewImage(constImage(),threshold_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2676,7 +2676,7 @@ void Magick::Image::despeckle(void)
     *newImage;
 
   GetPPException;
-  newImage=DespeckleImage(constImage(),&exceptionInfo);
+  newImage=DespeckleImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2687,7 +2687,7 @@ Magick::ImageType Magick::Image::determineType(void) const
     image_type;
 
   GetPPException;
-  image_type=GetImageType(constImage(),&exceptionInfo);
+  image_type=GetImageType(constImage(),exceptionInfo);
   ThrowPPException;
   return(image_type);
 }
@@ -2695,7 +2695,7 @@ Magick::ImageType Magick::Image::determineType(void) const
 void Magick::Image::display(void)
 {
   GetPPException;
-  DisplayImages(imageInfo(),image(),&exceptionInfo);
+  DisplayImages(imageInfo(),image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2707,7 +2707,7 @@ void Magick::Image::distort(const DistortImageMethod method_,
 
   GetPPException;
   newImage=DistortImage(constImage(), method_,numberArguments_,arguments_,
-    bestfit_ == true ? MagickTrue : MagickFalse,&exceptionInfo);
+    bestfit_ == true ? MagickTrue : MagickFalse,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2767,7 +2767,7 @@ void Magick::Image::edge(const double radius_)
     *newImage;
 
   GetPPException;
-  newImage=EdgeImage(constImage(),radius_,&exceptionInfo);
+  newImage=EdgeImage(constImage(),radius_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2778,7 +2778,7 @@ void Magick::Image::emboss(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=EmbossImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=EmbossImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2787,7 +2787,7 @@ void Magick::Image::encipher(const std::string &passphrase_)
 {
   modifyImage();
   GetPPException;
-  EncipherImage(image(),passphrase_.c_str(),&exceptionInfo);
+  EncipherImage(image(),passphrase_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2797,7 +2797,7 @@ void Magick::Image::enhance(void)
     *newImage;
 
   GetPPException;
-  newImage=EnhanceImage(constImage(),&exceptionInfo);
+  newImage=EnhanceImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2806,7 +2806,7 @@ void Magick::Image::equalize(void)
 {
   modifyImage();
   GetPPException;
-  EqualizeImage(image(),&exceptionInfo);
+  EqualizeImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2814,7 +2814,7 @@ void Magick::Image::erase(void)
 {
   modifyImage();
   GetPPException;
-  (void) SetImageBackgroundColor(image(),&exceptionInfo);
+  (void) SetImageBackgroundColor(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -2830,7 +2830,7 @@ void Magick::Image::extent(const Geometry &geometry_ )
   extentInfo.x=geometry_.xOff();
   extentInfo.y=geometry_.yOff();
   GetPPException;
-  newImage=ExtentImage(image(),&extentInfo,&exceptionInfo);
+  newImage=ExtentImage(image(),&extentInfo,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2868,7 +2868,7 @@ void Magick::Image::flip(void)
     *newImage;
 
   GetPPException;
-  newImage=FlipImage(constImage(),&exceptionInfo);
+  newImage=FlipImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -2891,7 +2891,7 @@ void Magick::Image::floodFillAlpha(const ssize_t x_,const ssize_t y_,
   GetPPException;
   FloodfillPaintImage(image(),options()->drawInfo(),&target,
     static_cast<ssize_t>(x_), static_cast<ssize_t>(y_),
-    method_  == FloodfillMethod ? MagickFalse : MagickTrue,&exceptionInfo);
+    method_  == FloodfillMethod ? MagickFalse : MagickTrue,exceptionInfo);
   ThrowPPException;
 }
 
@@ -2942,7 +2942,7 @@ void Magick::Image::floodFillTexture(const ssize_t x_,const ssize_t y_,
     {
       GetPPException;
       fillPattern=CloneImage(options()->fillPattern(),0,0,MagickTrue,
-        &exceptionInfo);
+        exceptionInfo);
       ThrowPPException;
     }
   options()->fillPattern(texture_.constImage());
@@ -2964,7 +2964,7 @@ void Magick::Image::floodFillTexture(const ssize_t x_,const ssize_t y_,
       GetPPException;
       FloodfillPaintImage(image(),options()->drawInfo(),&target,
         static_cast<ssize_t>(x_),static_cast<ssize_t>(y_),MagickFalse,
-        &exceptionInfo);
+        exceptionInfo);
       options()->fillPattern(fillPattern);
       ThrowPPException;
     }
@@ -2995,7 +2995,7 @@ void Magick::Image::floodFillTexture(const ssize_t x_,const ssize_t y_,
     {
       GetPPException;
       fillPattern=CloneImage(options()->fillPattern(),0,0,MagickTrue,
-        &exceptionInfo);
+        exceptionInfo);
       ThrowPPException;
     }
   options()->fillPattern(texture_.constImage());
@@ -3007,7 +3007,7 @@ void Magick::Image::floodFillTexture(const ssize_t x_,const ssize_t y_,
   GetPPException;
   FloodfillPaintImage(image(),options()->drawInfo(),&target,
     static_cast<ssize_t>(x_),static_cast<ssize_t>(y_),MagickTrue,
-    &exceptionInfo);
+    exceptionInfo);
   options()->fillPattern(fillPattern);
   ThrowPPException;
 }
@@ -3018,7 +3018,7 @@ void Magick::Image::flop(void)
     *newImage;
 
   GetPPException;
-  newImage=FlopImage(constImage(),&exceptionInfo);
+  newImage=FlopImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3032,7 +3032,7 @@ void Magick::Image::fontTypeMetrics(const std::string &text_,
   drawInfo=options()->drawInfo();
   drawInfo->text=const_cast<char *>(text_.c_str());
   GetPPException;
-  GetTypeMetrics(image(),drawInfo,&(metrics->_typeMetric),&exceptionInfo);
+  GetTypeMetrics(image(),drawInfo,&(metrics->_typeMetric),exceptionInfo);
   drawInfo->text=0;
   ThrowPPException;
 }
@@ -3046,7 +3046,7 @@ void Magick::Image::fontTypeMetricsMultiline(const std::string &text_,
   drawInfo=options()->drawInfo();
   drawInfo->text=const_cast<char *>(text_.c_str());
   GetPPException;
-  GetMultilineTypeMetrics(image(),drawInfo,&(metrics->_typeMetric),&exceptionInfo);
+  GetMultilineTypeMetrics(image(),drawInfo,&(metrics->_typeMetric),exceptionInfo);
   drawInfo->text=0;
   ThrowPPException;
 }
@@ -3067,7 +3067,7 @@ void Magick::Image::frame(const Geometry &geometry_)
   info.inner_bevel=geometry_.yOff();
 
   GetPPException;
-  newImage=FrameImage(constImage(),&info,image()->compose,&exceptionInfo);
+  newImage=FrameImage(constImage(),&info,image()->compose,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3089,7 +3089,7 @@ void Magick::Image::frame(const size_t width_,const size_t height_,
   info.inner_bevel=static_cast<ssize_t>(innerBevel_);
 
   GetPPException;
-  newImage=FrameImage(constImage(),&info,image()->compose,&exceptionInfo);
+  newImage=FrameImage(constImage(),&info,image()->compose,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3100,7 +3100,7 @@ void Magick::Image::fx(const std::string expression_)
     *newImage;
 
   GetPPException;
-  newImage=FxImage(constImage(),expression_.c_str(),&exceptionInfo);
+  newImage=FxImage(constImage(),expression_.c_str(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3113,7 +3113,7 @@ void Magick::Image::fx(const std::string expression_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=FxImage(constImage(),expression_.c_str(),&exceptionInfo);
+  newImage=FxImage(constImage(),expression_.c_str(),exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -3123,7 +3123,7 @@ void Magick::Image::gamma(const double gamma_)
 {
   modifyImage();
   GetPPException;
-  GammaImage(image(),gamma_,&exceptionInfo);
+  GammaImage(image(),gamma_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3138,7 +3138,7 @@ void Magick::Image::gamma(const double gammaRed_,const double gammaGreen_,
 
   modifyImage();
   GetPPException;
-  GammaImage(image(),atof(gamma),&exceptionInfo);
+  GammaImage(image(),atof(gamma),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3148,7 +3148,7 @@ void Magick::Image::gaussianBlur(const double width_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=GaussianBlurImage(constImage(),width_,sigma_,&exceptionInfo);
+  newImage=GaussianBlurImage(constImage(),width_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3161,7 +3161,7 @@ void Magick::Image::gaussianBlurChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=GaussianBlurImage(constImage(),width_,sigma_,&exceptionInfo);
+  newImage=GaussianBlurImage(constImage(),width_,sigma_,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -3174,7 +3174,7 @@ const Magick::Quantum *Magick::Image::getConstPixels(const ssize_t x_,
     *p;
 
   GetPPException;
-  p=(*GetVirtualPixels)(constImage(),x_, y_,columns_, rows_,&exceptionInfo);
+  p=(*GetVirtualPixels)(constImage(),x_, y_,columns_, rows_,exceptionInfo);
   ThrowPPException;
   return(p);
 }
@@ -3213,7 +3213,7 @@ Magick::Quantum *Magick::Image::getPixels(const ssize_t x_,const ssize_t y_,
 
   modifyImage();
   GetPPException;
-  result=(*GetAuthenticPixels)(image(),x_, y_,columns_,rows_,&exceptionInfo);
+  result=(*GetAuthenticPixels)(image(),x_, y_,columns_,rows_,exceptionInfo);
   ThrowPPException;
 
   return(result);
@@ -3223,7 +3223,7 @@ void  Magick::Image::haldClut(const Image &clutImage_)
 {
   modifyImage();
   GetPPException;
-  (void) HaldClutImage(image(),clutImage_.constImage(),&exceptionInfo);
+  (void) HaldClutImage(image(),clutImage_.constImage(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3235,7 +3235,7 @@ void Magick::Image::houghLine(const size_t width_,const size_t height_,
 
   GetPPException;
   newImage=HoughLineImage(constImage(),width_,height_,threshold_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3247,7 +3247,7 @@ void Magick::Image::implode(const double factor_)
 
   GetPPException;
   newImage=ImplodeImage(constImage(),factor_,image()->interpolate,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3265,7 +3265,7 @@ void Magick::Image::inverseFourierTransform(const Image &phase_,
 
   GetPPException;
   newImage=InverseFourierTransformImage(constImage(),phase_.constImage(),
-    magnitude_ == true ? MagickTrue : MagickFalse,&exceptionInfo);
+    magnitude_ == true ? MagickTrue : MagickFalse,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3275,7 +3275,7 @@ void Magick::Image::level(const double blackPoint_,const double whitePoint_,
 {
   modifyImage();
   GetPPException;
-  (void) LevelImage(image(),blackPoint_,whitePoint_,gamma_,&exceptionInfo);
+  (void) LevelImage(image(),blackPoint_,whitePoint_,gamma_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3285,7 +3285,7 @@ void Magick::Image::levelChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  (void) LevelImage(image(),blackPoint_,whitePoint_,gamma_,&exceptionInfo);
+  (void) LevelImage(image(),blackPoint_,whitePoint_,gamma_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3316,7 +3316,7 @@ void Magick::Image::levelColors(const Color &blackColor_,
 
   GetPPException;
   (void) LevelImageColors(image(),&black,&white,invert_ == true ?
-    MagickTrue : MagickFalse,&exceptionInfo);
+    MagickTrue : MagickFalse,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3347,7 +3347,7 @@ void Magick::Image::levelColorsChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   (void) LevelImageColors(image(),&black,&white,invert_ == true ?
-    MagickTrue : MagickFalse,&exceptionInfo);
+    MagickTrue : MagickFalse,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3357,7 +3357,7 @@ void Magick::Image::linearStretch(const double blackPoint_,
 {
   modifyImage();
   GetPPException;
-  LinearStretchImage(image(),blackPoint_,whitePoint_,&exceptionInfo);
+  LinearStretchImage(image(),blackPoint_,whitePoint_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3378,7 +3378,7 @@ void Magick::Image::liquidRescale(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=LiquidRescaleImage(image(),width,height,x,y,&exceptionInfo);
+  newImage=LiquidRescaleImage(image(),width,height,x,y,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3389,7 +3389,7 @@ void Magick::Image::magnify(void)
     *newImage;
 
   GetPPException;
-  newImage=MagnifyImage(constImage(),&exceptionInfo);
+  newImage=MagnifyImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3400,7 +3400,7 @@ void Magick::Image::map(const Image &mapImage_,const bool dither_)
   GetPPException;
   options()->quantizeDither(dither_);
   RemapImage(options()->quantizeInfo(),image(),mapImage_.constImage(),
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -3411,7 +3411,7 @@ void Magick::Image::medianFilter(const double radius_)
 
   GetPPException;
   newImage=StatisticImage(image(),MedianStatistic,(size_t) radius_,
-    (size_t) radius_,&exceptionInfo);
+    (size_t) radius_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3422,7 +3422,7 @@ void Magick::Image::minify(void)
     *newImage;
 
   GetPPException;
-  newImage=MinifyImage(constImage(),&exceptionInfo);
+  newImage=MinifyImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3438,7 +3438,7 @@ void Magick::Image::modulate(const double brightness_,const double saturation_,
 
   modifyImage();
   GetPPException;
-  ModulateImage(image(),modulate,&exceptionInfo);
+  ModulateImage(image(),modulate,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3462,7 +3462,7 @@ void Magick::Image::morphology(const MorphologyMethod method_,
 
   GetPPException;
   newImage=MorphologyImage(constImage(),method_,iterations_,kernel,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   kernel=DestroyKernelInfo(kernel);
   ThrowPPException;
@@ -3506,7 +3506,7 @@ void Magick::Image::morphologyChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   newImage=MorphologyImage(constImage(),method_,iterations_,kernel,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   kernel=DestroyKernelInfo(kernel);
@@ -3541,7 +3541,7 @@ void Magick::Image::motionBlur(const double radius_,const double sigma_,
     *newImage;
 
   GetPPException;
-  newImage=MotionBlurImage(constImage(),radius_,sigma_,angle_,&exceptionInfo);
+  newImage=MotionBlurImage(constImage(),radius_,sigma_,angle_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3550,7 +3550,7 @@ void Magick::Image::negate(const bool grayscale_)
 {
   modifyImage();
   GetPPException;
-  NegateImage(image(),(MagickBooleanType) grayscale_,&exceptionInfo);
+  NegateImage(image(),(MagickBooleanType) grayscale_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3560,7 +3560,7 @@ void Magick::Image::negateChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  NegateImage(image(),(MagickBooleanType) grayscale_,&exceptionInfo);
+  NegateImage(image(),(MagickBooleanType) grayscale_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3569,7 +3569,7 @@ void Magick::Image::normalize(void)
 {
   modifyImage();
   GetPPException;
-  NormalizeImage(image(),&exceptionInfo);
+  NormalizeImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3579,7 +3579,7 @@ void Magick::Image::oilPaint(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=OilPaintImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=OilPaintImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3607,11 +3607,11 @@ void Magick::Image::opaque(const Color &opaqueColor_,const Color &penColor_,
 
   GetPPException;
   (void) QueryColorCompliance(opaqueColor.c_str(),AllCompliance,&opaque,
-    &exceptionInfo);
+    exceptionInfo);
   (void) QueryColorCompliance(penColor.c_str(),AllCompliance,&pen,
-    &exceptionInfo);
+    exceptionInfo);
   OpaquePaintImage(image(),&opaque,&pen,invert_ ? MagickTrue : MagickFalse,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -3619,7 +3619,7 @@ void Magick::Image::orderedDither(std::string thresholdMap_)
 {
   modifyImage();
   GetPPException;
-  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),&exceptionInfo);
+  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3629,7 +3629,7 @@ void Magick::Image::orderedDitherChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),&exceptionInfo);
+  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3638,7 +3638,7 @@ void Magick::Image::perceptible(const double epsilon_)
 {
   modifyImage();
   GetPPException;
-  PerceptibleImage(image(),epsilon_,&exceptionInfo);
+  PerceptibleImage(image(),epsilon_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3648,7 +3648,7 @@ void Magick::Image::perceptibleChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  PerceptibleImage(image(),epsilon_,&exceptionInfo);
+  PerceptibleImage(image(),epsilon_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3660,7 +3660,7 @@ void Magick::Image::ping(const std::string &imageSpec_)
 
   GetPPException;
   options()->fileName(imageSpec_);
-  newImage=PingImage(imageInfo(),&exceptionInfo);
+  newImage=PingImage(imageInfo(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3671,7 +3671,7 @@ void Magick::Image::ping(const Blob& blob_)
     *newImage;
 
   GetPPException;
-  newImage=PingBlob(imageInfo(),blob_.data(),blob_.length(),&exceptionInfo);
+  newImage=PingBlob(imageInfo(),blob_.data(),blob_.length(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3731,7 +3731,7 @@ void Magick::Image::polaroid(const std::string &caption_,const double angle_,
 
   GetPPException;
   newImage=PolaroidImage(constImage(),options()->drawInfo(),caption_.c_str(),
-    angle_,method_,&exceptionInfo);
+    angle_,method_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3740,7 +3740,7 @@ void Magick::Image::posterize(const size_t levels_,const DitherMethod method_)
 {
   modifyImage();
   GetPPException;
-  PosterizeImage(image(),levels_,method_,&exceptionInfo);
+  PosterizeImage(image(),levels_,method_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -3750,7 +3750,7 @@ void Magick::Image::posterizeChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  PosterizeImage(image(),levels_,method_,&exceptionInfo);
+  PosterizeImage(image(),levels_,method_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3762,7 +3762,7 @@ void Magick::Image::process(std::string name_,const ssize_t argc,
 
   GetPPException;
   (void) InvokeDynamicImageFilter(name_.c_str(),&image(),argc,argv,
-      &exceptionInfo);
+      exceptionInfo);
   ThrowPPException;
 }
 
@@ -3772,7 +3772,7 @@ void Magick::Image::profile(const std::string name_,
   modifyImage();
   GetPPException;
   (void) ProfileImage(image(),name_.c_str(),(unsigned char *)profile_.data(),
-    profile_.length(),&exceptionInfo);
+    profile_.length(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3799,7 +3799,7 @@ void Magick::Image::quantize(const bool measureError_)
     options()->quantizeInfo()->measure_error=MagickFalse;
 
   GetPPException;
-  QuantizeImage(options()->quantizeInfo(),image(),&exceptionInfo);
+  QuantizeImage(options()->quantizeInfo(),image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3808,7 +3808,7 @@ void Magick::Image::quantumOperator(const ChannelType channel_,
 {
   GetPPException;
   SetPPChannelMask(channel_);
-  EvaluateImage(image(),operator_,rvalue_,&exceptionInfo);
+  EvaluateImage(image(),operator_,rvalue_,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3829,13 +3829,13 @@ void Magick::Image::quantumOperator(const ssize_t x_,const ssize_t y_,
   geometry.y = y_;
 
   GetPPException;
-  cropImage=CropImage(image(),&geometry,&exceptionInfo);
+  cropImage=CropImage(image(),&geometry,exceptionInfo);
   SetPPChannelMask(channel_);
-  EvaluateImage(cropImage,operator_,rvalue_,&exceptionInfo);
+  EvaluateImage(cropImage,operator_,rvalue_,exceptionInfo);
   RestorePPChannelMask;
   (void) CompositeImage(image(),cropImage,image()->alpha_trait == 
     BlendPixelTrait ? OverCompositeOp : CopyCompositeOp,MagickFalse,
-    geometry.x,geometry.y,&exceptionInfo );
+    geometry.x,geometry.y,exceptionInfo );
   cropImage=DestroyImageList(cropImage);
   ThrowPPException;
 }
@@ -3848,7 +3848,7 @@ void Magick::Image::raise(const Geometry &geometry_,const bool raisedFlag_)
   GetPPException;
   modifyImage();
   RaiseImage(image(),&raiseInfo,raisedFlag_ == true ? MagickTrue : MagickFalse,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -3856,7 +3856,7 @@ void Magick::Image::randomThreshold(const Geometry &thresholds_)
 {
   GetPPException;
   (void) RandomThresholdImage(image(),static_cast<std::string>(
-    thresholds_).c_str(),&exceptionInfo);
+    thresholds_).c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -3867,7 +3867,7 @@ void Magick::Image::randomThresholdChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   (void) RandomThresholdImage(image(),static_cast<std::string>(
-    thresholds_).c_str(),&exceptionInfo);
+    thresholds_).c_str(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -3879,7 +3879,7 @@ void Magick::Image::read(const Blob &blob_)
 
   GetPPException;
   newImage=BlobToImage(imageInfo(),static_cast<const void *>(blob_.data()),
-    blob_.length(),&exceptionInfo);
+    blob_.length(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3933,7 +3933,7 @@ void Magick::Image::read(const size_t width_,const size_t height_,
 
   GetPPException;
   newImage=ConstituteImage(width_,height_,map_.c_str(),type_, pixels_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -3945,7 +3945,7 @@ void Magick::Image::read(const std::string &imageSpec_)
 
   GetPPException;
   options()->fileName(imageSpec_);
-  newImage=ReadImage(imageInfo(),&exceptionInfo);
+  newImage=ReadImage(imageInfo(),exceptionInfo);
 
   // Ensure that multiple image frames were not read.
   if (newImage && newImage->next)
@@ -3972,7 +3972,7 @@ void Magick::Image::readPixels(const Magick::QuantumType quantum_,
   quantum_info=AcquireQuantumInfo(imageInfo(),image());
   GetPPException;
   ImportQuantumPixels(image(),(MagickCore::CacheView *) NULL,quantum_info,
-    quantum_,source_,&exceptionInfo);
+    quantum_,source_,exceptionInfo);
   quantum_info=DestroyQuantumInfo(quantum_info);
   ThrowPPException;
 }
@@ -3989,7 +3989,7 @@ void Magick::Image::reduceNoise(const double order_)
 
   GetPPException;
   newImage=StatisticImage(constImage(),NonpeakStatistic,(size_t) order_,
-    (size_t) order_,&exceptionInfo);
+    (size_t) order_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4014,7 +4014,7 @@ void Magick::Image::resample(const Geometry &geometry_)
 
   GetPPException;
   newImage=ResampleImage(constImage(),width,height,image()->filter,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4039,7 +4039,7 @@ void Magick::Image::resize(const Geometry &geometry_)
 
   GetPPException;
   newImage=ResizeImage(constImage(),width,height,image()->filter,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4059,7 +4059,7 @@ void Magick::Image::roll(const Geometry &roll_)
     yOff = 0 - yOff;
 
   GetPPException;
-  newImage=RollImage(constImage(),xOff,yOff,&exceptionInfo);
+  newImage=RollImage(constImage(),xOff,yOff,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4071,7 +4071,7 @@ void Magick::Image::roll(const size_t columns_,const size_t rows_)
 
   GetPPException;
   newImage=RollImage(constImage(),static_cast<ssize_t>(columns_),
-    static_cast<ssize_t>(rows_),&exceptionInfo);
+    static_cast<ssize_t>(rows_),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4082,7 +4082,7 @@ void Magick::Image::rotate(const double degrees_)
     *newImage;
 
   GetPPException;
-  newImage=RotateImage(constImage(),degrees_,&exceptionInfo);
+  newImage=RotateImage(constImage(),degrees_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4093,7 +4093,7 @@ void Magick::Image::rotationalBlur(const double angle_)
     *newImage;
 
   GetPPException;
-  newImage=RotationalBlurImage(constImage(),angle_,&exceptionInfo);
+  newImage=RotationalBlurImage(constImage(),angle_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4106,7 +4106,7 @@ void Magick::Image::rotationalBlurChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=RotationalBlurImage(constImage(),angle_,&exceptionInfo);
+  newImage=RotationalBlurImage(constImage(),angle_,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -4129,7 +4129,7 @@ void Magick::Image::sample(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=SampleImage(constImage(),width,height,&exceptionInfo);
+  newImage=SampleImage(constImage(),width,height,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4151,7 +4151,7 @@ void Magick::Image::scale(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=ScaleImage(constImage(),width,height,&exceptionInfo);
+  newImage=ScaleImage(constImage(),width,height,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4163,8 +4163,8 @@ void Magick::Image::segment(const double clusterThreshold_,
   GetPPException;
   SegmentImage(image(),options()->quantizeColorSpace(),
     (MagickBooleanType) options()->verbose(),clusterThreshold_,
-    smoothingThreshold_,&exceptionInfo);
-  SyncImage(image(),&exceptionInfo);
+    smoothingThreshold_,exceptionInfo);
+  SyncImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4176,7 +4176,7 @@ void Magick::Image::selectiveBlur(const double radius_,const double sigma_,
 
   GetPPException;
   newImage=SelectiveBlurImage(constImage(),radius_,sigma_,threshold_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4190,7 +4190,7 @@ void Magick::Image::selectiveBlurChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   newImage=SelectiveBlurImage(constImage(),radius_,sigma_,threshold_,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -4202,7 +4202,7 @@ Magick::Image Magick::Image::separate(const ChannelType channel_)
     *image;
 
   GetPPException;
-  image=SeparateImage(constImage(),channel_,&exceptionInfo);
+  image=SeparateImage(constImage(),channel_,exceptionInfo);
   ThrowPPException;
   if (image == (MagickCore::Image *) NULL)
     return(Magick::Image());
@@ -4216,7 +4216,7 @@ void Magick::Image::sepiaTone(const double threshold_)
     *newImage;
 
   GetPPException;
-  newImage=SepiaToneImage(constImage(),threshold_,&exceptionInfo);
+  newImage=SepiaToneImage(constImage(),threshold_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4229,7 +4229,7 @@ Magick::Quantum *Magick::Image::setPixels(const ssize_t x_,const ssize_t y_,
 
   modifyImage();
   GetPPException;
-  result=(*QueueAuthenticPixels)(image(),x_,y_,columns_,rows_,&exceptionInfo);
+  result=(*QueueAuthenticPixels)(image(),x_,y_,columns_,rows_,exceptionInfo);
   ThrowPPException;
   return(result);
 }
@@ -4242,7 +4242,7 @@ void Magick::Image::shade(const double azimuth_,const double elevation_,
 
   GetPPException;
   newImage=ShadeImage(constImage(),colorShading_ == true ?
-    MagickTrue : MagickFalse,azimuth_,elevation_,&exceptionInfo);
+    MagickTrue : MagickFalse,azimuth_,elevation_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4255,7 +4255,7 @@ void Magick::Image::shadow(const double percent_opacity_,const double sigma_,
 
   GetPPException;
   newImage=ShadowImage(constImage(),percent_opacity_, sigma_,x_, y_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4266,7 +4266,7 @@ void Magick::Image::sharpen(const double radius_,const double sigma_)
     *newImage;
 
   GetPPException;
-  newImage=SharpenImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=SharpenImage(constImage(),radius_,sigma_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4279,7 +4279,7 @@ void Magick::Image::sharpenChannel(const ChannelType channel_,
 
   GetPPException;
   SetPPChannelMask(channel_);
-  newImage=SharpenImage(constImage(),radius_,sigma_,&exceptionInfo);
+  newImage=SharpenImage(constImage(),radius_,sigma_,exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -4294,7 +4294,7 @@ void Magick::Image::shave(const Geometry &geometry_)
     shaveInfo=geometry_;
 
   GetPPException;
-  newImage=ShaveImage(constImage(),&shaveInfo,&exceptionInfo);
+  newImage=ShaveImage(constImage(),&shaveInfo,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4305,7 +4305,7 @@ void Magick::Image::shear(const double xShearAngle_,const double yShearAngle_)
     *newImage;
 
   GetPPException;
-  newImage=ShearImage(constImage(),xShearAngle_,yShearAngle_,&exceptionInfo);
+  newImage=ShearImage(constImage(),xShearAngle_,yShearAngle_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4316,7 +4316,7 @@ void Magick::Image::sigmoidalContrast(const size_t sharpen_,
   modifyImage();
   GetPPException;
   (void) SigmoidalContrastImage(image(),(MagickBooleanType) sharpen_,contrast,
-    midpoint,&exceptionInfo);
+    midpoint,exceptionInfo);
   ThrowPPException;
 }
 
@@ -4329,12 +4329,12 @@ std::string Magick::Image::signature(const bool force_) const
 
   // Re-calculate image signature if necessary
   GetPPException;
-  if (force_ || !GetImageProperty(constImage(),"Signature",&exceptionInfo) ||
+  if (force_ || !GetImageProperty(constImage(),"Signature",exceptionInfo) ||
     constImage()->taint)
     SignatureImage(const_cast<MagickCore::Image *>(constImage()),
-      &exceptionInfo);
+      exceptionInfo);
 
-  property=GetImageProperty(constImage(),"Signature",&exceptionInfo);
+  property=GetImageProperty(constImage(),"Signature",exceptionInfo);
   ThrowPPException;
 
   return(std::string(property));
@@ -4347,7 +4347,7 @@ void Magick::Image::sketch(const double radius_,const double sigma_,
     *newImage;
 
   GetPPException;
-  newImage=SketchImage(constImage(),radius_,sigma_,angle_,&exceptionInfo);
+  newImage=SketchImage(constImage(),radius_,sigma_,angle_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4356,7 +4356,7 @@ void Magick::Image::solarize(const double factor_)
 {
   modifyImage();
   GetPPException;
-  SolarizeImage(image(),factor_,&exceptionInfo);
+  SolarizeImage(image(),factor_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -4370,7 +4370,7 @@ void Magick::Image::sparseColor(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   newImage=SparseColorImage(constImage(),method_,numberArguments_,arguments_,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -4385,7 +4385,7 @@ void Magick::Image::splice(const Geometry &geometry_)
     spliceInfo=geometry_;
 
   GetPPException;
-  newImage=SpliceImage(constImage(),&spliceInfo,&exceptionInfo);
+  newImage=SpliceImage(constImage(),&spliceInfo,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4397,7 +4397,7 @@ void Magick::Image::spread(const size_t amount_)
 
   GetPPException;
   newImage=SpreadImage(constImage(),amount_,image()->interpolate,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4411,40 +4411,40 @@ void Magick::Image::statistics(ImageStatistics *statistics)
   GetPPException;
 
   SetPPChannelMask(RedChannel);
-  (void) GetImageRange(constImage(),&minimum,&maximum,&exceptionInfo);
+  (void) GetImageRange(constImage(),&minimum,&maximum,exceptionInfo);
   statistics->red.minimum=minimum;
   statistics->red.maximum=maximum;
   (void) GetImageMean(constImage(),&statistics->red.mean,
-    &statistics->red.standard_deviation,&exceptionInfo);
+    &statistics->red.standard_deviation,exceptionInfo);
   (void) GetImageKurtosis(constImage(),&statistics->red.kurtosis,
-    &statistics->red.skewness,&exceptionInfo);
+    &statistics->red.skewness,exceptionInfo);
 
   (void) SetImageChannelMask(image(),GreenChannel);
-  (void) GetImageRange(constImage(),&minimum,&maximum,&exceptionInfo);
+  (void) GetImageRange(constImage(),&minimum,&maximum,exceptionInfo);
   statistics->green.minimum=minimum;
   statistics->green.maximum=maximum;
   (void) GetImageMean(constImage(),&statistics->green.mean,
-    &statistics->green.standard_deviation,&exceptionInfo);
+    &statistics->green.standard_deviation,exceptionInfo);
   (void) GetImageKurtosis(constImage(),&statistics->green.kurtosis,
-    &statistics->green.skewness,&exceptionInfo);
+    &statistics->green.skewness,exceptionInfo);
 
   (void) SetImageChannelMask(image(),GreenChannel);
-  (void) GetImageRange(constImage(),&minimum,&maximum,&exceptionInfo);
+  (void) GetImageRange(constImage(),&minimum,&maximum,exceptionInfo);
   statistics->blue.minimum=minimum;
   statistics->blue.maximum=maximum;
   (void) GetImageMean(constImage(),&statistics->blue.mean,
-    &statistics->blue.standard_deviation,&exceptionInfo);
+    &statistics->blue.standard_deviation,exceptionInfo);
   (void) GetImageKurtosis(constImage(),&statistics->blue.kurtosis,
-    &statistics->blue.skewness,&exceptionInfo);
+    &statistics->blue.skewness,exceptionInfo);
 
   (void) SetImageChannelMask(image(),AlphaChannel);
-  (void) GetImageRange(constImage(),&minimum,&maximum,&exceptionInfo);
+  (void) GetImageRange(constImage(),&minimum,&maximum,exceptionInfo);
   statistics->alpha.minimum=minimum;
   statistics->alpha.maximum=maximum;
   (void) GetImageMean(constImage(),&statistics->alpha.mean,
-    &statistics->alpha.standard_deviation,&exceptionInfo);
+    &statistics->alpha.standard_deviation,exceptionInfo);
   (void) GetImageKurtosis(constImage(),&statistics->alpha.kurtosis,
-    &statistics->alpha.skewness,&exceptionInfo);
+    &statistics->alpha.skewness,exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -4455,7 +4455,7 @@ void Magick::Image::stegano(const Image &watermark_)
     *newImage;
 
   GetPPException;
-  newImage=SteganoImage(constImage(),watermark_.constImage(),&exceptionInfo);
+  newImage=SteganoImage(constImage(),watermark_.constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4466,7 +4466,7 @@ void Magick::Image::stereo(const Image &rightImage_)
     *newImage;
 
   GetPPException;
-  newImage=StereoImage(constImage(),rightImage_.constImage(),&exceptionInfo);
+  newImage=StereoImage(constImage(),rightImage_.constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4475,7 +4475,7 @@ void Magick::Image::strip(void)
 {
   modifyImage();
   GetPPException;
-  StripImage(image(),&exceptionInfo);
+  StripImage(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4491,7 +4491,7 @@ Magick::Image Magick::Image::subImageSearch(const Image &reference_,
 
   GetPPException;
   newImage=SimilarityImage(image(),reference_.constImage(),metric_,
-    similarityThreshold,&offset,similarityMetric_,&exceptionInfo);
+    similarityThreshold,&offset,similarityMetric_,exceptionInfo);
   ThrowPPException;
   if (offset_ != (Geometry *) NULL)
     *offset_=offset;
@@ -4508,7 +4508,7 @@ void Magick::Image::swirl(const double degrees_)
 
   GetPPException;
   newImage=SwirlImage(constImage(),degrees_,image()->interpolate,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4516,7 +4516,7 @@ void Magick::Image::swirl(const double degrees_)
 void Magick::Image::syncPixels(void)
 {
   GetPPException;
-  (void) (*SyncAuthenticPixels)(image(),&exceptionInfo);
+  (void) (*SyncAuthenticPixels)(image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4524,7 +4524,7 @@ void Magick::Image::texture(const Image &texture_)
 {
   modifyImage();
   GetPPException;
-  TextureImage(image(),texture_.constImage(),&exceptionInfo);
+  TextureImage(image(),texture_.constImage(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4532,7 +4532,7 @@ void Magick::Image::threshold(const double threshold_)
 {
   modifyImage();
   GetPPException;
-  BilevelImage(image(),threshold_,&exceptionInfo);
+  BilevelImage(image(),threshold_,exceptionInfo);
   ThrowPPException;
 }
 
@@ -4553,7 +4553,7 @@ void Magick::Image::thumbnail(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=ThumbnailImage(constImage(),width,height,&exceptionInfo);
+  newImage=ThumbnailImage(constImage(),width,height,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4568,7 +4568,7 @@ void Magick::Image::tint(const std::string opacity_)
 
   GetPPException;
   color=static_cast<PixelInfo>(constOptions()->fillColor());
-  newImage=TintImage(constImage(),opacity_.c_str(),&color,&exceptionInfo);
+  newImage=TintImage(constImage(),opacity_.c_str(),&color,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4578,7 +4578,7 @@ void Magick::Image::transform(const Geometry &imageGeometry_)
   modifyImage();
   GetPPException;
   TransformImage(&(image()),0,std::string(imageGeometry_).c_str(),
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -4588,7 +4588,7 @@ void Magick::Image::transform(const Geometry &imageGeometry_,
   modifyImage();
   GetPPException;
   TransformImage(&(image()),std::string(cropGeometry_).c_str(),std::string(
-    imageGeometry_).c_str(), &exceptionInfo);
+    imageGeometry_).c_str(), exceptionInfo);
   ThrowPPException;
 }
 
@@ -4624,10 +4624,10 @@ void Magick::Image::transparent(const Color &color_)
   color=color_;
   GetPPException;
   (void) QueryColorCompliance(color.c_str(),AllCompliance,&target,
-    &exceptionInfo);
+    exceptionInfo);
   modifyImage();
   TransparentPaintImage(image(),&target,TransparentAlpha,MagickFalse,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -4650,12 +4650,12 @@ void Magick::Image::transparentChroma(const Color &colorLow_,
 
   GetPPException;
   (void) QueryColorCompliance(colorLow.c_str(),AllCompliance,&targetLow,
-    &exceptionInfo);
+    exceptionInfo);
   (void) QueryColorCompliance(colorHigh.c_str(),AllCompliance,&targetHigh,
-    &exceptionInfo);
+    exceptionInfo);
   modifyImage();
   TransparentPaintImageChroma(image(),&targetLow,&targetHigh,TransparentAlpha,
-    MagickFalse,&exceptionInfo);
+    MagickFalse,exceptionInfo);
   ThrowPPException;
 }
 
@@ -4665,7 +4665,7 @@ void Magick::Image::transpose(void)
     *newImage;
 
   GetPPException;
-  newImage=TransposeImage(constImage(),&exceptionInfo);
+  newImage=TransposeImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4676,7 +4676,7 @@ void Magick::Image::transverse(void)
     *newImage;
 
   GetPPException;
-  newImage=TransverseImage(constImage(),&exceptionInfo);
+  newImage=TransverseImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4687,7 +4687,7 @@ void Magick::Image::trim(void)
     *newImage;
 
   GetPPException;
-  newImage=TrimImage(constImage(),&exceptionInfo);
+  newImage=TrimImage(constImage(),exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4698,7 +4698,7 @@ Magick::Image Magick::Image::uniqueColors(void)
     *image;
 
   GetPPException;
-  image=UniqueImageColors(constImage(),&exceptionInfo);
+  image=UniqueImageColors(constImage(),exceptionInfo);
   ThrowPPException;
   if (image == (MagickCore::Image *) NULL)
     return(Magick::Image());
@@ -4714,7 +4714,7 @@ void Magick::Image::unsharpmask(const double radius_,const double sigma_,
 
   GetPPException;
   newImage=UnsharpMaskImage(constImage(),radius_,sigma_,amount_,threshold_,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4729,7 +4729,7 @@ void Magick::Image::unsharpmaskChannel(const ChannelType channel_,
   GetPPException;
   SetPPChannelMask(channel_);
   newImage=UnsharpMaskImage(constImage(),radius_,sigma_,amount_,threshold_,
-    &exceptionInfo);
+    exceptionInfo);
   RestorePPChannelMask;
   replaceImage(newImage);
   ThrowPPException;
@@ -4742,7 +4742,7 @@ void Magick::Image::vignette(const double radius_,const double sigma_,
     *newImage;
 
   GetPPException;
-  newImage=VignetteImage(constImage(),radius_,sigma_,x_,y_,&exceptionInfo);
+  newImage=VignetteImage(constImage(),radius_,sigma_,x_,y_,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4754,7 +4754,7 @@ void Magick::Image::wave(const double amplitude_,const double wavelength_)
 
   GetPPException;
   newImage=WaveImage(constImage(),amplitude_,wavelength_,image()->interpolate,
-    &exceptionInfo);
+    exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4763,7 +4763,7 @@ void Magick::Image::whiteThreshold(const std::string &threshold_)
 {
   modifyImage();
   GetPPException;
-  WhiteThresholdImage(image(),threshold_.c_str(),&exceptionInfo);
+  WhiteThresholdImage(image(),threshold_.c_str(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4773,7 +4773,7 @@ void Magick::Image::whiteThresholdChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   SetPPChannelMask(channel_);
-  WhiteThresholdImage(image(),threshold_.c_str(),&exceptionInfo);
+  WhiteThresholdImage(image(),threshold_.c_str(),exceptionInfo);
   RestorePPChannelMask;
   ThrowPPException;
 }
@@ -4788,7 +4788,7 @@ void Magick::Image::write(Blob *blob_)
 
   modifyImage();
   GetPPException;
-  data=ImagesToBlob(constImageInfo(),image(),&length,&exceptionInfo);
+  data=ImagesToBlob(constImageInfo(),image(),&length,exceptionInfo);
   if (length > 0)
     blob_->updateNoCopy(data,length,Blob::MallocAllocator);
   ThrowPPException;
@@ -4805,7 +4805,7 @@ void Magick::Image::write(Blob *blob_,const std::string &magick_)
   modifyImage();
   magick(magick_);
   GetPPException;
-  data=ImagesToBlob(constImageInfo(),image(),&length,&exceptionInfo);
+  data=ImagesToBlob(constImageInfo(),image(),&length,exceptionInfo);
   if (length > 0)
     blob_->updateNoCopy(data,length,Blob::MallocAllocator);
   ThrowPPException;
@@ -4824,7 +4824,7 @@ void Magick::Image::write(Blob *blob_,const std::string &magick_,
   magick(magick_);
   depth(depth_);
   GetPPException;
-  data=ImagesToBlob(constImageInfo(),image(),&length,&exceptionInfo);
+  data=ImagesToBlob(constImageInfo(),image(),&length,exceptionInfo);
   if (length > 0)
     blob_->updateNoCopy(data,length,Blob::MallocAllocator);
   ThrowPPException;
@@ -4836,7 +4836,7 @@ void Magick::Image::write(const ssize_t x_,const ssize_t y_,
 {
   GetPPException;
   ExportImagePixels(image(),x_,y_,columns_,rows_,map_.c_str(),type_,pixels_,
-    &exceptionInfo);
+    exceptionInfo);
   ThrowPPException;
 }
 
@@ -4845,7 +4845,7 @@ void Magick::Image::write(const std::string &imageSpec_)
   modifyImage();
   fileName(imageSpec_);
   GetPPException;
-  WriteImage(constImageInfo(),image(),&exceptionInfo);
+  WriteImage(constImageInfo(),image(),exceptionInfo);
   ThrowPPException;
 }
 
@@ -4858,7 +4858,7 @@ void Magick::Image::writePixels(const Magick::QuantumType quantum_,
   quantum_info=AcquireQuantumInfo(imageInfo(),image());
   GetPPException;
   ExportQuantumPixels(image(),(MagickCore::CacheView *) NULL,quantum_info,
-    quantum_,destination_, &exceptionInfo);
+    quantum_,destination_, exceptionInfo);
   quantum_info=DestroyQuantumInfo(quantum_info);
   ThrowPPException;
 }
@@ -4880,7 +4880,7 @@ void Magick::Image::zoom(const Geometry &geometry_)
     &height);
 
   GetPPException;
-  newImage=ResizeImage(constImage(),width,height,image()->filter,&exceptionInfo);
+  newImage=ResizeImage(constImage(),width,height,image()->filter,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }
@@ -4943,7 +4943,7 @@ void Magick::Image::modifyImage(void)
   }
 
   GetPPException;
-  replaceImage(CloneImage(image(),0,0,MagickTrue,&exceptionInfo));
+  replaceImage(CloneImage(image(),0,0,MagickTrue,exceptionInfo));
   ThrowPPException;
 }
 
@@ -4958,7 +4958,7 @@ ssize_t Magick::Image::registerId(void)
       GetPPException;
       _imgRef->id(_imgRef->id()+1);
       sprintf(id,"%.20g\n",(double) _imgRef->id());
-      SetImageRegistry(ImageRegistryType,id,image(),&exceptionInfo);
+      SetImageRegistry(ImageRegistryType,id,image(),exceptionInfo);
       ThrowPPException;
     }
   return(_imgRef->id());
@@ -4974,7 +4974,7 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
   else
     {
       GetPPException;
-      image=AcquireImage(constImageInfo(),&exceptionInfo);
+      image=AcquireImage(constImageInfo(),exceptionInfo);
       ThrowPPException;
     }
 
diff --git a/Magick++/lib/ImageRef.cpp b/Magick++/lib/ImageRef.cpp
index 914e888d3..4ee38710b 100644
--- a/Magick++/lib/ImageRef.cpp
+++ b/Magick++/lib/ImageRef.cpp
@@ -22,7 +22,7 @@ Magick::ImageRef::ImageRef(void)
     _mutexLock()
 {
   GetPPException;
-  _image=AcquireImage(_options->imageInfo(),&exceptionInfo);
+  _image=AcquireImage(_options->imageInfo(),exceptionInfo);
   ThrowPPException;
 }
 
diff --git a/Magick++/lib/Magick++/Exception.h b/Magick++/lib/Magick++/Exception.h
index e29863f99..2921a538f 100644
--- a/Magick++/lib/Magick++/Exception.h
+++ b/Magick++/lib/Magick++/Exception.h
@@ -417,7 +417,7 @@ namespace Magick
 
   // Thow exception based on ImageMagick's ExceptionInfo
   extern MagickPPExport void throwException(
-    MagickCore::ExceptionInfo &exception_);
+    MagickCore::ExceptionInfo *exception_);
 
 } // namespace Magick
 
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index d9bc27e62..6b0d7542b 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -1212,7 +1212,6 @@ namespace Magick
   using MagickCore::GetCacheViewVirtualPixels;
   using MagickCore::GetColorTuple;
   using MagickCore::GetDrawInfo;
-  using MagickCore::GetExceptionInfo;
   using MagickCore::GetGeometry;
   using MagickCore::GetImageArtifact;
   using MagickCore::GetImageMoments;
@@ -1458,8 +1457,8 @@ namespace Magick
 //////////////////////////////////////////////////////////////////////
 #define GetPPException \
   MagickCore::ExceptionInfo \
-    exceptionInfo; \
-  MagickCore::GetExceptionInfo(&exceptionInfo)
+    *exceptionInfo; \
+  exceptionInfo=MagickCore::AcquireExceptionInfo();
 #define ClonePPDrawException(wand) \
   MagickCore::ExceptionInfo \
     *exceptionInfo; \
@@ -1471,10 +1470,10 @@ namespace Magick
     channel_mask; \
   channel_mask=MagickCore::SetImageChannelMask(image(),channel)
 #define ThrowPPDrawException \
-  throwException(*exceptionInfo); \
+  throwException(exceptionInfo); \
   (void) MagickCore::DestroyExceptionInfo(exceptionInfo)
 #define ThrowPPException \
   throwException(exceptionInfo); \
-  (void) MagickCore::DestroyExceptionInfo(&exceptionInfo)
+  (void) MagickCore::DestroyExceptionInfo(exceptionInfo)
 
 #endif // Magick_Include_header
diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h
index 7d65e6055..f46790678 100644
--- a/Magick++/lib/Magick++/Pixels.h
+++ b/Magick++/lib/Magick++/Pixels.h
@@ -74,7 +74,6 @@ namespace Magick
     ::ssize_t                 _y;         // Top ordinate of view
     size_t                    _columns;   // Width of view
     size_t                    _rows;      // Height of view
-    MagickCore::ExceptionInfo _exception; // Any thrown exception
 
   }; // class Pixels
 
diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index c58091d9c..8a1b2f548 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -1914,13 +1914,9 @@ namespace Magick
   template <class InputIterator>
   void animateImages( InputIterator first_,
           InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
     linkImages( first_, last_ );
     MagickCore::AnimateImages( first_->imageInfo(), first_->image() );
     unlinkImages( first_, last_ );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
   }
 
   // Append images from list into single image in either horizontal or
@@ -1930,16 +1926,14 @@ namespace Magick
          InputIterator first_,
          InputIterator last_,
          bool stack_ = false) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
     MagickCore::Image* image = MagickCore::AppendImages( first_->image(),
                    (MagickBooleanType) stack_,
-                   &exceptionInfo ); 
+                   exceptionInfo ); 
     unlinkImages( first_, last_ );
     appendedImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Average a set of images.
@@ -1948,15 +1942,13 @@ namespace Magick
   void averageImages( Image *averagedImage_,
           InputIterator first_,
           InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
     MagickCore::Image* image = MagickCore::EvaluateImages( first_->image(),
-      MagickCore::MeanEvaluateOperator, &exceptionInfo );
+      MagickCore::MeanEvaluateOperator, exceptionInfo );
     unlinkImages( first_, last_ );
     averagedImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Merge a sequence of images.
@@ -1968,13 +1960,12 @@ namespace Magick
   void coalesceImages( Container *coalescedImages_,
                        InputIterator first_,
                        InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Build image list
     linkImages( first_, last_ );
     MagickCore::Image* images = MagickCore::CoalesceImages( first_->image(),
-                                                          &exceptionInfo);
+                                                          exceptionInfo);
     // Unlink image list
     unlinkImages( first_, last_ );
 
@@ -1985,8 +1976,7 @@ namespace Magick
     insertImages( coalescedImages_, images );
 
     // Report any error
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Return format coders matching specified conditions.
@@ -2006,10 +1996,9 @@ namespace Magick
                       ) {
     // Obtain first entry in MagickInfo list
     size_t number_formats;
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     char **coder_list =
-      MagickCore::GetMagickList( "*", &number_formats, &exceptionInfo );
+      MagickCore::GetMagickList( "*", &number_formats, exceptionInfo );
     if( !coder_list )
       {
         throwException( exceptionInfo );
@@ -2023,7 +2012,7 @@ namespace Magick
     for ( ::ssize_t i=0; i < (::ssize_t) number_formats; i++)
       {
         const MagickCore::MagickInfo *magick_info =
-          MagickCore::GetMagickInfo( coder_list[i], &exceptionInfo );
+          MagickCore::GetMagickInfo( coder_list[i], exceptionInfo );
         coder_list[i]=(char *)
           MagickCore::RelinquishMagickMemory( coder_list[i] );
 
@@ -2062,8 +2051,7 @@ namespace Magick
           }
       }
     coder_list=(char **) MagickCore::RelinquishMagickMemory( coder_list );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   //
@@ -2109,15 +2097,13 @@ namespace Magick
   template <class Container >
   void colorHistogram( Container *histogram_, const Image image)
   {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Obtain histogram array
     size_t colors;
     MagickCore::PixelInfo *histogram_array = 
-      MagickCore::GetImageHistogram( image.constImage(), &colors, &exceptionInfo );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+      MagickCore::GetImageHistogram( image.constImage(), &colors, exceptionInfo );
+    ThrowPPException;
 
     // Clear out container
     histogram_->clear();
@@ -2143,14 +2129,12 @@ namespace Magick
                       InputIterator first_,
                       InputIterator last_,
                       const ChannelType channel_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
-    MagickCore::Image* image = CombineImages( first_->image(), channel_, &exceptionInfo );
+    MagickCore::Image* image = CombineImages( first_->image(), channel_, exceptionInfo );
     unlinkImages( first_, last_ );
     combinedImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Break down an image sequence into constituent parts.  This is
@@ -2159,13 +2143,12 @@ namespace Magick
   void deconstructImages( Container *deconstructedImages_,
                           InputIterator first_,
                           InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Build image list
     linkImages( first_, last_ );
     MagickCore::Image* images = DeconstructImages( first_->image(),
-                                                   &exceptionInfo);
+                                                   exceptionInfo);
     // Unlink image list
     unlinkImages( first_, last_ );
 
@@ -2176,8 +2159,7 @@ namespace Magick
     insertImages( deconstructedImages_, images );
 
     // Report any error
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   //
@@ -2186,13 +2168,11 @@ namespace Magick
   template <class InputIterator>
   void displayImages( InputIterator first_,
           InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
     MagickCore::DisplayImages( first_->imageInfo(), first_->image() );
     unlinkImages( first_, last_ );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Applies a value to the image with an arithmetic, relational,
@@ -2204,14 +2184,12 @@ namespace Magick
                        InputIterator first_,
                        InputIterator last_,
                        const MagickEvaluateOperator operator_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
-    MagickCore::Image* image = EvaluateImages( first_->image(), operator_, &exceptionInfo );
+    MagickCore::Image* image = EvaluateImages( first_->image(), operator_, exceptionInfo );
     unlinkImages( first_, last_ );
     evaluatedImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Merge a sequence of image frames which represent image layers.
@@ -2220,15 +2198,13 @@ namespace Magick
   void flattenImages( Image *flattendImage_,
           InputIterator first_,
           InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
     MagickCore::Image* image = MagickCore::MergeImageLayers( first_->image(),
-      FlattenLayer,&exceptionInfo );
+      FlattenLayer,exceptionInfo );
     unlinkImages( first_, last_ );
     flattendImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Implements the discrete Fourier transform (DFT) of the image either as a
@@ -2236,12 +2212,11 @@ namespace Magick
   template <class Container >
   void forwardFourierTransformImage( Container *fourierImages_,
     const Image &image_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Build image list
     MagickCore::Image* images = ForwardFourierTransformImage(
-      image_.constImage(), MagickTrue, &exceptionInfo);
+      image_.constImage(), MagickTrue, exceptionInfo);
 
     // Ensure container is empty
     fourierImages_->clear();
@@ -2250,19 +2225,17 @@ namespace Magick
     insertImages( fourierImages_, images );
 
     // Report any error
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
   template <class Container >
   void forwardFourierTransformImage( Container *fourierImages_,
     const Image &image_, const bool magnitude_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Build image list
     MagickCore::Image* images = ForwardFourierTransformImage(
       image_.constImage(), magnitude_ == true ? MagickTrue : MagickFalse,
-      &exceptionInfo);
+      exceptionInfo);
 
     // Ensure container is empty
     fourierImages_->clear();
@@ -2271,8 +2244,7 @@ namespace Magick
     insertImages( fourierImages_, images );
 
     // Report any error
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Applies a mathematical expression to a sequence of images.
@@ -2280,20 +2252,16 @@ namespace Magick
   void fxImages(Image *fxImage_,InputIterator first_,InputIterator last_,
     const std::string expression)
   {
-    MagickCore::ExceptionInfo
-      exceptionInfo;
-
     MagickCore::Image
       *image;
 
-    MagickCore::GetExceptionInfo(&exceptionInfo);
+    GetPPException;
     linkImages(first_,last_);
     image=FxImageChannel(first_->constImage(),DefaultChannels,
-      expression.c_str(),&exceptionInfo);
+      expression.c_str(),exceptionInfo);
     unlinkImages(first_,last_);
     fxImage_->replaceImage(image);
-    throwException(exceptionInfo);
-    (void) DestroyExceptionInfo(&exceptionInfo);
+    ThrowPPException;
   }
 
   // Replace the colors of a sequence of images with the closest color
@@ -2307,9 +2275,6 @@ namespace Magick
       bool dither_ = false,
       bool measureError_ = false ) {
 
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
-    MagickCore::QuantizeInfo quantizeInfo;
     MagickCore::GetQuantizeInfo( &quantizeInfo );
     quantizeInfo.dither_method = dither_ ? MagickCore::RiemersmaDitherMethod :
       MagickCore::NoDitherMethod;
@@ -2319,18 +2284,16 @@ namespace Magick
     if ( exceptionInfo.severity != MagickCore::UndefinedException )
       {
         unlinkImages( first_, last_ );
-        throwException( exceptionInfo );
       }
 
     MagickCore::Image* image = first_->image();
     while( image )
       {
         // Calculate quantization error
-        MagickCore::ExceptionInfo exceptionInfo;
-        MagickCore::GetExceptionInfo( &exceptionInfo );
+        GetPPException;
         if ( measureError_ )
           {
-            MagickCore::GetImageQuantizeError( image, &exceptionInfo );
+            MagickCore::GetImageQuantizeError( image, exceptionInfo );
             if ( exceptionInfo.severity > MagickCore::UndefinedException )
               {
                 unlinkImages( first_, last_ );
@@ -2339,17 +2302,15 @@ namespace Magick
           }
   
         // Udate DirectClass representation of pixels
-        MagickCore::SyncImage( image, &exceptionInfo );
+        MagickCore::SyncImage( image, exceptionInfo );
         unlinkImages( first_, last_ );
-        throwException( exceptionInfo );
-        (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+        ThrowPPException;
 
         // Next image
         image=image->next;
       }
 
     unlinkImages( first_, last_ );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
   }
 
   // Composes all the image layers from the current given
@@ -2359,14 +2320,12 @@ namespace Magick
                          InputIterator first_,
                          InputIterator last_,
                          const LayerMethod method_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
-    MagickCore::Image* image = MergeImageLayers( first_->image(), method_, &exceptionInfo );
+    MagickCore::Image* image = MergeImageLayers( first_->image(), method_, exceptionInfo );
     unlinkImages( first_, last_ );
     mergedImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Create a composite image by combining several separate images.
@@ -2396,7 +2355,7 @@ namespace Magick
     // Do montage
     GetPPException;
     images=MagickCore::MontageImages(first_->image(),montageInfo,
-      &exceptionInfo);
+      exceptionInfo);
 
     // Unlink linked image list
     unlinkImages(first_,last_);
@@ -2425,13 +2384,12 @@ namespace Magick
         InputIterator first_,
         InputIterator last_,
         size_t frames_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     // Build image list
     linkImages( first_, last_ );
     MagickCore::Image* images = MagickCore::MorphImages( first_->image(), frames_,
-                   &exceptionInfo);
+                   exceptionInfo);
     // Unlink image list
     unlinkImages( first_, last_ );
 
@@ -2442,8 +2400,7 @@ namespace Magick
     insertImages( morphedImages_, images );
 
     // Report any error
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Inlay a number of images to form a single coherent picture.
@@ -2451,15 +2408,13 @@ namespace Magick
   void mosaicImages( Image *mosaicImage_,
          InputIterator first_,
          InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     linkImages( first_, last_ );
     MagickCore::Image* image = MagickCore::MergeImageLayers( first_->image(),
-       MosaicLayer,&exceptionInfo ); 
+       MosaicLayer,exceptionInfo ); 
     unlinkImages( first_, last_ );
     mosaicImage_->replaceImage( image );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Compares each image the GIF disposed forms of the previous image in
@@ -2470,11 +2425,10 @@ namespace Magick
   void optimizeImageLayers( Container *optimizedImages_,
                             InputIterator first_,
                             InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     linkImages( first_, last_ );
-    MagickCore::Image* images = OptimizeImageLayers( first_->image(), &exceptionInfo );
+    MagickCore::Image* images = OptimizeImageLayers( first_->image(), exceptionInfo );
 
     unlinkImages( first_, last_ );
 
@@ -2482,8 +2436,7 @@ namespace Magick
 
     insertImages( optimizedImages_, images );
 
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
   
   // optimizeImagePlusLayers is exactly as optimizeImageLayers, but may
@@ -2493,11 +2446,10 @@ namespace Magick
   void optimizePlusImageLayers( Container *optimizedImages_,
                                 InputIterator first_,
                                 InputIterator last_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     linkImages( first_, last_ );
-    MagickCore::Image* images = OptimizePlusImageLayers( first_->image(), &exceptionInfo );
+    MagickCore::Image* images = OptimizePlusImageLayers( first_->image(), exceptionInfo );
 
     unlinkImages( first_, last_ );
 
@@ -2505,8 +2457,7 @@ namespace Magick
 
     insertImages( optimizedImages_, images );
 
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPDrawException;
   }
 
   // Adds the names of the profiles from the image to the container.
@@ -2533,8 +2484,7 @@ namespace Magick
   void quantizeImages( InputIterator first_,
            InputIterator last_,
            bool measureError_ = false ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     linkImages( first_, last_ );
 
@@ -2543,7 +2493,6 @@ namespace Magick
     if ( exceptionInfo.severity > MagickCore::UndefinedException )
       {
   unlinkImages( first_, last_ );
-  throwException( exceptionInfo );
       }
 
     MagickCore::Image* image = first_->image();
@@ -2551,17 +2500,17 @@ namespace Magick
       {
   // Calculate quantization error
   if ( measureError_ )
-    MagickCore::GetImageQuantizeError( image,  &exceptionInfo );
+    MagickCore::GetImageQuantizeError( image,  exceptionInfo );
 
   // Update DirectClass representation of pixels
-  MagickCore::SyncImage( image, &exceptionInfo );
+  MagickCore::SyncImage( image, exceptionInfo );
 
   // Next image
   image=image->next;
       }
 
     unlinkImages( first_, last_ );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Read images into existing container (appending to container)
@@ -2572,27 +2521,23 @@ namespace Magick
     MagickCore::ImageInfo *imageInfo = MagickCore::CloneImageInfo(0);
     imageSpec_.copy( imageInfo->filename, MaxTextExtent-1 );
     imageInfo->filename[ imageSpec_.length() ] = 0;
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
-    MagickCore::Image* images =  MagickCore::ReadImage( imageInfo, &exceptionInfo );
+    GetPPException;
+    MagickCore::Image* images =  MagickCore::ReadImage( imageInfo, exceptionInfo );
     MagickCore::DestroyImageInfo(imageInfo);
     insertImages( sequence_, images);
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
   template <class Container>
   void readImages( Container *sequence_,
        const Blob &blob_ ) {
     MagickCore::ImageInfo *imageInfo = MagickCore::CloneImageInfo(0);
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     MagickCore::Image *images = MagickCore::BlobToImage( imageInfo,
                    blob_.data(),
-                   blob_.length(), &exceptionInfo );
+                   blob_.length(), exceptionInfo );
     MagickCore::DestroyImageInfo(imageInfo);
     insertImages( sequence_, images );
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Returns a separate grayscale image for each channel specified.
@@ -2600,17 +2545,15 @@ namespace Magick
   void separateImages( Container *separatedImages_,
                        const Image &image_,
                        const ChannelType channel_ ) {
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
-    MagickCore::Image* images = MagickCore::SeparateImages( image_.constImage(), &exceptionInfo );
+    MagickCore::Image* images = MagickCore::SeparateImages( image_.constImage(), exceptionInfo );
 
     separatedImages_->clear();
 
     insertImages( separatedImages_, images );
 
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
   // Smush images from list into single image in either horizontal or
@@ -2625,7 +2568,7 @@ namespace Magick
     GetPPException;
     linkImages(first_,last_);
     newImage=MagickCore::SmushImages(first_->constImage(),
-      (MagickBooleanType) stack_,offset_,&exceptionInfo);
+      (MagickBooleanType) stack_,offset_,exceptionInfo);
     unlinkImages(first_,last_);
     smushedImage_->replaceImage(newImage);
     ThrowPPException;
@@ -2640,24 +2583,22 @@ namespace Magick
 
     first_->adjoin( adjoin_ );
 
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
 
     linkImages( first_, last_ );
     ::ssize_t errorStat = MagickCore::WriteImages( first_->constImageInfo(),
                                             first_->image(),
                                             imageSpec_.c_str(),
-                                            &exceptionInfo );
+                                            exceptionInfo );
     unlinkImages( first_, last_ );
 
     if ( errorStat != false )
       {
-        (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+        (void) MagickCore::DestroyExceptionInfo( exceptionInfo );
         return;
       }
 
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
   // Write images to BLOB
   template <class InputIterator>
@@ -2670,19 +2611,17 @@ namespace Magick
 
     linkImages( first_, last_ );
 
-    MagickCore::ExceptionInfo exceptionInfo;
-    MagickCore::GetExceptionInfo( &exceptionInfo );
+    GetPPException;
     size_t length = 2048; // Efficient size for small images
     void* data = MagickCore::ImagesToBlob( first_->imageInfo(),
            first_->image(),
            &length,
-           &exceptionInfo);
+           exceptionInfo);
     blob_->updateNoCopy( data, length, Magick::Blob::MallocAllocator );
 
     unlinkImages( first_, last_ );
 
-    throwException( exceptionInfo );
-    (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
+    ThrowPPException;
   }
 
 } // namespace Magick
diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 0243194fd..9eb374dd9 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -255,7 +255,7 @@ void Magick::Options::fillPattern(const MagickCore::Image *fillPattern_)
       GetPPException;
       _drawInfo->fill_pattern=CloneImage(const_cast<MagickCore::Image*>(
         fillPattern_),0,0,static_cast<MagickBooleanType>(MagickTrue),
-        &exceptionInfo);
+        exceptionInfo);
       ThrowPPException;
     }
 }
@@ -315,7 +315,7 @@ std::string Magick::Options::format(void) const
 
   GetPPException;
   if (*_imageInfo->magick != '\0' )
-    magick_info = GetMagickInfo(_imageInfo->magick,&exceptionInfo);
+    magick_info = GetMagickInfo(_imageInfo->magick,exceptionInfo);
   ThrowPPException;
 
   if ((magick_info != 0) && (*magick_info->description != '\0'))
@@ -339,11 +339,11 @@ void Magick::Options::magick(const std::string &magick_)
   FormatLocaleString(_imageInfo->filename,MaxTextExtent,"%.1024s:",
     magick_.c_str());
   GetPPException;
-  SetImageInfo(_imageInfo,1,&exceptionInfo);
+  SetImageInfo(_imageInfo,1,exceptionInfo);
   if (*_imageInfo->magick == '\0')
     throwExceptionExplicit(OptionWarning, "Unrecognized image format",
       magick_.c_str());
-  (void) DestroyExceptionInfo(&exceptionInfo);
+  ThrowPPException;
 }
 
 std::string Magick::Options::magick(void) const
@@ -589,7 +589,7 @@ void Magick::Options::strokePattern(const MagickCore::Image *strokePattern_)
     {
       GetPPException;
       _drawInfo->stroke_pattern=CloneImage( const_cast<MagickCore::Image*>(
-        strokePattern_),0,0,MagickTrue,&exceptionInfo);
+        strokePattern_),0,0,MagickTrue,exceptionInfo);
       ThrowPPException;
     }
 }
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index c0a0a6dbb..649bf5e4b 100644
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -17,24 +17,20 @@
 
 Magick::Pixels::Pixels(Magick::Image &image_)
   : _image(image_),
-    _view(AcquireVirtualCacheView(_image.image(),&_exception)),
     _x(0),
     _y(0),
     _columns(0),
     _rows(0)
 {
-  GetExceptionInfo(&_exception);
-
-  if (!_view)
-    throwExceptionExplicit(OptionError,"Empty view detected.");
+  GetPPException;
+    _view=AcquireVirtualCacheView(_image.image(),exceptionInfo),
+  ThrowPPException;
 }
 
 Magick::Pixels::~Pixels(void)
 {
   if (_view)
     _view=DestroyCacheView(_view);
-  
-  (void) DestroyExceptionInfo(&_exception);
 }
 
 Magick::Quantum* Magick::Pixels::get(const ssize_t x_,const ssize_t y_,
@@ -45,11 +41,10 @@ Magick::Quantum* Magick::Pixels::get(const ssize_t x_,const ssize_t y_,
   _columns=columns_;
   _rows=rows_;
 
+  GetPPException;
   Quantum* pixels=GetCacheViewAuthenticPixels(_view,x_,y_,columns_,rows_,
-    &_exception);
-
-  if (!pixels)
-    throwException(_exception);
+    exceptionInfo);
+  ThrowPPException;
 
   return pixels;
 }
@@ -62,11 +57,10 @@ const Magick::Quantum* Magick::Pixels::getConst(const ssize_t x_,
   _columns=columns_;
   _rows=rows_;
 
+  GetPPException;
   const Quantum* pixels=GetCacheViewVirtualPixels(_view,x_,y_,columns_,rows_,
-    &_exception);
-
-  if (!pixels)
-    throwException(_exception);
+    exceptionInfo);
+  ThrowPPException;
 
   return pixels;
 }
@@ -86,19 +80,19 @@ Magick::Quantum* Magick::Pixels::set(const ssize_t x_,const ssize_t y_,
   _columns=columns_;
   _rows=rows_;
 
+  GetPPException;
   Quantum* pixels=QueueCacheViewAuthenticPixels(_view,x_,y_,columns_,rows_,
-    &_exception);
-
-  if (!pixels)
-    throwException(_exception);
+    exceptionInfo);
+  ThrowPPException;
 
   return pixels;
 }
 
 void Magick::Pixels::sync(void)
 {
-  if(!SyncCacheViewAuthenticPixels(_view,&_exception))
-    throwException(_exception);
+  GetPPException;
+  SyncCacheViewAuthenticPixels(_view,exceptionInfo);
+  ThrowPPException;
 }
 
 // Return pixel colormap index array
@@ -198,8 +192,8 @@ void Magick::PixelData::init(Magick::Image &image_,const ::ssize_t x_,
 
   GetPPException;
   MagickCore::ExportImagePixels(image_.image(),x_,y_,width_,height_,
-    map_.c_str(),type_,_data,&exceptionInfo);
-  if (exceptionInfo.severity != UndefinedException)
+    map_.c_str(),type_,_data,exceptionInfo);
+  if (exceptionInfo->severity != UndefinedException)
     relinquish();
   ThrowPPException;
 }
diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h
index 821feb44f..2ec20a9dd 100644
--- a/MagickCore/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -39,15 +39,15 @@ extern "C" {
     *message; \
  \
   ExceptionInfo \
-    exception; \
+    *exception; \
  \
-  GetExceptionInfo(&exception); \
+  exception=AcquireExceptionInfo(); \
   message=GetExceptionMessage(errno); \
-  (void) ThrowMagickException(&exception,GetMagickModule(),severity, \
+  (void) ThrowMagickException(exception,GetMagickModule(),severity, \
     tag == (const char *) NULL ? "unknown" : tag,"`%s'",message); \
   message=DestroyString(message); \
-  CatchException(&exception); \
-  (void) DestroyExceptionInfo(&exception); \
+  CatchException(exception); \
+  (void) DestroyExceptionInfo(exception); \
   MagickCoreTerminus(); \
   _exit((int) (severity-FatalErrorException)+1); \
 }
@@ -89,6 +89,9 @@ extern "C" {
   return(MagickFalse); \
 }
 
+extern MagickPrivate void
+  InitializeExceptionInfo(ExceptionInfo *);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 0016bfc6c..bcc656b99 100644
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -107,12 +107,12 @@ MagickExport ExceptionInfo *AcquireExceptionInfo(void)
   exception=(ExceptionInfo *) AcquireMagickMemory(sizeof(*exception));
   if (exception == (ExceptionInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  GetExceptionInfo(exception);
+  InitializeExceptionInfo(exception);
   exception->relinquish=MagickTrue;
   return(exception);
 }
 
-/*
+/*l
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
@@ -247,7 +247,7 @@ MagickExport ExceptionInfo *CloneExceptionInfo(ExceptionInfo *exception)
   clone_exception=(ExceptionInfo *) AcquireMagickMemory(sizeof(*exception));
   if (clone_exception == (ExceptionInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  GetExceptionInfo(clone_exception);
+  InitializeExceptionInfo(clone_exception);
   InheritException(clone_exception,exception);
   clone_exception->relinquish=MagickTrue;
   return(clone_exception);
@@ -433,38 +433,6 @@ MagickExport ExceptionInfo *DestroyExceptionInfo(ExceptionInfo *exception)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   G e t E x c e p t i o n I n f o                                           %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  GetExceptionInfo() initializes an exception to default values.
-%
-%  The format of the GetExceptionInfo method is:
-%
-%      GetExceptionInfo(ExceptionInfo *exception)
-%
-%  A description of each parameter follows:
-%
-%    o exception: the exception info.
-%
-*/
-MagickExport void GetExceptionInfo(ExceptionInfo *exception)
-{
-  assert(exception != (ExceptionInfo *) NULL);
-  (void) ResetMagickMemory(exception,0,sizeof(*exception));
-  exception->severity=UndefinedException;
-  exception->exceptions=(void *) NewLinkedList(0);
-  exception->semaphore=AcquireSemaphoreInfo();
-  exception->signature=MagickSignature;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   G e t E x c e p t i o n M e s s a g e                                     %
 %                                                                             %
 %                                                                             %
@@ -675,6 +643,38 @@ MagickExport void InheritException(ExceptionInfo *exception,
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   I n i t i a l i z e t E x c e p t i o n I n f o                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  InitializeExceptionInfo() initializes an exception to default values.
+%
+%  The format of the InitializeExceptionInfo method is:
+%
+%      InitializeExceptionInfo(ExceptionInfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o exception: the exception info.
+%
+*/
+MagickPrivate void InitializeExceptionInfo(ExceptionInfo *exception)
+{
+  assert(exception != (ExceptionInfo *) NULL);
+  (void) ResetMagickMemory(exception,0,sizeof(*exception));
+  exception->severity=UndefinedException;
+  exception->exceptions=(void *) NewLinkedList(0);
+  exception->semaphore=AcquireSemaphoreInfo();
+  exception->signature=MagickSignature;
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   M a g i c k E r r o r                                                     %
 %                                                                             %
 %                                                                             %
diff --git a/MagickCore/exception.h b/MagickCore/exception.h
index a1b1b5a37..ddd80a74f 100644
--- a/MagickCore/exception.h
+++ b/MagickCore/exception.h
@@ -161,7 +161,6 @@ extern MagickExport MagickBooleanType
 extern MagickExport void
   CatchException(ExceptionInfo *),
   ClearMagickException(ExceptionInfo *),
-  GetExceptionInfo(ExceptionInfo *),
   InheritException(ExceptionInfo *,const ExceptionInfo *),
   MagickError(const ExceptionType,const char *,const char *),
   MagickFatalError(const ExceptionType,const char *,const char *),
diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 074b98714..fc5ffc34c 100644
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -411,7 +411,6 @@ extern "C" {
 #define GetDrawInfo  PrependMagickMethod(GetDrawInfo)
 #define GetElapsedTime  PrependMagickMethod(GetElapsedTime)
 #define GetEnvironmentValue  PrependMagickMethod(GetEnvironmentValue)
-#define GetExceptionInfo  PrependMagickMethod(GetExceptionInfo)
 #define GetExceptionMessage  PrependMagickMethod(GetExceptionMessage)
 #define GetExecutionPath  PrependMagickMethod(GetExecutionPath)
 #define GetFirstImageInList  PrependMagickMethod(GetFirstImageInList)
@@ -635,6 +634,7 @@ extern "C" {
 #define ImportQuantumPixels  PrependMagickMethod(ImportQuantumPixels)
 #define increase  PrependMagickMethod(increase)
 #define InheritException  PrependMagickMethod(InheritException)
+#define InitializeExceptionInfo  PrependMagickMethod(InitializeExceptionInfo)
 #define InitializeMagick  PrependMagickMethod(InitializeMagick)
 #define InitializeSignature  PrependMagickMethod(InitializeSignature)
 #define InjectImageBlob  PrependMagickMethod(InjectImageBlob)
diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index f9516b6cd..0866228ec 100644
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -75,14 +75,14 @@ extern "C" {
 #define ThrowXWindowException(severity,tag,context) \
 { \
   ExceptionInfo \
-    exception; \
+    *exception; \
  \
-  GetExceptionInfo(&exception); \
-  (void) ThrowMagickException(&exception,GetMagickModule(),severity, \
+  exception=AcquireExceptionInfo(); \
+  (void) ThrowMagickException(exception,GetMagickModule(),severity, \
     tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context, \
     strerror(errno)); \
-  CatchException(&exception); \
-  (void) DestroyExceptionInfo(&exception); \
+  CatchException(exception); \
+  (void) DestroyExceptionInfo(exception); \
 }
 #define ThrowXWindowFatalException(severity,tag,context) \
 { \
diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h
index 55587fb32..8af79b47c 100644
--- a/MagickWand/magick-wand-private.h
+++ b/MagickWand/magick-wand-private.h
@@ -35,13 +35,13 @@ extern "C" {
 #define ThrowWandFatalException(severity,tag,context) \
 { \
   ExceptionInfo \
-    exception; \
+    *exception; \
  \
-  GetExceptionInfo(&exception); \
-  (void) ThrowMagickException(&exception,GetMagickModule(),severity,tag, \
+  exception=AcquireExceptionInfo(); \
+  (void) ThrowMagickException(exception,GetMagickModule(),severity,tag, \
     "`%s'",context); \
-  CatchException(&exception); \
-  (void) DestroyExceptionInfo(&exception); \
+  CatchException(exception); \
+  (void) DestroyExceptionInfo(exception); \
   MagickWandTerminus(); \
   _exit((int) (severity-FatalErrorException)+1); \
 } 
diff --git a/coders/msl.c b/coders/msl.c
index f8ad33dcc..708f3643b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -629,7 +629,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
     *draw_info;
 
   ExceptionInfo
-    exception;
+    *exception;
 
   GeometryInfo
     geometry_info;
@@ -665,7 +665,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
   */
   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
     "  SAX.startElement(%s",tag);
-  GetExceptionInfo(&exception);
+  exception=AcquireExceptionInfo();
   msl_info=(MSLInfo *) context;
   n=msl_info->n;
   keyword=(const char *) NULL;
@@ -7322,6 +7322,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
   }
   if ( value != NULL )
     value=DestroyString(value);
+  (void) DestroyExceptionInfo(exception);
   (void) LogMagickEvent(CoderEvent,GetMagickModule(),"  )");
 }
 
diff --git a/coders/svg.c b/coders/svg.c
index e7cebb27e..c0101ca86 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -730,7 +730,6 @@ static void SVGStartDocument(void *context)
   */
   (void) LogMagickEvent(CoderEvent,GetMagickModule(),"  SAX.startDocument()");
   svg_info=(SVGInfo *) context;
-  GetExceptionInfo(svg_info->exception);
   parser=svg_info->parser;
   svg_info->document=xmlNewDoc(parser->version);
   if (svg_info->document == (xmlDocPtr) NULL)
diff --git a/coders/wmf.c b/coders/wmf.c
index af55beb74..d5348015c 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -862,9 +862,9 @@ static void ipa_device_begin(wmfAPI * API)
         *image_info;
 
       ExceptionInfo
-        exception;
+        *exception;
 
-      GetExceptionInfo(&exception);
+      exception=AcquireExceptionInfo();
 
       image_info = CloneImageInfo((ImageInfo *) 0);
       (void) CopyMagickString(image_info->filename,ddata->image_info->texture,
@@ -872,7 +872,8 @@ static void ipa_device_begin(wmfAPI * API)
       if ( ddata->image_info->size )
         CloneString(&image_info->size,ddata->image_info->size);
 
-      image = ReadImage(image_info,&exception);
+      image = ReadImage(image_info,exception);
+      (void) DestroyExceptionInfo(exception);
       image_info=DestroyImageInfo(image_info);
       if (image)
         {
@@ -1860,14 +1861,9 @@ static void util_set_brush(wmfAPI * API, wmfDC * dc, const BrushApply brush_appl
             const Image
               *image;
 
-            ExceptionInfo
-              exception;
-
             MagickWand
               *magick_wand;
 
-            GetExceptionInfo(&exception);
-
             image = (Image*)brush_bmp->data;
 
             mode = CopyCompositeOp;  /* Default is copy */