(no commit message)

[imagemagick] / MagickCore / montage.c

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index cd622049592fe85da23beeddc8cf6571571ed206..90dfae11d5bc0cf5fc7b108cd9aeca603bc83527 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;
@@ -824,12 +823,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
               if (shadow_image != (Image *) NULL)
                 {
                   (void) CompositeImage(shadow_image,image,OverCompositeOp,
-                    MagickFalse,0,0,exception);
+                    MagickTrue,0,0,exception);
                   image=DestroyImage(image);
                   image=shadow_image;
                 }
           }
-          (void) CompositeImage(montage,image,image->compose,MagickFalse,
+          (void) CompositeImage(montage,image,image->compose,MagickTrue,
             x_offset+x,y_offset+y,exception);
           value=GetImageProperty(image,"label",exception);
           if (value != (const char *) NULL)