From 9bb2e12ee97a61657639fcad048aeed80d0a093b Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 10 Mar 2018 16:24:44 -0500 Subject: [PATCH] ... --- MagickCore/compress.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/MagickCore/compress.c b/MagickCore/compress.c index 4f71538ce..7f87b8eff 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -271,7 +271,7 @@ MagickExport void Ascii85Initialize(Image *image) if (image->ascii85 == (Ascii85Info *) NULL) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) memset(image->ascii85,0,sizeof(*image->ascii85)); - image->ascii85->line_break=MaxLineExtent << 1; + image->ascii85->line_break=(ssize_t) MaxLineExtent << 1; image->ascii85->offset=0; } @@ -625,7 +625,8 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) break; - proceed=SetImageProgress(image,LoadImageTag,y,image->rows); + proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, + image->rows); if (proceed == MagickFalse) break; y++; @@ -851,8 +852,8 @@ RestoreMSCWarning \ q=scanline; if (GetPreviousImageInList(huffman_image) == (Image *) NULL) { - proceed=SetImageProgress(huffman_image,LoadImageTag,y, - huffman_image->rows); + proceed=SetImageProgress(huffman_image,LoadImageTag, + (MagickOffsetType) y,huffman_image->rows); if (proceed == MagickFalse) break; } @@ -980,7 +981,7 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length, for (index=0; index < 256; index++) { table[index].prefix=(-1); - table[index].suffix=(short) index; + table[index].suffix=(ssize_t) index; table[index].next=(-1); } next_index=LZWEod+1; @@ -1008,7 +1009,7 @@ MagickExport MagickBooleanType LZWEncodeImage(Image *image,const size_t length, */ OutputCode(last_code); table[next_index].prefix=(ssize_t) last_code; - table[next_index].suffix=(short) pixels[i]; + table[next_index].suffix=(ssize_t) pixels[i]; table[next_index].next=table[last_code].next; table[last_code].next=(ssize_t) next_index; next_index++; -- 2.40.0