size_t
number_threads;
- number_threads=GetOpenMPMaximumThreads();
+ number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
pixels=(unsigned short **) AcquireQuantumMemory(number_threads,
sizeof(*pixels));
if (pixels == (unsigned short **) NULL)
size_t
number_threads;
- number_threads=GetOpenMPMaximumThreads();
+ number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
transform=(cmsHTRANSFORM *) AcquireQuantumMemory(number_threads,
sizeof(*transform));
if (transform == (cmsHTRANSFORM *) NULL)
*value;
value=GetImageProperty(image,"exif:ColorSpace",exception);
+ (void) value;
/* Future.
if (LocaleCompare(value,"1") != 0)
(void) SetsRGBImageProfile(image,exception);
ThrowProfileException(ImageError,"ColorspaceColorProfileMismatch",
name);
if ((source_colorspace != CMYKColorspace) &&
- (source_colorspace != GRAYColorspace) &&
(source_colorspace != LabColorspace) &&
(source_colorspace != XYZColorspace) &&
(source_colorspace != YCbCrColorspace) &&
- (IssRGBColorspace(image->colorspace) == MagickFalse))
+ (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse))
ThrowProfileException(ImageError,"ColorspaceColorProfileMismatch",
name);
switch (image->rendering_intent)
{
case cmsSigRgbData:
{
- image->type=image->matte == MagickFalse ? TrueColorType :
+ image->type=image->alpha_trait != BlendPixelTrait ? TrueColorType :
TrueColorMatteType;
break;
}
case cmsSigCmykData:
{
- image->type=image->matte == MagickFalse ? ColorSeparationType :
+ image->type=image->alpha_trait != BlendPixelTrait ? ColorSeparationType :
ColorSeparationMatteType;
break;
}
case cmsSigGrayData:
{
- image->type=image->matte == MagickFalse ? GrayscaleType :
+ image->type=image->alpha_trait != BlendPixelTrait ? GrayscaleType :
GrayscaleMatteType;
break;
}