(no commit message)

[imagemagick] / MagickCore / xwindow-private.h

diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index c0710560a5a8723853277cb300d35fd8ae31bc62..b1c8b7d48cfd4f1ad38bac29b27822757dbe8c4c 100644 (file)
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -596,21 +596,17 @@ extern MagickExport void
 extern MagickExport XrmDatabase
   XGetResourceDatabase(Display *,const char *);
 
-static inline MagickRealType XPixelIntensity(const XColor *pixel)
+static inline double XPixelIntensity(const XColor *pixel)
 {
   double
     blue,
     green,
     red;
 
-  MagickRealType
-    intensity;
-
-  red=QuantumRange*sRGBDecompanding(QuantumScale*pixel->red);
-  green=QuantumRange*sRGBDecompanding(QuantumScale*pixel->green);
-  blue=QuantumRange*sRGBDecompanding(QuantumScale*pixel->blue);
-  intensity=0.298839*red+0.586811*green+0.114350*blue;
-  return(intensity);
+  red=InversesRGBCompandor((double) pixel->red);
+  green=InversesRGBCompandor((double) pixel->green);
+  blue=InversesRGBCompandor((double) pixel->blue);
+  return(0.298839*red+0.586811*green+0.114350*blue);
 }
 
 #endif