shithub: jbig2

Info  •  Files  •  Log  •  Branches

Pull changes back from mupdf's version of jbig2dec to gs's.

MuPDF now tracks the version of jbig2dec extracted from gs.
Shelly spotted a couple of minor things that had been lost as
part of his investigation into bug 694362. Pull them back
across.

--- a/jbig2.c

+++ b/jbig2.c

@@ -390,6 +390,7 @@

 		      "Garbage beyond end of file");

 	}

     }

+    return 0;

 }

 void

--- a/jbig2_segment.c

+++ b/jbig2_segment.c

@@ -244,6 +244,8 @@

                     "unhandled extension segment");

             }

     }

+

+    return 0;

 }

 /* general segment parsing dispatch */

--- a/jbig2_symbol_dict.c

+++ b/jbig2_symbol_dict.c

@@ -953,7 +953,7 @@

         break;

       case 2:

       default:

-	jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,

+        return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,

 	    "symbol dictionary specified invalid huffman table");

 	break;

     }