diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-05-16 22:29:27 +0200 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-16 23:47:14 +0100 |
| commit | 93bd1ff05bf315ed11b305d32eb510bd9a9a7e92 (patch) | |
| tree | 10c2d846ed1193624a5119853bbc2ef9651e197c /fitz/image_tiff.c | |
| parent | 558ad511446cfa1d70891d9e7c9fb1ba942d3d9a (diff) | |
| download | mupdf-93bd1ff05bf315ed11b305d32eb510bd9a9a7e92.tar.xz | |
Add colorspace context.
To prepare for color management, we have to make the device colorspaces
per-context and able to be overridden by users.
Diffstat (limited to 'fitz/image_tiff.c')
| -rw-r--r-- | fitz/image_tiff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fitz/image_tiff.c b/fitz/image_tiff.c index 0efcc622..7a372214 100644 --- a/fitz/image_tiff.c +++ b/fitz/image_tiff.c @@ -358,23 +358,23 @@ fz_decode_tiff_strips(struct tiff *tiff) switch (tiff->photometric) { case 0: /* WhiteIsZero -- inverted */ - tiff->colorspace = fz_device_gray; + tiff->colorspace = fz_device_gray(tiff->ctx); break; case 1: /* BlackIsZero */ - tiff->colorspace = fz_device_gray; + tiff->colorspace = fz_device_gray(tiff->ctx); break; case 2: /* RGB */ - tiff->colorspace = fz_device_rgb; + tiff->colorspace = fz_device_rgb(tiff->ctx); break; case 3: /* RGBPal */ - tiff->colorspace = fz_device_rgb; + tiff->colorspace = fz_device_rgb(tiff->ctx); break; case 5: /* CMYK */ - tiff->colorspace = fz_device_cmyk; + tiff->colorspace = fz_device_cmyk(tiff->ctx); break; case 6: /* YCbCr */ /* it's probably a jpeg ... we let jpeg convert to rgb */ - tiff->colorspace = fz_device_rgb; + tiff->colorspace = fz_device_rgb(tiff->ctx); break; default: fz_throw(tiff->ctx, "unknown photometric: %d", tiff->photometric); @@ -809,7 +809,7 @@ fz_load_tiff(fz_context *ctx, unsigned char *buf, int len) /* CMYK is a subtractive colorspace, we want additive for premul alpha */ if (image->n == 5) { - fz_pixmap *rgb = fz_new_pixmap(tiff.ctx, fz_device_rgb, image->w, image->h); + fz_pixmap *rgb = fz_new_pixmap(tiff.ctx, fz_device_rgb(ctx), image->w, image->h); fz_convert_pixmap(tiff.ctx, rgb, image); rgb->xres = image->xres; rgb->yres = image->yres; |