From 24dc4a15403426c5a7fbcb0c06b5adc99d18c5a0 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sun, 4 Aug 2019 12:13:27 +0200 Subject: [PATCH] Renamed variable to avoid hiding previous local declaration --- MagickCore/quantum-export.c | 58 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index bf0e52c33..988fb8ef4 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -819,13 +819,13 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); - pixel=(float) GetPixelAlpha(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelAlpha(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -1063,13 +1063,13 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); - pixel=(float) GetPixelOpacity(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelOpacity(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -1693,14 +1693,14 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlack(image,p),q); - pixel=(float) (GetPixelAlpha(image,p)); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) (GetPixelAlpha(image,p)); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -1858,14 +1858,14 @@ static void ExportCMYKOQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlack(image,p),q); - pixel=(float) (GetPixelOpacity(image,p)); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) (GetPixelOpacity(image,p)); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -2143,10 +2143,10 @@ static void ExportGrayQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; - pixel=(float) GetPixelLuma(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelLuma(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -2341,12 +2341,12 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; - pixel=(float) GetPixelLuma(image,p); - q=PopFloatPixel(quantum_info,pixel,q); - pixel=(float) (GetPixelAlpha(image,p)); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelLuma(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); + float_pixel=(float) (GetPixelAlpha(image,p)); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -2809,11 +2809,11 @@ static void ExportIndexAlphaQuantum(const Image *image, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelIndex(image,p),q); - pixel=(float) GetPixelAlpha(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelAlpha(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -3552,13 +3552,13 @@ static void ExportRGBAQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); - pixel=(float) GetPixelAlpha(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelAlpha(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -3796,13 +3796,13 @@ static void ExportRGBOQuantum(const Image *image,QuantumInfo *quantum_info, for (x=0; x < (ssize_t) number_pixels; x++) { float - pixel; + float_pixel; q=PopFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); q=PopFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); - pixel=(float) GetPixelOpacity(image,p); - q=PopFloatPixel(quantum_info,pixel,q); + float_pixel=(float) GetPixelOpacity(image,p); + q=PopFloatPixel(quantum_info,float_pixel,q); p+=GetPixelChannels(image); q+=quantum_info->pad; } -- 2.49.0