shithub: jbig2

Info  •  Files  •  Log  •  Branches

jbig2dec: Remove end of line characters to jbig2_error() messages.

--- a/jbig2_image.c

+++ b/jbig2_image.c

@@ -256,7 +256,7 @@

     w = ((uint32_t)x + w < dst->width) ? w : ((dst->width >= (uint32_t)x) ? dst->width - (uint32_t)x : 0);

     h = ((uint32_t)y + h < dst->height) ? h : ((dst->height >= (uint32_t)y) ? dst->height - (uint32_t)y : 0);

 #ifdef JBIG2_DEBUG

-    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1, "compositing %dx%d at (%d, %d) after clipping\n", w, h, x, y);

+    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1, "compositing %dx%d at (%d, %d) after clipping", w, h, x, y);

 #endif

     /* check for zero clipping region */

--- a/jbig2_symbol_dict.c

+++ b/jbig2_symbol_dict.c

@@ -73,7 +73,7 @@

     if (dict == NULL)

         return;

-    jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number, "dumping symbol dict as %d individual png files\n", dict->n_symbols);

+    jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number, "dumping symbol dict as %d individual png files", dict->n_symbols);

     for (index = 0; index < dict->n_symbols; index++) {

         snprintf(filename, sizeof(filename), "symbol_%02d-%04d.png", segment->number, index);

         jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, "dumping symbol %d/%d as '%s'", index, dict->n_symbols, filename);

@@ -181,7 +181,7 @@

     if (dindex != n_dicts) {

         /* should never happen */

-        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "counted %d symbol dictionaries but built a list with %d.\n", n_dicts, dindex);

+        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "counted %d symbol dictionaries but built a list with %d.", n_dicts, dindex);

     }

     return (dicts);

@@ -322,7 +322,7 @@

         }

         if (code != 0) {

-            jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "error or OOB decoding height class delta (%d)\n", code);

+            jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number, "error or OOB decoding height class delta (%d)", code);

         }

         if (!params->SDHUFF && jbig2_arith_has_reached_marker(as)) {

@@ -716,10 +716,10 @@

                 if (code)

                     jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "failed to decode exrunlength for exported symbols");

                 else if (exrunlength <= 0)

-                    jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "runlength too small in export symbol table (%d <= 0)\n", exrunlength);

+                    jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, "runlength too small in export symbol table (%d <= 0)", exrunlength);

                 else

                     jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,

-                                "runlength too large in export symbol table (%d > %d - %d)\n", exrunlength, params->SDNUMEXSYMS, j);

+                                "runlength too large in export symbol table (%d > %d - %d)", exrunlength, params->SDNUMEXSYMS, j);

                 /* skip to the cleanup code and return SDEXSYMS = NULL */

                 jbig2_sd_release(ctx, SDEXSYMS);

                 SDEXSYMS = NULL;