From aeb2cbc4eb61cc6a04744db1dc52f5319c466e29 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 7 May 2010 13:28:58 +0000 Subject: [PATCH] --- ChangeLog | 1 + Magick++/bin/Magick++-config | 2 +- coders/bmp.c | 4 +++- coders/djvu.c | 1 + coders/png.c | 4 ++-- config/configure.xml | 4 ++-- libtool | 10 +++++----- magick/Magick-config | 2 +- magick/morphology.c | 4 ++-- magick/version.h | 4 ++-- wand/Wand-config | 2 +- wand/animate.c | 4 ++-- wand/compare.c | 4 ++-- wand/composite.c | 4 ++-- wand/convert.c | 4 ++-- wand/display.c | 4 ++-- wand/identify.c | 4 ++-- wand/import.c | 4 ++-- wand/mogrify.c | 5 +++-- wand/montage.c | 4 ++-- wand/stream.c | 4 ++-- 21 files changed, 42 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89c6c6d8c..f52c46f53 100644 --- 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 * 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 8cfdf2eae..bbf83bf14 100755 --- 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 b54f2d786..a5471032f 100644 --- 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 526ea6359..9d383d596 100644 --- 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 f11adbff0..263cedb51 100644 --- 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 57e167f58..51cdc41f3 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/libtool b/libtool index d3c76c5e3..1609b6e23 100755 --- 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 d183dc361..8d49fecf8 100755 --- 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 89eed86d0..6bbbcd728 100644 --- 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 442095070..6473098df 100644 --- 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 54db5ce94..f53ebdfc1 100755 --- 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 d8d1854cc..cb5560989 100644 --- 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 369f08405..674c79229 100644 --- 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 77a6a00b2..ffc553dda 100644 --- 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 f24d6c298..794c5e37e 100644 --- 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 f5043726b..d43ba03f3 100644 --- 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 c4e39134d..541024af4 100644 --- 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 864afb624..521d3034d 100644 --- 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 01b6c2be4..8aa1c1b8c 100644 --- 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 f85abafbf..e662999a3 100644 --- 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 a7e010e12..7d62ff4bd 100644 --- 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) { -- 2.40.0