From ccf55b0bcd8b6e7c1024fd75458e9eed14a090b2 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 24 Apr 2010 17:38:48 +0000 Subject: [PATCH] --- coders/jpeg.c | 1 + coders/png.c | 9 +++++---- configure | 1 + magick/montage.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/coders/jpeg.c b/coders/jpeg.c index 0972f8687..7495f999f 100644 --- 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 ef015a09b..e5b0fddda 100644 --- 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 7303eb0ea..89728bd9e 100755 --- 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 116537191..76717014b 100644 --- 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); -- 2.40.0