summaryrefslogtreecommitdiff
path: root/source/fitz/colorspace.c
diff options
context:
space:
mode:
authorMichael Vrhel <michael.vrhel@artifex.com>2017-10-16 11:32:25 -0700
committerRobin Watts <robin.watts@artifex.com>2017-10-24 15:16:38 +0100
commit8df4061c6c81304a956a277ff521931d24bde489 (patch)
treea96cf6b5d3f14622c521b8a76672ee8e7b024147 /source/fitz/colorspace.c
parentaafab8f3a54cc61998ddb355c5226dd5d471a5cd (diff)
downloadmupdf-8df4061c6c81304a956a277ff521931d24bde489.tar.xz
Add proper handling of bgr<->rgb for pixmap conversions
Diffstat (limited to 'source/fitz/colorspace.c')
-rw-r--r--source/fitz/colorspace.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c
index b168b014..0241742e 100644
--- a/source/fitz/colorspace.c
+++ b/source/fitz/colorspace.c
@@ -3056,7 +3056,11 @@ fz_pixmap_converter *fz_lookup_pixmap_converter(fz_context *ctx, fz_colorspace *
else if (ds == default_rgb) return fast_cmyk_to_rgb;
else return std_conv_pixmap;
}
-
+ else if ((ss == fz_device_rgb(ctx) && ds == fz_device_bgr(ctx)) ||
+ (ds == fz_device_rgb(ctx) && ss == fz_device_bgr(ctx)))
+ {
+ return fast_rgb_to_bgr;
+ }
else
{
const fz_colorspace *ss_base = fz_source_colorspace_cm(ctx, ss);