From cbc22aa1160bec90296f706584925612992941ec Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 16 Oct 2013 01:01:07 +0000 Subject: [PATCH] --- MagickCore/property.c | 24 +----------------------- MagickCore/version.h | 4 ++-- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/MagickCore/property.c b/MagickCore/property.c index 973ca8920..fe0dfc824 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -3695,29 +3695,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, value); if (colorspace < 0) return(MagickFalse); /* FUTURE: value exception?? */ - image->colorspace=(ColorspaceType) colorspace; - image->rendering_intent=UndefinedIntent; - image->gamma=1.000f; - ResetMagickMemory(&image->chromaticity,0,sizeof(image->chromaticity)); - if (IssRGBColorspace(image->colorspace) != MagickFalse) - { - image->rendering_intent=PerceptualIntent; - image->gamma=1.000f/2.200f; - image->chromaticity.red_primary.x=0.6400f; - image->chromaticity.red_primary.y=0.3300f; - image->chromaticity.red_primary.z=0.0300f; - image->chromaticity.green_primary.x=0.3000f; - image->chromaticity.green_primary.y=0.6000f; - image->chromaticity.green_primary.z=0.1000f; - image->chromaticity.blue_primary.x=0.1500f; - image->chromaticity.blue_primary.y=0.0600f; - image->chromaticity.blue_primary.z=0.7900f; - image->chromaticity.white_point.x=0.3127f; - image->chromaticity.white_point.y=0.3290f; - image->chromaticity.white_point.z=0.3583f; - } - return(SyncImagePixelCache(image,exception)); - break; + return(SetImageColorspace(image,colorspace,exception)); } if (LocaleCompare("compose",property) == 0) { diff --git a/MagickCore/version.h b/MagickCore/version.h index fa568e96c..0fdbe00d5 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "13449M" +#define MagickSVNRevision "13449:13452M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -39,7 +39,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2013-10-14" +#define MagickReleaseDate "2013-10-15" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" -- 2.40.0