From 8b15ef579ab990b5631e65767224f1edab447161 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 6 Jun 2010 17:40:18 +0000 Subject: [PATCH] --- ChangeLog | 1 + magick/quantum-export.c | 6 +- magick/quantum-import.c | 168 ++++++++++++++++++++-------------------- 3 files changed, 88 insertions(+), 87 deletions(-) diff --git a/ChangeLog b/ChangeLog index 179086d0e..f0130649f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ 2010-06-06 6.6.2-3 Cristy * Reset image filename when reading inline images. + * Don't clamp floating point values for HDRI-enabled ImageMagick. 2010-05-25 6.6.2-2 Anthony Thyssen * Replaced '^' morphology kernel rotation with two varients '>' and '<' diff --git a/magick/quantum-export.c b/magick/quantum-export.c index cdfc1da91..fcd7a2aba 100644 --- a/magick/quantum-export.c +++ b/magick/quantum-export.c @@ -304,9 +304,9 @@ MagickExport size_t ExportQuantumPixels(const Image *image, for (x=0; x < (ssize_t) image->columns; x++) { alpha=QuantumScale*((double) QuantumRange-q->opacity); - q->red=ClampToQuantum(alpha*q->red); - q->green=ClampToQuantum(alpha*q->green); - q->blue=ClampToQuantum(alpha*q->blue); + q->red=HDRIClampToQuantum(alpha*q->red); + q->green=HDRIClampToQuantum(alpha*q->green); + q->blue=HDRIClampToQuantum(alpha*q->blue); q++; } } diff --git a/magick/quantum-import.c b/magick/quantum-import.c index 246225c19..739b7ac51 100644 --- a/magick/quantum-import.c +++ b/magick/quantum-import.c @@ -415,7 +415,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum( + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; @@ -447,7 +447,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum(pixel), + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum(pixel), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; p+=quantum_info->pad; @@ -475,7 +475,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum(pixel), + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum(pixel), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; p+=quantum_info->pad; @@ -603,12 +603,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum( + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; p=PushShortPixel(endian,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum( + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; @@ -640,11 +640,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum(pixel), + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum(pixel), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; p=PushFloatPixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -672,11 +672,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - indexes[x]=PushColormapIndex(image,ClampToQuantum(pixel), + indexes[x]=PushColormapIndex(image,HDRIClampToQuantum(pixel), &range_exception); *q=image->colormap[(ssize_t) indexes[x]]; p=PushDoublePixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -959,7 +959,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); q->green=q->red; q->blue=q->red; @@ -992,7 +992,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); q->green=q->red; q->blue=q->red; p+=quantum_info->pad; @@ -1021,7 +1021,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); q->green=q->red; q->blue=q->red; p+=quantum_info->pad; @@ -1164,12 +1164,12 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); q->green=q->red; q->blue=q->red; p=PushShortPixel(endian,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum( + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; @@ -1202,11 +1202,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); q->green=q->red; q->blue=q->red; p=PushFloatPixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1235,11 +1235,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); q->green=q->red; q->blue=q->red; p=PushDoublePixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1294,7 +1294,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; q++; @@ -1323,7 +1323,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1348,7 +1348,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1399,7 +1399,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->green=ClampToQuantum((MagickRealType) QuantumRange* + q->green=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; q++; @@ -1428,7 +1428,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1453,7 +1453,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1504,7 +1504,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->blue=ClampToQuantum((MagickRealType) QuantumRange* + q->blue=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; q++; @@ -1533,7 +1533,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1558,7 +1558,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1608,7 +1608,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum( + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; @@ -1637,7 +1637,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1662,7 +1662,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1717,7 +1717,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - indexes[x]=ClampToQuantum((MagickRealType) QuantumRange* + indexes[x]=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; } @@ -1744,7 +1744,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - indexes[x]=ClampToQuantum(pixel); + indexes[x]=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1769,7 +1769,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - indexes[x]=ClampToQuantum(pixel); + indexes[x]=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -1976,13 +1976,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->green=ClampToQuantum((MagickRealType) QuantumRange* + q->green=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->blue=ClampToQuantum((MagickRealType) QuantumRange* + q->blue=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; q++; @@ -2015,11 +2015,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -2048,11 +2048,11 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -2184,16 +2184,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->green=ClampToQuantum((MagickRealType) QuantumRange* + q->green=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->blue=ClampToQuantum((MagickRealType) QuantumRange* + q->blue=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum( + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; @@ -2228,13 +2228,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2265,13 +2265,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2338,16 +2338,16 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->green=ClampToQuantum((MagickRealType) QuantumRange* + q->green=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->blue=ClampToQuantum((MagickRealType) QuantumRange* + q->blue=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - indexes[x]=ClampToQuantum((MagickRealType) QuantumRange* + indexes[x]=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p+=quantum_info->pad; q++; @@ -2382,13 +2382,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - indexes[x]=(IndexPacket) ClampToQuantum(pixel); + indexes[x]=(IndexPacket) HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -2419,13 +2419,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - indexes[x]=(IndexPacket) ClampToQuantum(pixel); + indexes[x]=(IndexPacket) HDRIClampToQuantum(pixel); p+=quantum_info->pad; q++; } @@ -2495,19 +2495,19 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - q->red=ClampToQuantum((MagickRealType) QuantumRange* + q->red=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->green=ClampToQuantum((MagickRealType) QuantumRange* + q->green=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->blue=ClampToQuantum((MagickRealType) QuantumRange* + q->blue=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - indexes[x]=ClampToQuantum((MagickRealType) QuantumRange* + indexes[x]=HDRIClampToQuantum((MagickRealType) QuantumRange* HalfToSinglePrecision(pixel)); p=PushShortPixel(endian,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum( + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; @@ -2544,15 +2544,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - indexes[x]=(IndexPacket) ClampToQuantum(pixel); + indexes[x]=(IndexPacket) HDRIClampToQuantum(pixel); p=PushFloatPixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2585,15 +2585,15 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - q->red=ClampToQuantum(pixel); + q->red=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->green=ClampToQuantum(pixel); + q->green=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->blue=ClampToQuantum(pixel); + q->blue=HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - indexes[x]=(IndexPacket) ClampToQuantum(pixel); + indexes[x]=(IndexPacket) HDRIClampToQuantum(pixel); p=PushDoublePixel(&quantum_state,p,&pixel); - q->opacity=(Quantum) (QuantumRange-ClampToQuantum(pixel)); + q->opacity=(Quantum) (QuantumRange-HDRIClampToQuantum(pixel)); p=PushDoublePixel(&quantum_state,p,&pixel); p+=quantum_info->pad; q++; @@ -2758,9 +2758,9 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, { alpha=QuantumScale*((MagickRealType) QuantumRange-q->opacity); alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha); - q->red=ClampToQuantum(alpha*q->red); - q->green=ClampToQuantum(alpha*q->green); - q->blue=ClampToQuantum(alpha*q->blue); + q->red=HDRIClampToQuantum(alpha*q->red); + q->green=HDRIClampToQuantum(alpha*q->green); + q->blue=HDRIClampToQuantum(alpha*q->blue); q++; } } -- 2.40.0