From 0a2059f64a6bfd22deaa2aba99eba932a867b708 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 30 Jan 2012 12:52:44 +0100 Subject: Move PNG, JPEG and TIFF image loading from muxps into fitz. --- pdf/pdf_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pdf') diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c index 80cbb062..1bad44eb 100644 --- a/pdf/pdf_image.c +++ b/pdf/pdf_image.c @@ -4,7 +4,7 @@ /* TODO: store JPEG compressed samples */ /* TODO: store flate compressed samples */ -static fz_pixmap *pdf_load_jpx_image(pdf_document *xref, fz_obj *dict); +static fz_pixmap *pdf_load_jpx(pdf_document *xref, fz_obj *dict); static void pdf_mask_color_key(fz_pixmap *pix, int n, int *colorkey) @@ -58,7 +58,7 @@ pdf_load_image_imp(pdf_document *xref, fz_obj *rdb, fz_obj *dict, fz_stream *cst /* special case for JPEG2000 images */ if (pdf_is_jpx_image(ctx, dict)) { - tile = pdf_load_jpx_image(xref, dict); + tile = pdf_load_jpx(xref, dict); /* RJW: "cannot load jpx image" */ if (forcemask) { @@ -298,7 +298,7 @@ pdf_is_jpx_image(fz_context *ctx, fz_obj *dict) } static fz_pixmap * -pdf_load_jpx_image(pdf_document *xref, fz_obj *dict) +pdf_load_jpx(pdf_document *xref, fz_obj *dict) { fz_buffer *buf = NULL; fz_colorspace *colorspace = NULL; @@ -325,7 +325,7 @@ pdf_load_jpx_image(pdf_document *xref, fz_obj *dict) indexed = !strcmp(colorspace->name, "Indexed"); } - img = fz_load_jpx_image(ctx, buf->data, buf->len, colorspace); + img = fz_load_jpx(ctx, buf->data, buf->len, colorspace); /* RJW: "cannot load jpx image" */ if (colorspace) -- cgit v1.2.3