From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 16 Nov 2013 19:50:27 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb4b2e949b569c9b9995ffe017126832abf44542;p=imagemagick

---

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 1ec7f28b2..0f7c4982a 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -501,12 +501,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
     }
   border_width=montage_info->border_width;
   bevel_width=0;
+  (void) ResetMagickMemory(&frame_info,0,sizeof(frame_info));
   if (montage_info->frame != (char *) NULL)
     {
       char
         absolute_geometry[MaxTextExtent];
 
-      (void) ResetMagickMemory(&frame_info,0,sizeof(frame_info));
       frame_info.width=extract_info.width;
       frame_info.height=extract_info.height;
       (void) FormatLocaleString(absolute_geometry,MaxTextExtent,"%s!",
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 71b9d3e3c..adece8da8 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1861,8 +1861,8 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
     }
   }
   image_view=DestroyCacheView(image_view);
-  carver=lqr_carver_new_ext(pixels,image->columns,image->rows,
-    GetPixelChannels(image),LQR_COLDEPTH_32F);
+  carver=lqr_carver_new_ext(pixels,(int) image->columns,(int) image->rows,
+    (int) GetPixelChannels(image),LQR_COLDEPTH_32F);
   if (carver == (LqrCarver *) NULL)
     {
       pixel_info=RelinquishVirtualMemory(pixel_info);
@@ -1870,7 +1870,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns,
     }
   lqr_carver_set_preserve_input_image(carver);
   lqr_status=lqr_carver_init(carver,(int) delta_x,rigidity);
-  lqr_status=lqr_carver_resize(carver,columns,rows);
+  lqr_status=lqr_carver_resize(carver,(int) columns,(int) rows);
   (void) lqr_status;
   rescale_image=CloneImage(image,lqr_carver_get_width(carver),
     lqr_carver_get_height(carver),MagickTrue,exception);