summaryrefslogtreecommitdiff
path: root/jbig2dec/jbig2_halftone.c
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2018-05-23 23:12:16 +0800
committerSebastian Rasmussen <sebras@gmail.com>2018-07-13 16:54:30 +0800
commitdc80246ab0a08f3c946d43d930c772dedb8b7bf4 (patch)
tree279536951e4db09283774da97b116e24e5df3c55 /jbig2dec/jbig2_halftone.c
parent689fa69bfd6c423194e58f22835836870cb519b5 (diff)
downloadghostpdl-dc80246ab0a08f3c946d43d930c772dedb8b7bf4.tar.gz
jbig2dec: Report warnings if called functions indicate errors.
The first error detected ought to be a fatal error, but when this error condition is propagated to callers, they should indicate warnings.
Diffstat (limited to 'jbig2dec/jbig2_halftone.c')
-rw-r--r--jbig2dec/jbig2_halftone.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/jbig2dec/jbig2_halftone.c b/jbig2dec/jbig2_halftone.c
index dffdd6c95..dc2f73183 100644
--- a/jbig2dec/jbig2_halftone.c
+++ b/jbig2dec/jbig2_halftone.c
@@ -178,7 +178,7 @@ jbig2_decode_pattern_dict(Jbig2Ctx *ctx, Jbig2Segment *segment,
if (code == 0)
hd = jbig2_hd_new(ctx, params, image);
else
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "error while decoding immediate_generic_region");
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "error while decoding immediate_generic_region");
jbig2_image_release(ctx, image);
return hd;
@@ -282,7 +282,7 @@ jbig2_decode_gray_scale_image(Jbig2Ctx *ctx, Jbig2Segment *segment,
for (i = 0; i < GSBPP; ++i) {
GSPLANES[i] = jbig2_image_new(ctx, GSW, GSH);
if (GSPLANES[i] == NULL) {
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "failed to allocate %dx%d image for GSPLANES", GSW, GSH);
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "failed to allocate %dx%d image for GSPLANES", GSW, GSH);
/* free already allocated */
for (j = i; j > 0;)
jbig2_image_release(ctx, GSPLANES[--j]);
@@ -311,20 +311,20 @@ jbig2_decode_gray_scale_image(Jbig2Ctx *ctx, Jbig2Segment *segment,
} else {
ws = jbig2_word_stream_buf_new(ctx, data, size);
if (ws == NULL) {
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "failed to allocate ws in jbig2_decode_gray_scale_image");
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "failed to allocate ws in jbig2_decode_gray_scale_image");
goto cleanup;
}
as = jbig2_arith_new(ctx, ws);
if (as == NULL) {
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "failed to allocate as in jbig2_decode_gray_scale_image");
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "failed to allocate as in jbig2_decode_gray_scale_image");
goto cleanup;
}
code = jbig2_decode_generic_region(ctx, segment, &rparams, as, GSPLANES[GSBPP - 1], GB_stats);
}
if (code != 0) {
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "error decoding GSPLANES for halftone image");
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "error decoding GSPLANES for halftone image");
goto cleanup;
}
@@ -340,7 +340,7 @@ jbig2_decode_gray_scale_image(Jbig2Ctx *ctx, Jbig2Segment *segment,
code = jbig2_decode_generic_region(ctx, segment, &rparams, as, GSPLANES[j], GB_stats);
}
if (code != 0) {
- jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "failed to decode GSPLANES for halftone image");
+ jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "failed to decode GSPLANES for halftone image");
goto cleanup;
}