From 7f819ef8855608d9cb1ded5e4f30cdfff1da7c11 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 13 Oct 2019 11:50:29 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1749 --- PerlMagick/t/write.t | 2 +- coders/bmp.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t index 3c530f154..d410fa48e 100644 --- a/PerlMagick/t/write.t +++ b/PerlMagick/t/write.t @@ -107,7 +107,7 @@ print("Portable bitmap format (black and white), binary format ...\n"); testReadWrite( 'PBM:input_p4.pbm', 'PBM:output_p4.pbm', q//, - '83175f7bcc43fb71212dee254c85e355c18bcd25f35d3b9caba66fff7341fa64'); + '217921c0cce7fff17eea865d2ee2075afbc054ce7f4209b3cfeb22f58d8b3e3e'); print("ZSoft IBM PC Paintbrush file ...\n"); ++$test; diff --git a/coders/bmp.c b/coders/bmp.c index 13ccefcfc..f7104a212 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -2311,32 +2311,32 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image) (void) WriteBlobLSBLong(image,0x73524742U); /* sRGB */ } (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.red_primary.x*0x40000000)); + ((ssize_t) image->chromaticity.red_primary.x*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.red_primary.y*0x40000000)); + ((ssize_t) image->chromaticity.red_primary.y*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - ((1.000f-(image->chromaticity.red_primary.x+ + ((ssize_t) (1.000f-(image->chromaticity.red_primary.x+ image->chromaticity.red_primary.y))*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.green_primary.x*0x40000000)); + ((ssize_t) image->chromaticity.green_primary.x*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.green_primary.y*0x40000000)); + ((ssize_t) image->chromaticity.green_primary.y*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - ((1.000f-(image->chromaticity.green_primary.x+ + ((ssize_t) (1.000f-(image->chromaticity.green_primary.x+ image->chromaticity.green_primary.y))*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.blue_primary.x*0x40000000)); + ((ssize_t) image->chromaticity.blue_primary.x*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (image->chromaticity.blue_primary.y*0x40000000)); + ((ssize_t) image->chromaticity.blue_primary.y*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - ((1.000f-(image->chromaticity.blue_primary.x+ + ((ssize_t) (1.000f-(image->chromaticity.blue_primary.x+ image->chromaticity.blue_primary.y))*0x40000000)); (void) WriteBlobLSBLong(image,(unsigned int) - (bmp_info.gamma_scale.x*0x10000)); + ((ssize_t) bmp_info.gamma_scale.x*0x10000)); (void) WriteBlobLSBLong(image,(unsigned int) - (bmp_info.gamma_scale.y*0x10000)); + ((ssize_t) bmp_info.gamma_scale.y*0x10000)); (void) WriteBlobLSBLong(image,(unsigned int) - (bmp_info.gamma_scale.z*0x10000)); + ((ssize_t) bmp_info.gamma_scale.z*0x10000)); if ((image->rendering_intent != UndefinedIntent) || (profile != (StringInfo *) NULL)) {