summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@hotmail.com>2009-12-02 22:12:01 +0100
committerSebastian Rasmussen <sebras@hotmail.com>2009-12-02 22:12:01 +0100
commite82242e0ad0f8d286796d5a6b8c262cd4e28d6bc (patch)
tree51bee1f0aad22ff3b03a534d5fca3eda4f176c10
parent7fa7cded3f089bb2c5260a886ff064dc49654374 (diff)
downloadmupdf-e82242e0ad0f8d286796d5a6b8c262cd4e28d6bc.tar.xz
Revert to device colorspaces instead of calibrated ones as the latter give bogus colors.
-rw-r--r--mupdf/pdf_colorspace1.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/mupdf/pdf_colorspace1.c b/mupdf/pdf_colorspace1.c
index 69d0e98e..584520de 100644
--- a/mupdf/pdf_colorspace1.c
+++ b/mupdf/pdf_colorspace1.c
@@ -222,6 +222,7 @@ fz_colorspace *pdf_devicepattern = &kdevicepattern;
* Colorspace parsing
*/
+#ifdef USECAL
static fz_colorspace *
loadcalgray(pdf_xref *xref, fz_obj *dict)
{
@@ -384,6 +385,7 @@ loadlab(pdf_xref *xref, fz_obj *dict)
return (fz_colorspace*) cs;
}
+#endif
/*
* ICCBased
@@ -636,12 +638,21 @@ pdf_loadcolorspaceimp(fz_colorspace **csp, pdf_xref *xref, fz_obj *obj)
if (!strcmp(fz_toname(name), "CalCMYK"))
*csp = pdf_devicecmyk;
+#ifdef USECAL
else if (!strcmp(fz_toname(name), "CalGray"))
*csp = loadcalgray(xref, fz_arrayget(obj, 1));
else if (!strcmp(fz_toname(name), "CalRGB"))
*csp = loadcalrgb(xref, fz_arrayget(obj, 1));
else if (!strcmp(fz_toname(name), "Lab"))
*csp = loadlab(xref, fz_arrayget(obj, 1));
+#else
+ else if (!strcmp(fz_toname(name), "CalGray"))
+ *csp = pdf_devicegray;
+ else if (!strcmp(fz_toname(name), "CalRGB"))
+ *csp = pdf_devicergb;
+ else if (!strcmp(fz_toname(name), "Lab"))
+ *csp = pdf_devicelab;
+#endif
else if (!strcmp(fz_toname(name), "ICCBased"))
return loadiccbased(csp, xref, fz_arrayget(obj, 1));