(no commit message)

[imagemagick] / MagickCore / pixel-private.h

diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h
index 3b4741ca1c0c7f6739660383f3be850192e94ea9..9614017c080d00e83cb459d8e674e7c22296d2a5 100644 (file)
--- a/MagickCore/pixel-private.h
+++ b/MagickCore/pixel-private.h
@@ -1,12 +1,12 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2012 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.
   obtain a copy of the License at
-  
+
     http://www.imagemagick.org/script/license.php
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,108 +22,12 @@
 extern "C" {
 #endif
 
-#include <magick/exception-private.h>
-#include <magick/image.h>
-#include <magick/color.h>
-#include <magick/image-private.h>
-#include <magick/quantum-private.h>
-
-static inline MagickPixelPacket *CloneMagickPixelPacket(
-  const MagickPixelPacket *pixel)
-{
-  MagickPixelPacket
-    *clone_pixel;
-
-  clone_pixel=(MagickPixelPacket *) AcquireAlignedMemory(1,
-    sizeof(*clone_pixel));
-  if (clone_pixel == (MagickPixelPacket *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  *clone_pixel=(*pixel);
-  return(clone_pixel);
-}
-
-static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) && 
-      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
-    return(MagickTrue);
-#else
-  {
-    double
-      alpha,
-      beta;
-
-    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
-    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
-    if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
-      return(MagickTrue);
-  }
-#endif
-  return(MagickFalse);
-}
-
-static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  if (((GetPixelRed(pixel) == 0) ||
-       (GetPixelRed(pixel) == (Quantum) QuantumRange)) &&
-      (GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
-      (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
-    return(MagickTrue);
-#else
-  {
-    double
-      alpha,
-      beta;
-
-    alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
-    beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
-    if (((fabs(GetPixelRed(pixel)) <= MagickEpsilon) ||
-         (fabs(GetPixelRed(pixel)-QuantumRange) <= MagickEpsilon)) &&
-        (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
-      return(MagickTrue);
-    }
-#endif
-  return(MagickFalse);
-}
-
-static inline void SetMagickPixelPacket(const Image *image,
-  const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
-{
-  pixel->red=(MagickRealType) GetPixelRed(color);
-  pixel->green=(MagickRealType) GetPixelGreen(color);
-  pixel->blue=(MagickRealType) GetPixelBlue(color);
-  pixel->opacity=(MagickRealType) GetPixelOpacity(color);
-  if ((image->colorspace == CMYKColorspace) &&
-      (index != (const IndexPacket *) NULL))
-    pixel->index=(MagickRealType) GetPixelIndex(index);
-}
-
-static inline void SetMagickPixelPacketBias(const Image *image,
-  MagickPixelPacket *pixel)
-{
-  /*
-    Obsoleted by MorphologyApply().
-  */
-  pixel->red=image->bias;
-  pixel->green=image->bias;
-  pixel->blue=image->bias;
-  pixel->opacity=image->bias;
-  pixel->index=image->bias;
-}
-
-static inline void SetPixelPacket(const Image *image,
-  const MagickPixelPacket *pixel,PixelPacket *color,IndexPacket *index)
+static inline double MagickEpsilonReciprocal(const double x)
 {
-  SetPixelRed(color,ClampToQuantum(pixel->red));
-  SetPixelGreen(color,ClampToQuantum(pixel->green));
-  SetPixelBlue(color,ClampToQuantum(pixel->blue));
-  if (image->colorspace == CMYKColorspace)
-    SetPixelBlack(index,ClampToQuantum(pixel->black));
-  SetPixelAlpha(color,ClampToQuantum(pixel->alpha));
-  if (image->storage_class == PseudoClass)
-    SetPixelIndex(index,ClampToQuantum(pixel->index));
+  double sign = x < (double) 0.0 ? (double) -1.0 : 
+    (double) 1.0;
+  return((sign*x) >= MagickEpsilon ? (double) 1.0/x : sign*(
+    (double) 1.0/MagickEpsilon));
 }
 
 #if defined(__cplusplus) || defined(c_plusplus)