From: dirk <dirk@git.imagemagick.org>
Date: Sun, 6 Apr 2014 00:10:39 +0000 (+0000)
Subject: Fixed montageImages.
X-Git-Tag: 7.0.1-0~2494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19c9ec453d7bdcd050a3bc6f2a831d1da965a553;p=imagemagick

Fixed montageImages.
---

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index f733d1036..c58091d9c 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -2393,30 +2393,30 @@ namespace Magick
     // Create linked image list
     linkImages(first_,last_);
 
-    // Reset output container to pristine state
-    montageImages_->clear();
-
     // Do montage
     GetPPException;
     images=MagickCore::MontageImages(first_->image(),montageInfo,
       &exceptionInfo);
+
+    // Unlink linked image list
+    unlinkImages(first_,last_);
+
+    // Reset output container to pristine state
+    montageImages_->clear();
+
     if (images != (MagickCore::Image *) NULL)
       insertImages(montageImages_,images);
 
     // Clean up any allocated data in montageInfo
     MagickCore::DestroyMontageInfo(montageInfo);
 
-    // Unlink linked image list
-    unlinkImages(first_,last_);
-
     // Report any montage error
-    throwException(exceptionInfo);
+    ThrowPPException;
 
     // Apply transparency to montage images
     if (montageImages_->size() > 0 && options_.transparentColor().isValid())
-      for_each(first_,last_,transparentImage(options_.transparentColor()));
-
-    (void) MagickCore::DestroyExceptionInfo(&exceptionInfo);
+      for_each(montageImages_->begin(),montageImages_->end(),transparentImage(
+        options_.transparentColor()));
   }
 
   // Morph a set of images