sigmoidal-contrast: prevent argument out of range and remove unnecessary ClampToQuantum

[imagemagick] / MagickCore / montage.c

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 900e300bf0144f11c44becb83f4e2a605178494f..4c073c371e6848e89beb6ac5aaad287c7e07ec71 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -496,9 +496,8 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       */
       flags=GetGeometry(montage_info->geometry,&extract_info.x,&extract_info.y,
         &extract_info.width,&extract_info.height);
-      if ((extract_info.x == 0) && (extract_info.y == 0))
-        concatenate=((flags & RhoValue) == 0) && ((flags & SigmaValue) == 0) ?
-          MagickTrue : MagickFalse;
+      concatenate=((flags & RhoValue) == 0) && ((flags & SigmaValue) == 0) ?
+        MagickTrue : MagickFalse;
     }
   border_width=montage_info->border_width;
   bevel_width=0;
@@ -760,9 +759,9 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
           if ((montage_info->frame != (char *) NULL) &&
               (image->compose == DstOutCompositeOp))
             {
-              SetPixelChannelMapMask(image,AlphaChannel);
+              SetPixelChannelMask(image,AlphaChannel);
               (void) NegateImage(image,MagickFalse,exception);
-              SetPixelChannelMapMask(image,DefaultChannels);
+              SetPixelChannelMask(image,DefaultChannels);
             }
         }
       /*