summaryrefslogtreecommitdiff
path: root/source/fitz/colorspace.c
diff options
context:
space:
mode:
authorMichael Vrhel <michael.vrhel@artifex.com>2017-08-16 12:39:20 -0700
committerRobin Watts <robin.watts@artifex.com>2017-10-24 15:16:36 +0100
commitb940c2fda5de510ea814ce63c903bcffb99b92db (patch)
treede773977038ca6fc5b4cc3a93c417d1d3dd9698d /source/fitz/colorspace.c
parenta336a599666e34a438852d22d068a2267465376e (diff)
downloadmupdf-b940c2fda5de510ea814ce63c903bcffb99b92db.tar.xz
mudraw: Add ability to specify icc profile for target colorspace.
Diffstat (limited to 'source/fitz/colorspace.c')
-rw-r--r--source/fitz/colorspace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index 17892256..1692a439 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -3670,8 +3670,8 @@ fz_new_icc_colorspace(fz_context *ctx, const char *name, int num, fz_buffer *buf
fz_cmm_init_profile(ctx, profile);
- /* Check if correct type */
- if (num != profile->num_devcomp)
+ /* Check if correct type, if a particular type was expected */
+ if (num != 0 && num != profile->num_devcomp)
{
fz_drop_buffer(ctx, profile->buffer);
fz_cmm_fin_profile(ctx, profile);
@@ -3682,7 +3682,7 @@ fz_new_icc_colorspace(fz_context *ctx, const char *name, int num, fz_buffer *buf
fz_md5_icc(ctx, profile);
if (profile->num_devcomp == 4)
flags |= FZ_CS_SUBTRACTIVE;
- cs = fz_new_colorspace(ctx, name, num, flags, NULL, NULL, NULL, is_lab ? clamp_lab_icc : clamp_default_icc, free_icc, profile, sizeof(profile));
+ cs = fz_new_colorspace(ctx, name, profile->num_devcomp, flags, NULL, NULL, NULL, is_lab ? clamp_lab_icc : clamp_default_icc, free_icc, profile, sizeof(profile));
if (profile->num_devcomp == 4)
{