diff options
| author | Sebastian Rasmussen <sebras@hotmail.com> | 2008-09-07 23:38:20 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@hotmail.com> | 2008-09-07 23:38:20 +0200 |
| commit | 5ef151f3c6f80dea05dc7d8cf9bdc9c108400aff (patch) | |
| tree | c919786a6ec930f5f0d64e370a001178eac48fd0 | |
| parent | 19fa87330f09c993d62b5ea8647f44136d03435b (diff) | |
| download | mupdf-5ef151f3c6f80dea05dc7d8cf9bdc9c108400aff.tar.xz | |
Make CIE colorspace use common colorspace conversion routine, and move debug log in the process.
| -rw-r--r-- | mupdf/pdf_colorspace1.c | 2 | ||||
| -rw-r--r-- | mupdf/pdf_colorspace2.c | 2 | ||||
| -rw-r--r-- | world/res_colorspace.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mupdf/pdf_colorspace1.c b/mupdf/pdf_colorspace1.c index dc5f996d..31245bc3 100644 --- a/mupdf/pdf_colorspace1.c +++ b/mupdf/pdf_colorspace1.c @@ -201,7 +201,7 @@ static fz_colorspace kdevicecmyk = static struct cielab kdevicelab = { - { -1, "Lab", 3, fz_stdconvpixmap, fz_stdconvcolor, labtoxyz, xyztolab, nil }, + { -1, "Lab", 3, pdf_convpixmap, fz_stdconvcolor, labtoxyz, xyztolab, nil }, { 1.0000, 1.0000, 1.0000 }, { 0.0000, 0.0000, 0.0000 }, { -100, 100, -100, 100 }, diff --git a/mupdf/pdf_colorspace2.c b/mupdf/pdf_colorspace2.c index 028628a1..a78a9112 100644 --- a/mupdf/pdf_colorspace2.c +++ b/mupdf/pdf_colorspace2.c @@ -108,6 +108,8 @@ static void fastcmyktorgb(fz_pixmap *src, fz_pixmap *dst) void pdf_convpixmap(fz_colorspace *ss, fz_pixmap *sp, fz_colorspace *ds, fz_pixmap *dp) { + pdf_logimage("convert pixmap from %s to %s\n", ss->name, ds->name); + if (ss == pdf_devicegray) { if (ds == pdf_devicergb) fastgraytorgb(sp, dp); diff --git a/world/res_colorspace.c b/world/res_colorspace.c index a66a0203..a28a6302 100644 --- a/world/res_colorspace.c +++ b/world/res_colorspace.c @@ -65,8 +65,6 @@ fz_stdconvpixmap(fz_colorspace *srcs, fz_pixmap *src, fz_colorspace *dsts, fz_pi unsigned char *s = src->samples; unsigned char *d = dst->samples; - pdf_logimage("convert pixmap from %s to %s\n", srcs->name, dsts->name); - assert(src->w == dst->w && src->h == dst->h); assert(src->n == srcs->n + 1); assert(dst->n == dsts->n + 1); |