(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 0972f86877d177479f8476ddb28e8f907f97b995..7495f999fe53fb5dffe5914a3fe976361b242478 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -79,6 +79,7 @@
 #define JPEG_INTERNAL_OPTIONS
 #if defined(__MINGW32__)
 # define XMD_H 1  /* Avoid conflicting typedef for INT32 */
+typedef unsigned char  boolean
 #endif
 #undef HAVE_STDLIB_H
 #include "jpeglib.h"

diff --git a/coders/png.c b/coders/png.c
index ef015a09b999e733fd7610f622977f7d267bfef1..e5b0fdddae00697860fcb310b14821454dd4c0c5 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -1895,7 +1895,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     {
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
         "    PNG width: %lu, height: %lu",
-        ping_width, ping_height);
+        (unsigned long) ping_width, (unsigned long) ping_height);
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
         "    PNG color_type: %d, bit_depth: %d",
         ping_color_type, ping_bit_depth);
@@ -2056,7 +2056,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       if (logging != MagickFalse)
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "    Reading PNG pHYs chunk: xres: %lu, yres: %lu, units: %d.",
-          x_resolution, y_resolution, unit_type);
+          (unsigned long) x_resolution, (unsigned long) y_resolution,
+          unit_type);
     }
 #endif
   if (png_get_valid(ping,ping_info,PNG_INFO_PLTE))
@@ -3275,9 +3276,9 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
             if (logging != MagickFalse)
               {
                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                  "    jng_width:      %16lu",jng_width);
+                  "    jng_width:      %16lu",(unsigned long) jng_width);
                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                  "    jng_width:      %16lu",jng_height);
+                  "    jng_width:      %16lu",(unsigned long) jng_height);
                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                   "    jng_color_type: %16d",jng_color_type);
                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),

diff --git a/configure b/configure
index 7303eb0eab7452bb1223d92375ce42d2bc48a3aa..89728bd9e000315b6ce4fb3b8463236f38a67a83 100755 (executable)
--- a/configure
+++ b/configure
@@ -21024,6 +21024,7 @@ _ACEOF
 
 fi
 
+AC_TYPE_BOOLEAN
 
 # Define off_t to a suitable type, if standard headers do not define it.
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"

diff --git a/magick/montage.c b/magick/montage.c
index 116537191b470e44d4c1317c234171a01a00d977..76717014bf70015223848694a994ba76e937cc1a 100644 (file)
--- a/magick/montage.c
+++ b/magick/montage.c
@@ -837,7 +837,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
                 metrics.descent+4)*MultilineCensus(value),x_offset+
                 border_width,(montage_info->frame ? y_offset+height+
                 border_width+4 : y_offset+extract_info.height+border_width+
-                (montage_info->shadow != MagickFalse ? 4 : 0)));
+                (montage_info->shadow != MagickFalse ? 4 : 0))+bevel_width);
               (void) CloneString(&draw_info->geometry,geometry);
               (void) CloneString(&draw_info->text,value);
               (void) AnnotateImage(montage,draw_info);