diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2016-08-16 19:00:46 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2016-09-01 23:09:06 +0800 |
| commit | fff28aaa5166eb984b24fd7dbeb097dad6c8bd65 (patch) | |
| tree | 304f3fbd594ddc658b20e361dbeb3f5121036c51 | |
| parent | 24be8aa1eebc6e6e0361be9b7d06c11cfd261de5 (diff) | |
| download | mupdf-fff28aaa5166eb984b24fd7dbeb097dad6c8bd65.tar.xz | |
Use fz_convert_color().
In preference to colorspace internal to_rgb() function pointer.
| -rw-r--r-- | source/fitz/svg-device.c | 4 | ||||
| -rw-r--r-- | source/pdf/pdf-colorspace.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-device.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c index b947fd38..bb9a8fe0 100644 --- a/source/fitz/svg-device.c +++ b/source/fitz/svg-device.c @@ -187,7 +187,7 @@ svg_dev_fill_color(fz_context *ctx, svg_device *sdev, fz_colorspace *colorspace, if (colorspace != fz_device_rgb(ctx)) { /* If it's not rgb, make it rgb */ - colorspace->to_rgb(ctx, colorspace, color, rgb); + fz_convert_color(ctx, fz_device_rgb(ctx), rgb, colorspace, color); color = rgb; } @@ -210,7 +210,7 @@ svg_dev_stroke_color(fz_context *ctx, svg_device *sdev, fz_colorspace *colorspac if (colorspace != fz_device_rgb(ctx)) { /* If it's not rgb, make it rgb */ - colorspace->to_rgb(ctx, colorspace, color, rgb); + fz_convert_color(ctx, fz_device_rgb(ctx), rgb, colorspace, color); color = rgb; } diff --git a/source/pdf/pdf-colorspace.c b/source/pdf/pdf-colorspace.c index 56dfcf5d..b9cb26e9 100644 --- a/source/pdf/pdf-colorspace.c +++ b/source/pdf/pdf-colorspace.c @@ -59,7 +59,7 @@ separation_to_rgb(fz_context *ctx, fz_colorspace *cs, const float *color, float struct separation *sep = cs->data; float alt[FZ_MAX_COLORS]; fz_eval_function(ctx, sep->tint, color, cs->n, alt, sep->base->n); - sep->base->to_rgb(ctx, sep->base, alt, rgb); + fz_convert_color(ctx, fz_device_rgb(ctx), rgb, sep->base, alt); } static void diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c index 3b974efe..9644d862 100644 --- a/source/pdf/pdf-device.c +++ b/source/pdf/pdf-device.c @@ -238,7 +238,7 @@ pdf_dev_color(fz_context *ctx, pdf_device *pdev, fz_colorspace *colorspace, cons if (cspace == 0) { /* If it's an unknown colorspace, fallback to rgb */ - colorspace->to_rgb(ctx, colorspace, color, rgb); + fz_convert_color(ctx, fz_device_rgb(ctx), rgb, colorspace, color); color = rgb; colorspace = fz_device_rgb(ctx); } |