From 2712a54f2b3aaf7e29dd14b5663b8f364b59e7c8 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sun, 17 Sep 2017 07:45:55 +0200 Subject: [PATCH] Removed tim_pixels variable. --- coders/tim.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/coders/tim.c b/coders/tim.c index 32af8e268..aaf17e04d 100644 --- a/coders/tim.c +++ b/coders/tim.c @@ -133,8 +133,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) y; unsigned char - *tim_data, - *tim_pixels; + *tim_data; unsigned short word; @@ -244,7 +243,6 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) tim_data=(unsigned char *) RelinquishMagickMemory(tim_data); ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); } - tim_pixels=tim_data; /* Initialize image structure. */ @@ -265,7 +263,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; - p=tim_pixels+y*bytes_per_line; + p=tim_data+y*bytes_per_line; for (x=0; x < ((ssize_t) image->columns-1); x+=2) { SetPixelIndex(image,(*p) & 0x0f,q); @@ -302,7 +300,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; - p=tim_pixels+y*bytes_per_line; + p=tim_data+y*bytes_per_line; for (x=0; x < (ssize_t) image->columns; x++) { SetPixelIndex(image,*p++,q); @@ -327,7 +325,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) */ for (y=(ssize_t) image->rows-1; y >= 0; y--) { - p=tim_pixels+y*bytes_per_line; + p=tim_data+y*bytes_per_line; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; @@ -362,7 +360,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) */ for (y=(ssize_t) image->rows-1; y >= 0; y--) { - p=tim_pixels+y*bytes_per_line; + p=tim_data+y*bytes_per_line; q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; @@ -393,7 +391,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image->storage_class == PseudoClass) (void) SyncImage(image,exception); - tim_pixels=(unsigned char *) RelinquishMagickMemory(tim_pixels); + tim_data=(unsigned char *) RelinquishMagickMemory(tim_data); if (EOFBlob(image) != MagickFalse) { ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", -- 2.50.1