(no commit message)

[imagemagick] / MagickCore / xwindow-private.h

diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index d1ba2a2f8aa8fa325dd4dc1264aaa8629b72c50f..f9516b6cdfbd2e5aee3d3a0cf344907801b9576d 100644 (file)
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -18,16 +18,17 @@
 #ifndef _MAGICKCORE_XWINDOW_PRIVATE_H
 #define _MAGICKCORE_XWINDOW_PRIVATE_H
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 #include "MagickCore/draw.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/geometry.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantize.h"
 
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 #if defined(MAGICKCORE_X11_DELEGATE)
 
 #include <X11/Xos.h>
@@ -601,14 +602,12 @@ extern MagickExport XrmDatabase
 static inline double XPixelIntensity(const XColor *pixel)
 {
   double
-    blue,
-    green,
-    red;
-
-  red=DecodePixelGamma((MagickRealType) pixel->red);
-  green=DecodePixelGamma((MagickRealType) pixel->green);
-  blue=DecodePixelGamma((MagickRealType) pixel->blue);
-  return(0.298839f*red+0.586811f*green+0.114350f*blue);
+    intensity;
+
+  if ((pixel->red  == pixel->green) && (pixel->green == pixel->blue))
+    return((double) pixel->red);
+  intensity=0.212656*pixel->red+0.715158*pixel->green+0.072186*pixel->blue;
+  return(intensity);
 }
 
 #endif