(no commit message)

[imagemagick] / MagickWand / montage.c

diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index 5ea266a3b3a6b9e09a7eda9600b3f7f4a4ccc874..a2ab411dba7adbb90d2943f79dd7af70ad793e57 100644 (file)
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -414,7 +414,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
                 Form filename for multi-part images.
               */
               (void) InterpretImageFilename(image_info,(Image *) NULL,
-                image_info->filename,(int) scene,filename);
+                image_info->filename,(int) scene,filename,exception);
               if (LocaleCompare(filename,image_info->filename) == 0)
                 (void) FormatLocaleString(filename,MaxTextExtent,"%s.%.20g",
                   image_info->filename,(double) scene);
@@ -1137,7 +1137,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            value=InterpretLocaleValue(argv[i],&p);
+            value=StringToDouble(argv[i],&p);
             (void) value;
             if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
               ThrowMontageInvalidArgumentException(option,argv[i]);
@@ -1282,8 +1282,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
               ThrowMontageException(OptionError,"MissingArgument",option);
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowMontageInvalidArgumentException(option,argv[i]);
-            montage_info->pointsize=InterpretLocaleValue(argv[i],
-              (char **) NULL);
+            montage_info->pointsize=StringToDouble(argv[i],(char **) NULL);
             break;
           }
         if (LocaleCompare("polaroid",option+1) == 0)
@@ -1763,7 +1762,6 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
       /*
         Write image.
       */
-      GetImageException(montage_image,exception);
       (void) CopyMagickString(image_info->filename,argv[argc-1],MaxTextExtent);
       (void) CopyMagickString(montage_image->magick_filename,argv[argc-1],
         MaxTextExtent);