From 11d449411057c5a71c450e95121426fce5af8854 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 14 Apr 2013 14:36:01 +0000
Subject: [PATCH]
---
MagickCore/colorspace-private.h | 7 ++++---
MagickCore/colorspace.c | 2 ++
MagickCore/colorspace.h | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index e5530fae6..0617c5b3e 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -92,7 +92,7 @@ static inline MagickBooleanType IsGrayColorspace(
static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
{
- if (colorspace == RGBColorspace)
+ if ((colorspace == RGBColorspace) || (colorspace == scRGBColorspace))
return(MagickTrue);
return(MagickFalse);
}
@@ -108,8 +108,9 @@ static inline MagickBooleanType IssRGBColorspace(
static inline MagickBooleanType IssRGBCompatibleColorspace(
const ColorspaceType colorspace)
{
- if ((colorspace == sRGBColorspace) || (colorspace == TransparentColorspace) ||
- (colorspace == RGBColorspace) || (colorspace == GRAYColorspace))
+ if ((colorspace == sRGBColorspace) || (colorspace == RGBColorspace) ||
+ (colorspace == scRGBColorspace) || (colorspace == GRAYColorspace) ||
+ (colorspace == TransparentColorspace))
return(MagickTrue);
return(MagickFalse);
}
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 007d0dc1c..3f74447f2 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1067,6 +1067,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
return(status);
}
case RGBColorspace:
+ case scRGBColorspace:
{
/*
Transform image from sRGB to linear RGB.
@@ -2960,6 +2961,7 @@ static MagickBooleanType TransformsRGBImage(Image *image,
return(status);
}
case RGBColorspace:
+ case scRGBColorspace:
{
/*
Transform linear RGB to sRGB colorspace.
diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index 625480477..9e200a609 100644
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -43,6 +43,7 @@ typedef enum
Rec601YCbCrColorspace,
Rec709YCbCrColorspace,
RGBColorspace,
+ scRGBColorspace,
sRGBColorspace,
TransparentColorspace,
XYZColorspace,
--
2.40.0