From 8f78bf49301271b0729e03a5e0cb7c19bd6954e7 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Mon, 10 Apr 2023 14:03:41 +0200 Subject: [PATCH] Silenced coders warnings. --- coders/ftxt.c | 2 +- coders/miff.c | 4 ++++ coders/tga.c | 3 ++- coders/video.c | 1 + coders/wpg.c | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/coders/ftxt.c b/coders/ftxt.c index 726bcaeb14..fe58ec8b61 100644 --- a/coders/ftxt.c +++ b/coders/ftxt.c @@ -467,7 +467,7 @@ static Image *ReadFTXTImage(const ImageInfo *image_info, case 'j': if (*(pf+1)=='\0') ThrowReaderException(DelegateFatalError,"EscapeJproblem"); - /* Drop through... */ + magick_attribute((fallthrough)); default: if ((i+=2) >= MaxTextExtent) ThrowReaderException(DelegateFatalError,"ppf bust"); diff --git a/coders/miff.c b/coders/miff.c index 18d8c5cca3..64fcba684d 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -1884,9 +1884,13 @@ static unsigned char *PopRunlengthPacket(Image *image,unsigned char *pixels, { *pixels++=(unsigned char) (value >> 24); *pixels++=(unsigned char) (value >> 16); + magick_attribute((fallthrough)); } case 16: + { *pixels++=(unsigned char) (value >> 8); + magick_attribute((fallthrough)); + } case 8: { *pixels++=(unsigned char) value; diff --git a/coders/tga.c b/coders/tga.c index 3bfe600a82..86acbe7c7e 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -462,7 +462,8 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception) for (y=0; y < (ssize_t) image->rows; y++) { size_t - y_offset = (flip_y == MagickFalse) ? offset : image->rows-1-offset; + y_offset = (size_t) (flip_y == MagickFalse) ? (size_t) offset : + image->rows-1-offset; q=QueueAuthenticPixels(image,0,y_offset,image->columns,1,exception); if (q == (Quantum *) NULL) diff --git a/coders/video.c b/coders/video.c index 562b298b61..4af52b1043 100644 --- a/coders/video.c +++ b/coders/video.c @@ -644,6 +644,7 @@ static MagickBooleanType WriteVIDEOImage(const ImageInfo *image_info, { blob=(unsigned char *) FileToBlob(previous_image,~0UL,&length, exception); + magick_attribute((fallthrough)); } default: { diff --git a/coders/wpg.c b/coders/wpg.c index 1580b72593..4f6d3dafb6 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -646,7 +646,7 @@ static int UnpackWPG2Raster(Image *image,int bpp,ExceptionInfo *exception) /* duplicate the previous row RunCount x */ for(i=0;i<=RunCount;i++) { - if (InsertRow(image,BImgBuff,(ssize_t) ((ssize_t) image->rows > y ? y : image->rows-1),bpp,exception) == MagickFalse) + if (InsertRow(image,BImgBuff,((ssize_t) image->rows > y ? y : (ssize_t) image->rows-1),bpp,exception) == MagickFalse) { BImgBuff=(unsigned char *) RelinquishMagickMemory(BImgBuff); return(-3);