summaryrefslogtreecommitdiff
path: root/pdf/pdf_image.c
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2012-08-06 14:26:03 +0200
committerSebastian Rasmussen <sebras@gmail.com>2012-08-06 14:26:03 +0200
commit2f9a718a565195f3bd28a283ab372be8b4430f00 (patch)
treeb5686c587f37f0887c543e19f407c05dffd0c703 /pdf/pdf_image.c
parent1ce75e79683b5df7046bdddbc0dad4b11805a73b (diff)
downloadmupdf-2f9a718a565195f3bd28a283ab372be8b4430f00.tar.xz
Remove old error mesages turned into comments when adding exceptions
Diffstat (limited to 'pdf/pdf_image.c')
-rw-r--r--pdf/pdf_image.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c
index 873aeb08..249e2c65 100644
--- a/pdf/pdf_image.c
+++ b/pdf/pdf_image.c
@@ -317,7 +317,7 @@ pdf_load_image_imp(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict, fz_stream *c
if (pdf_is_jpx_image(ctx, dict))
{
pdf_load_jpx(xref, dict, image);
- /* RJW: "cannot load jpx image" */
+
if (forcemask)
{
fz_pixmap *mask_pixmap;
@@ -368,7 +368,6 @@ pdf_load_image_imp(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict, fz_stream *c
}
image->base.colorspace = pdf_load_colorspace(xref, obj);
- /* RJW: "cannot load image colorspace" */
if (!strcmp(image->base.colorspace->name, "Indexed"))
indexed = 1;
@@ -400,7 +399,6 @@ pdf_load_image_imp(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict, fz_stream *c
if (!cstm)
{
mask = (fz_image *)pdf_load_image_imp(xref, rdb, obj, NULL, 1);
- /* RJW: "cannot load image mask/softmask" */
}
}
else if (pdf_is_array(obj))
@@ -449,7 +447,6 @@ pdf_load_image_imp(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict, fz_stream *c
else
{
stm = pdf_open_stream(xref, pdf_to_num(dict), pdf_to_gen(dict));
- /* RJW: "cannot open image data stream (%d 0 R)", pdf_to_num(dict) */
}
image->tile = decomp_image_from_stream(ctx, stm, image, cstm != NULL, indexed, 1, 0);
@@ -466,7 +463,6 @@ fz_image *
pdf_load_inline_image(pdf_document *xref, pdf_obj *rdb, pdf_obj *dict, fz_stream *file)
{
return (fz_image *)pdf_load_image_imp(xref, rdb, dict, file, 0);
- /* RJW: "cannot load inline image" */
}
int
@@ -500,7 +496,6 @@ pdf_load_jpx(pdf_document *xref, pdf_obj *dict, pdf_image *image)
fz_var(colorspace);
buf = pdf_load_stream(xref, pdf_to_num(dict), pdf_to_gen(dict));
- /* RJW: "cannot load jpx image data" */
/* FIXME: We can't handle decode arrays for indexed images currently */
fz_try(ctx)
@@ -509,12 +504,10 @@ pdf_load_jpx(pdf_document *xref, pdf_obj *dict, pdf_image *image)
if (obj)
{
colorspace = pdf_load_colorspace(xref, obj);
- /* RJW: "cannot load image colorspace" */
indexed = !strcmp(colorspace->name, "Indexed");
}
img = fz_load_jpx(ctx, buf->data, buf->len, colorspace, indexed);
- /* RJW: "cannot load jpx image" */
if (img && colorspace == NULL)
colorspace = fz_keep_colorspace(ctx, img->colorspace);
@@ -526,7 +519,6 @@ pdf_load_jpx(pdf_document *xref, pdf_obj *dict, pdf_image *image)
if (pdf_is_dict(obj))
{
image->base.mask = (fz_image *)pdf_load_image_imp(xref, NULL, obj, NULL, 1);
- /* RJW: "cannot load image mask/softmask" */
}
obj = pdf_dict_getsa(dict, "Decode", "D");
@@ -584,7 +576,6 @@ pdf_load_image(pdf_document *xref, pdf_obj *dict)
}
image = pdf_load_image_imp(xref, NULL, dict, NULL, 0);
- /* RJW: "cannot load image (%d 0 R)", pdf_to_num(dict) */
pdf_store_item(ctx, dict, image, pdf_image_size(ctx, image));