From 4987fe3e933060a764d58c3a33b6f41a77ec8b3a Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 1 Jul 2017 15:46:24 +0200 Subject: [PATCH] Fixed compiler warnings. --- MagickCore/blob.c | 3 ++- coders/dcm.c | 21 +-------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/MagickCore/blob.c b/MagickCore/blob.c index ff96f3da6..2f86648a2 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -212,11 +212,12 @@ static int % */ MagickExport CustomStreamInfo *AcquireCustomStreamInfo( - ExceptionInfo *exception) + ExceptionInfo *magick_unused(exception)) { CustomStreamInfo *custom_stream; + magick_unreferenced(exception); custom_stream=(CustomStreamInfo *) AcquireMagickMemory( sizeof(*custom_stream)); if (custom_stream == (CustomStreamInfo *) NULL) diff --git a/coders/dcm.c b/coders/dcm.c index 04584d505..414956b0e 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3753,26 +3753,16 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) int c; - size_t - length; - - unsigned int - tag; - /* Read offset table. */ for (i=0; i < (ssize_t) stream_info->remaining; i++) (void) ReadBlobByte(image); - tag=(ReadBlobLSBShort(image) << 16) | ReadBlobLSBShort(image); - (void) tag; + (void)((ReadBlobLSBShort(image) << 16) | ReadBlobLSBShort(image)); length=(size_t) ReadBlobLSBLong(image); stream_info->offset_count=length >> 2; if (stream_info->offset_count != 0) { - MagickOffsetType - offset; - stream_info->offsets=(ssize_t *) AcquireQuantumMemory( stream_info->offset_count,sizeof(*stream_info->offsets)); if (stream_info->offsets == (ssize_t *) NULL) @@ -3867,9 +3857,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) QuantumAny range; - size_t - length; - /* Compute pixel scaling table. */ @@ -3883,9 +3870,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image->compression == RLECompression) { - size_t - length; - unsigned int tag; @@ -3900,9 +3884,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) stream_info->offset_count=length >> 2; if (stream_info->offset_count != 0) { - MagickOffsetType - offset; - stream_info->offsets=(ssize_t *) AcquireQuantumMemory( stream_info->offset_count,sizeof(*stream_info->offsets)); if (stream_info->offsets == (ssize_t *) NULL) -- 2.40.0