Changeset 8130

Timestamp:

06/03/12 12:28:28 (13 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6/wand

Files:

• mogrify-private.h (modified) (4 diffs)
• mogrify.c (modified) (2 diffs)

ImageMagick/branches/ImageMagick-6/wand/mogrify-private.h

@@ -29 +29 @@
   image=image_stack[k].image; \
 }
-#define DegreesToRadians(x)  (MagickPI*(x)/180.0)
 #define DestroyImageStack() \
 { \
@@ -64 +63 @@
           } \
     }
-#define MagickPI  3.14159265358979323846264338327950288419716939937510
 #define MaxImageStackDepth  32
 #define NewImageStack() \
@@ -94 +92 @@
   image=image_stack[k].image; \
 }
-#define QuantumScale  ((MagickRealType) 1.0/(MagickRealType) QuantumRange)
 #define QuantumTick(i,span) ((MagickBooleanType) ((((i) & ((i)-1)) == 0) || \
    (((i) & 0xfff) == 0) || \
    ((MagickOffsetType) (i) == ((MagickOffsetType) (span)-1))))
-#define RadiansToDegrees(x) (180.0*(x)/MagickPI)
 #define RemoveImageStack(images) \
 { \
@@ -123 +119 @@
 } ImageStack;
 
-static inline MagickRealType MagickPixelIntensity(
-  const MagickPixelPacket *pixel)
-{
-  MagickRealType
-    intensity;
-
-  intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
-  return(intensity);
-}
-
-static inline Quantum MagickPixelIntensityToQuantum(
-  const MagickPixelPacket *pixel)
-{
-  MagickRealType
-    intensity;
-
-  intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
-  return((Quantum) (intensity+0.5));
-}
-
-static inline MagickRealType PixelIntensity(const PixelPacket *pixel)
-{
-  MagickRealType
-    intensity;
-
-  intensity=(MagickRealType) (0.299*pixel->red+0.587*pixel->green+
-    0.114*pixel->blue);
-  return(intensity);
-}
-
-static inline Quantum PixelIntensityToQuantum(const PixelPacket *pixel)
-{
-  MagickRealType
-    intensity;
-
-  intensity=(MagickRealType) (0.299*pixel->red+0.587*pixel->green+
-    0.114*pixel->blue);
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (intensity+0.5));
-#else
-  return((Quantum) intensity);
-#endif
-}
-
-static inline void SetMagickPixelPacket(const Image *image,
-  const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
-{
-  pixel->red=(MagickRealType) color->red;
-  pixel->green=(MagickRealType) color->green;
-  pixel->blue=(MagickRealType) color->blue;
-  if (image->matte != MagickFalse)
-    pixel->opacity=(MagickRealType) color->opacity;
-  if (((image->colorspace == CMYKColorspace) ||
-       (image->storage_class == PseudoClass)) &&
-      (index != (const IndexPacket *) NULL))
-    pixel->index=(MagickRealType) *index;
-}
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }

ImageMagick/branches/ImageMagick-6/wand/mogrify.c

@@ -48 +48 @@
 #include "wand/MagickWand.h"
 #include "wand/mogrify-private.h"
+#include "magick/color-private.h"
 #include "magick/monitor-private.h"
 #include "magick/pixel-private.h"
@@ -62 +63 @@
   Constant declaration.
 */
-static const char
+const char
   BackgroundColor[] = "#fff",  /* white */
   BorderColor[] = "#dfdfdf",  /* gray */