Changeset 8876

Timestamp:

08/08/12 11:43:42 (10 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/trunk/MagickCore/enhance.c (modified) (7 diffs)

ImageMagick/trunk/MagickCore/enhance.c

@@ -1089 +1089 @@
       {
         if (image->channel_mask != DefaultChannels)
-          pixel=p[i];
-        histogram[GetPixelChannels(image)*ScaleQuantumToMap(pixel)+i]++;
+          pixel=(double) p[i];
+        histogram[GetPixelChannels(image)*ScaleQuantumToMap(
+          ClampToQuantum(pixel))+i]++;
       }
       p+=GetPixelChannels(image);
@@ -3310 +3311 @@
     progress;
 
-  double
+  Quantum
     *sigmoidal_map;
 
@@ -3326 +3327 @@
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  sigmoidal_map=(double *) AcquireQuantumMemory(MaxMap+1UL,
+  sigmoidal_map=(Quantum *) AcquireQuantumMemory(MaxMap+1UL,
     sizeof(*sigmoidal_map));
-  if (sigmoidal_map == (double *) NULL)
+  if (sigmoidal_map == (Quantum *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
@@ -3355 +3356 @@
   if (contrast<4.0*MagickEpsilon)
     for (i=0; i <= (ssize_t) MaxMap; i++)
-      sigmoidal_map[i]=
-        (double) ScaleMapToQuantum((double) i);
+      sigmoidal_map[i]=ScaleMapToQuantum((double) i);
   else if (sharpen != MagickFalse)
     for (i=0; i <= (ssize_t) MaxMap; i++)
-      sigmoidal_map[i]=
-        (double) ScaleMapToQuantum( (double) (MaxMap*
+      sigmoidal_map[i]=ScaleMapToQuantum( (double) (MaxMap*
         SCALED_SIGMOIDAL(contrast,QuantumScale*midpoint,(double) i/MaxMap)));
   else
     for (i=0; i <= (ssize_t) MaxMap; i++)
-      sigmoidal_map[i]=
-        (double) ScaleMapToQuantum( (double) (MaxMap*
+      sigmoidal_map[i]=ScaleMapToQuantum((double) (MaxMap*
         INVERSE_SCALED_SIGMOIDAL(contrast,QuantumScale*midpoint,
         (double) i/MaxMap)));
@@ -3375 +3373 @@
         */
         if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].red=ClampToQuantum(sigmoidal_map[
+          image->colormap[i].red=(double) ClampToQuantum((double) sigmoidal_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))]);
         if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].green=ClampToQuantum(sigmoidal_map[
+          image->colormap[i].green=(double) ClampToQuantum((double) sigmoidal_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))]);
         if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].blue=ClampToQuantum(sigmoidal_map[
+          image->colormap[i].blue=(double) ClampToQuantum((double) sigmoidal_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue))]);
         if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
-          image->colormap[i].alpha=ClampToQuantum(sigmoidal_map[
+          image->colormap[i].alpha=(double) ClampToQuantum((double) sigmoidal_map[
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].alpha))]);
       }
@@ -3435 +3433 @@
         if ((traits & UpdatePixelTrait) == 0)
           continue;
-        q[i]=ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(q[i])]);
+        q[i]=ClampToQuantum((double) sigmoidal_map[ScaleQuantumToMap(q[i])]);
       }
       q+=GetPixelChannels(image);
@@ -3456 +3454 @@
   }
   image_view=DestroyCacheView(image_view);
-  sigmoidal_map=(double *) RelinquishMagickMemory(sigmoidal_map);
+  sigmoidal_map=(Quantum *) RelinquishMagickMemory(sigmoidal_map);
   return(status);
 }