[jbig2-cvs] rev 341 - trunk

[giles at ghostscript.com]

Author: giles
Date: 2004-12-01 10:51:14 -0800 (Wed, 01 Dec 2004)
New Revision: 341

Modified:
   trunk/jbig2_symbol_dict.c
Log:
Fix an error in REFAGG decoding, and properly warn that REFAGGNINST > 1 isn't yes implemented.


Modified: trunk/jbig2_symbol_dict.c
===================================================================
--- trunk/jbig2_symbol_dict.c	2004-12-01 18:50:06 UTC (rev 340)
+++ trunk/jbig2_symbol_dict.c	2004-12-01 18:51:14 UTC (rev 341)
@@ -360,7 +360,9 @@
 		    "aggregate symbol coding (%d instances)", REFAGGNINST);
 
 		  if (REFAGGNINST > 1) {
-		      /* multiple symbols are like a text region */
+		      jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+			"aggregate coding with REFAGGNINST=%d", REFAGGNINST);
+		      /* todo: multiple symbols are like a text region */
 		  } else {
 		      /* 6.5.8.2.2 */
 		      bool SBHUFF = params->SDHUFF;
@@ -374,7 +376,7 @@
 			  /* todo */
 		      } else {
 			  code = jbig2_arith_int_decode(IAID, as, &ID);
-		          code = jbig2_arith_int_decode(IARDY, as, &RDX);
+		          code = jbig2_arith_int_decode(IARDX, as, &RDX);
 		          code = jbig2_arith_int_decode(IARDY, as, &RDY);
 		      }