From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 22 Dec 2017 02:37:08 +0000 (-0500)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=33253
X-Git-Tag: 7.0.7-16~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a43139248a1a63d503c499509ac1f722a7d9af10;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=33253
---

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 3b39268c3..6d0fd0ca9 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -215,7 +215,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   bevel_width=(size_t) (frame_info->outer_bevel+frame_info->inner_bevel);
   x=(ssize_t) frame_info->width-frame_info->x-bevel_width;
   y=(ssize_t) frame_info->height-frame_info->y-bevel_width;
-  if ((x < (ssize_t) image->columns) |  (y < (ssize_t) image->rows))
+  if ((x < (ssize_t) image->columns) ||  (y < (ssize_t) image->rows))
     ThrowImageException(OptionError,"FrameIsLessThanImageSize");
   /*
     Initialize framed image attributes.
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index dd33a8a90..97cb31514 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -372,7 +372,6 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
     extract_info;
 
   size_t
-    bevel_width,
     border_width,
     extent,
     height,
@@ -389,6 +388,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
     width;
 
   ssize_t
+    bevel_width,
     tile,
     x,
     x_offset,
@@ -499,12 +499,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       if ((flags & HeightValue) == 0)
         frame_info.height=frame_info.width;
       if ((flags & XiValue) == 0)
-        frame_info.outer_bevel=(ssize_t) frame_info.width/2;
+        frame_info.outer_bevel=(ssize_t) frame_info.width/2-1;
       if ((flags & PsiValue) == 0)
         frame_info.inner_bevel=frame_info.outer_bevel;
       frame_info.x=(ssize_t) frame_info.width;
       frame_info.y=(ssize_t) frame_info.height;
-      bevel_width=(size_t) MagickMax(frame_info.inner_bevel,
+      bevel_width=(ssize_t) MagickMax(frame_info.inner_bevel,
         frame_info.outer_bevel);
       border_width=(size_t) MagickMax((ssize_t) frame_info.width,
         (ssize_t) frame_info.height);
@@ -763,12 +763,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       tile_image->gravity=montage_info->gravity;
       if (image->gravity != UndefinedGravity)
         tile_image->gravity=image->gravity;
-      (void) FormatLocaleString(tile_geometry,MagickPathExtent,"%.20gx%.20g+0+0",
-        (double) image->columns,(double) image->rows);
+      (void) FormatLocaleString(tile_geometry,MagickPathExtent,
+        "%.20gx%.20g+0+0",(double) image->columns,(double) image->rows);
       flags=ParseGravityGeometry(tile_image,tile_geometry,&geometry,exception);
       x=(ssize_t) (geometry.x+border_width);
       y=(ssize_t) (geometry.y+border_width);
-      if ((montage_info->frame != (char *) NULL) && (bevel_width != 0))
+      if ((montage_info->frame != (char *) NULL) && (bevel_width > 0))
         {
           FrameInfo
             frame_clone;