[jbig2-cvs] rev 418 - trunk

[giles at ghostscript.com]

Author: giles
Date: 2005-07-27 10:29:03 -0700 (Wed, 27 Jul 2005)
New Revision: 418

Modified:
   trunk/jbig2_symbol_dict.c
Log:
Commit an off-by-one fix from Alex Cherepanov related to bug 688244.

Also #ifdef protect a debug image dump that was preventing compilation
in Ghostscript.


Modified: trunk/jbig2_symbol_dict.c
===================================================================
--- trunk/jbig2_symbol_dict.c	2005-07-27 08:29:56 UTC (rev 417)
+++ trunk/jbig2_symbol_dict.c	2005-07-27 17:29:03 UTC (rev 418)
@@ -436,7 +436,7 @@
 
 		      /* Table 18 */
 		      rparams.GRTEMPLATE = params->SDRTEMPLATE;
-		      rparams.reference = (ninsyms >= ID) ? 
+		      rparams.reference = (ID < ninsyms) ? 
 					params->SDINSYMS->glyphs[ID] :
 					SDNEWSYMS->glyphs[ID-ninsyms];
 		      rparams.DX = RDX;
@@ -523,7 +523,9 @@
 	rparams.MMR = 1;
 	code = jbig2_decode_generic_mmr(ctx, segment, &rparams,
 	    data + jbig2_huffman_offset(hs), BMSIZE, image);
+#ifdef OUTPUT_PBM
         jbig2_image_write_pbm_file(image, "collective.pbm");
+#endif
 	jbig2_dump_huffman_state(hs);
 	jbig2_huffman_advance(hs, BMSIZE);
 	jbig2_dump_huffman_state(hs);