(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 89c6c6d8cbd25e70dfceb08f5cd1ed4686e27fe3..f52c46f5308c8b4656044ec4e48f5d6de4e42218 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
   * Added % and ! modification flags to morphology distance kernel
     scaling factor.
   * Bug fix for compose math channel handling and morphology diff usage
+  * The -list option returns a 0 status as expected.
 
 2010-05-06  6.6.1-6 Cristy  <quetzlzacatenango@image...>
   * Do not claim gray colorspace if gray image includes a non-gray pixel.

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 8cfdf2eae38806c08c01e4b3f50e36b7c233ada5..bbf83bf1451815987113c97c715adeb95227b5ed 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lm -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/coders/bmp.c b/coders/bmp.c
index b54f2d78625403d11479c28038f9a44b8b339f45..a5471032fc952e0c444ff2f0f70a38e649413aca 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -827,7 +827,9 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
     image->columns=(unsigned long) MagickAbsoluteValue(bmp_info.width);
     image->rows=(unsigned long) MagickAbsoluteValue(bmp_info.height);
     image->depth=bmp_info.bits_per_pixel <= 8 ? bmp_info.bits_per_pixel : 8;
-    image->matte=bmp_info.alpha_mask != 0 ? MagickTrue : MagickFalse;
+    if ((bmp_info.bits_per_pixel == 16) ||
+        (bmp_info.bits_per_pixel == 32))
+      image->matte=bmp_info.alpha_mask != 0 ? MagickTrue : MagickFalse;
     if ((bmp_info.number_colors != 0) || (bmp_info.bits_per_pixel < 16))
       {
         image->storage_class=PseudoClass;

diff --git a/coders/djvu.c b/coders/djvu.c
index 526ea6359337a3665e2fc74aed86fbb7e4bc5dd7..9d383d596eb6b2bcf1f0e72ae70a97b4a3322482 100644 (file)
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -43,6 +43,7 @@
 #include "magick/blob.h"
 #include "magick/blob-private.h"
 #include "magick/cache.h"
+#include "magick/colormap.h"
 #include "magick/constitute.h"
 #include "magick/exception.h"
 #include "magick/exception-private.h"

diff --git a/coders/png.c b/coders/png.c
index f11adbff03ee8d3a0bb1fc73266713ec75ecd034..263cedb51d43f8222fb6ac83f866381c8cc77b3b 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -2715,13 +2715,13 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     quantum_info=DestroyQuantumInfo(quantum_info);
   if (image->storage_class == PseudoClass)
     {
-      unsigned long
+      MagickBooleanType
         matte;
 
       matte=image->matte;
       image->matte=MagickFalse;
       (void) SyncImage(image);
-      image->matte=matte;;
+      image->matte=matte;
     }
   png_read_end(ping,ping_info);
 

diff --git a/config/configure.xml b/config/configure.xml
index 57e167f589daddd84b1807ae735966b17641a1a8..51cdc41f3dc564192a03414f73742034a64189b9 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x661"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,1,6"/>
-  <configure name="RELEASE_DATE" value="2010-04-25"/>
+  <configure name="RELEASE_DATE" value="2010-05-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
@@ -20,7 +20,7 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lm -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
   <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>

diff --git a/libtool b/libtool
index d3c76c5e3dd80b82f87f492ee744c8ca2131eec9..1609b6e23e6ba687c4aa1009cf11ecf4ca21dc05 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -240,7 +240,7 @@ finish_eval=""
 hardcode_into_libs=yes
 
 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.3 /usr/lib64 /lib64"
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.4 /usr/lib64 /lib64"
 
 # Run-time system search path for libraries.
 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/alliance/lib /usr/lib64/atlas /usr/lib64/kicad /usr/lib64/llvm /usr/lib64/mysql /usr/lib64/octave-3.2.4 /usr/lib64/openmotif /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/wine/ /usr/lib64/xulrunner-1.9.2 "
@@ -9046,17 +9046,17 @@ file_list_spec=""
 hardcode_action=immediate
 
 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.4.3 /usr/lib/gcc/x86_64-redhat-linux/4.4.3 /usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../.."
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.4.4 /usr/lib/gcc/x86_64-redhat-linux/4.4.4 /usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../.."
 
 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.4.3/crtbeginS.o"
-postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.3/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../../../lib64/crtn.o"
+predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.4.4/crtbeginS.o"
+postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.4/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../../../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgomp -lgcc_s -lpthread -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.4.3 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.3 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.3/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.4.4 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.4 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.4/../../.."
 
 # ### END LIBTOOL TAG CONFIG: CXX

diff --git a/magick/Magick-config b/magick/Magick-config
index d183dc3613593fd431c0797f839f7dbd250d2d02..8d49fecf8609ff644912c90b4aab53970eedfa48 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lm -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/morphology.c b/magick/morphology.c
index 89eed86d0541546c93685b85fbd4764fbd67ef27..6bbbcd728408d6838ba6e7576d3d088405f95d7c 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -1785,12 +1785,12 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
     case TopHatMorphology:
     case BottomHatMorphology:
       /* Get Difference relative to the original image */
-      (void) CompositeImageChannel(new_image, (channel & ~SyncChannels),
+      (void) CompositeImageChannel(new_image, (ChannelType) (channel & ~SyncChannels),
            DifferenceCompositeOp, image, 0, 0);
       break;
     case EdgeMorphology:
       /* Difference the Eroded image from the saved Dilated image */
-      (void) CompositeImageChannel(new_image, (channel & ~SyncChannels),
+      (void) CompositeImageChannel(new_image, (ChannelType) (channel & ~SyncChannels),
            DifferenceCompositeOp, grad_image, 0, 0);
       grad_image=DestroyImage(grad_image);
       break;

diff --git a/magick/version.h b/magick/version.h
index 442095070d111289101cc46f7d97897faaca909e..6473098dfcb4ced1e6a0a45c3b6f4f8d6f7035f0 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-6"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
-#define MagickReleaseDate  "2010-04-25"
-#define MagickChangeDate   "20100424"
+#define MagickReleaseDate  "2010-05-07"
+#define MagickChangeDate   "20100507"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.1/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)

diff --git a/wand/Wand-config b/wand/Wand-config
index 54db5ce94d65f77f72fbe37adcce6d81e8989dff..f53ebdfc12cde05dcffb086f39fc202e1e7e849a 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lm -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/wand/animate.c b/wand/animate.c
index d8d1854ccb1c4de5646a7c625cf6df24b1f50b7f..cb55609896a269653493d98b554297f8e3b660ac 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -1020,10 +1020,10 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowAnimateException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyAnimate();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/compare.c b/wand/compare.c
index 369f08405a39790616b9d56b402d758f91596d8e..674c792298db47382edf54339ab7632833d22b74 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -674,10 +674,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowCompareException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyCompare();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/composite.c b/wand/composite.c
index 77a6a00b21113ce37633937f3b00ab1706ccb841..ffc553dda48e36ab0e9a4d76b1247274ad41ca3c 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -1146,10 +1146,10 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             if (list < 0)
               ThrowCompositeException(OptionError,"UnrecognizedListType",
                 argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyComposite();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/convert.c b/wand/convert.c
index f24d6c2981af72c7cb83e5aea8bec489feab38bc..794c5e37e4bcb3d17ebde1b496cf01cc9f75d9e5 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -1869,10 +1869,10 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowConvertException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyConvert();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/display.c b/wand/display.c
index f5043726bc223289536ee10fc88e22d4b23e14f3..d43ba03f3aea45f818545348148a67b3a9447815 100644 (file)
--- a/wand/display.c
+++ b/wand/display.c
@@ -1320,10 +1320,10 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowDisplayException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyDisplay();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/identify.c b/wand/identify.c
index c4e39134d9ef96b04595a18597a9e94517c6c21e..541024af48ab8230ce7d7004a8a4e2e588f54f71 100644 (file)
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -654,10 +654,10 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             if (list < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedListType",
                 argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyIdentify();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/import.c b/wand/import.c
index 864afb624a4c871b37bbaabcc5b104fec09915ec..521d3034d5743f2e1da999371b345208c46d6e13 100644 (file)
--- a/wand/import.c
+++ b/wand/import.c
@@ -956,10 +956,10 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowImportException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyImport();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 01b6c2be4ded14a673da2caac7b0a7a33870d8f6..8aa1c1b8cdfb7810ebd3a8f2f2b2fe1095f80589 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -5290,9 +5290,9 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {
@@ -7045,6 +7045,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 break;
               }
             }
+            break;
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/montage.c b/wand/montage.c
index f85abafbf31b6b0cbfa11d78b524c6a1f5bc25ea..e662999a357ec9c5a5f50623a449422fda465287 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -1109,10 +1109,10 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowMontageException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyMontage();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {

diff --git a/wand/stream.c b/wand/stream.c
index a7e010e127bb5f1bfca7475ec755622c8ff1147a..7d62ff4bd6a2ce00c4355b1a56a67e7db2a8ec7d 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -559,10 +559,10 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowStreamException(OptionError,"UnrecognizedListType",argv[i]);
-            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
+            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
               argv+j,exception);
             DestroyStream();
-            return(MagickTrue);
+            return(status != 0 ? MagickFalse : MagickTrue);
           }
         if (LocaleCompare("log",option+1) == 0)
           {