diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-07-12 21:18:45 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-07-19 19:41:23 +0100 |
| commit | d54763bcd644364c19d3a6a12f889127df583e01 (patch) | |
| tree | 379843a30fbb263e811ac6cbe3d2a4abe13b6fb3 /source/fitz/output-tga.c | |
| parent | d541fc4b9eced1b788377df8c7edfd9b8dea4094 (diff) | |
| download | mupdf-d54763bcd644364c19d3a6a12f889127df583e01.tar.xz | |
Update band writer (especially PSD) to cope with spots
PSD writer now outputs spot colors. Ensure subtractive
colorspaces are stored with proper polarity. The CMYK
and spot components need to be 255-X in the PSD format
Store PSD format resources using correct Pascal style strings.
Photoshop will fail to open if the the ICC profile resource
name is not in proper format.
(Incorporates fixes from Michael).
Diffstat (limited to 'source/fitz/output-tga.c')
| -rw-r--r-- | source/fitz/output-tga.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/fitz/output-tga.c b/source/fitz/output-tga.c index f576dd74..4206154a 100644 --- a/source/fitz/output-tga.c +++ b/source/fitz/output-tga.c @@ -69,7 +69,7 @@ fz_write_pixmap_as_tga(fz_context *ctx, fz_output *out, fz_pixmap *pixmap) fz_try(ctx) { - fz_write_header(ctx, writer, pixmap->w, pixmap->h, pixmap->n, pixmap->alpha, pixmap->xres, pixmap->yres, 0, pixmap->colorspace); + fz_write_header(ctx, writer, pixmap->w, pixmap->h, pixmap->n, pixmap->alpha, pixmap->xres, pixmap->yres, 0, pixmap->colorspace, pixmap->seps); fz_write_band(ctx, writer, -pixmap->stride, pixmap->h, pixmap->samples + pixmap->stride * (pixmap->h-1)); } fz_always(ctx) @@ -90,6 +90,8 @@ tga_write_header(fz_context *ctx, fz_band_writer *writer_, const fz_colorspace * unsigned char head[18]; int d = (alpha && n > 1) ? 4 : (n == 1 ? 1 : 3); + if (writer->super.s != 0) + fz_throw(ctx, FZ_ERROR_GENERIC, "TGA writer cannot cope with spot colors"); if (n-alpha > 1 && n != 3+alpha) fz_throw(ctx, FZ_ERROR_GENERIC, "pixmap must be grayscale/rgb/rgba (with or without alpha) to write as tga"); memset(head, 0, sizeof(head)); |