(no commit message)

[imagemagick] / MagickCore / colorspace.h

diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index 261db403b2b8852f827c7d5770ad0fa3d0d5412d..82498b37274e6fa3edf9576492e674954cd59c20 100644 (file)
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 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.
@@ -25,66 +25,43 @@ extern "C" {
 typedef enum
 {
   UndefinedColorspace,
-  RGBColorspace,
-  GRAYColorspace,
-  TransparentColorspace,
-  OHTAColorspace,
-  LabColorspace,
-  XYZColorspace,
-  YCbCrColorspace,
-  YCCColorspace,
-  YIQColorspace,
-  YPbPrColorspace,
-  YUVColorspace,
-  CMYKColorspace,
-  sRGBColorspace,
+  CMYColorspace,           /* negated linear RGB colorspace */
+  CMYKColorspace,          /* CMY with Black separation */
+  GRAYColorspace,          /* Single Channel greyscale (linear) image */
+  HCLColorspace,
+  HCLpColorspace,
   HSBColorspace,
+  HSIColorspace,
   HSLColorspace,
+  HSVColorspace,           /* alias for HSB */
   HWBColorspace,
-  Rec601LumaColorspace,
+  LabColorspace,
+  LCHColorspace,           /* alias for LCHuv */
+  LCHabColorspace,         /* Cylindrical (Polar) Lab */
+  LCHuvColorspace,         /* Cylindrical (Polar) Luv */
+  LogColorspace,
+  LMSColorspace,
+  LuvColorspace,
+  OHTAColorspace,
   Rec601YCbCrColorspace,
-  Rec709LumaColorspace,
   Rec709YCbCrColorspace,
-  LogColorspace,
-  CMYColorspace
+  RGBColorspace,           /* Linear RGB colorspace */
+  scRGBColorspace,         /* ??? */
+  sRGBColorspace,          /* Default: non-linear sRGB colorspace */
+  TransparentColorspace,
+  XYZColorspace,           /* IEEE Color Reference colorspace */
+  YCbCrColorspace,
+  YCCColorspace,
+  YDbDrColorspace,
+  YIQColorspace,
+  YPbPrColorspace,
+  YUVColorspace
 } ColorspaceType;
 
 extern MagickExport MagickBooleanType
   SetImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
   TransformImageColorspace(Image *,const ColorspaceType,ExceptionInfo *);
 
-static inline MagickBooleanType IsCMYKColorspace(
-  const ColorspaceType colorspace)
-{
-  if (colorspace == CMYKColorspace)
-    return(MagickTrue);
-  return(MagickFalse);
-}
-
-static inline MagickBooleanType IsGrayColorspace(
-  const ColorspaceType colorspace)
-{
-  if ((colorspace == GRAYColorspace) || (colorspace == Rec601LumaColorspace) ||
-      (colorspace == Rec709LumaColorspace))
-    return(MagickTrue);
-  return(MagickFalse);
-}
-
-static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
-{
-  if (colorspace == RGBColorspace)
-    return(MagickTrue);
-  return(MagickFalse);
-}
-
-static inline MagickBooleanType IssRGBColorspace(
-  const ColorspaceType colorspace)
-{
-  if ((colorspace == sRGBColorspace) || (colorspace == TransparentColorspace))
-    return(MagickTrue);
-  return(MagickFalse);
-}
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif