jbig2dec

Update of /cvsroot/jbig2dec/jbig2dec
In directory usw-pr-cvs1:/tmp/cvs-serv30416

Modified Files:
	jbig2_symbol_dict.c 
Log Message:
Update decode_symbol_dict() to use images, fixing a type-related bug from the earlier changes.
Report debug messages through the official mechanism.


Index: jbig2_symbol_dict.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_symbol_dict.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_symbol_dict.c	21 Jun 2002 22:54:03 -0000	1.6
+++ jbig2_symbol_dict.c	21 Jun 2002 22:56:54 -0000	1.7
@@ -93,7 +93,9 @@
 	return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, seg_number,
 			   "Invalid HCHEIGHT value");
 
-      printf ("HCHEIGHT = %d\n", HCHEIGHT);
+      jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, seg_number,
+        "HCHEIGHT = %d", HCHEIGHT);
+        
       for (;;)
 	{
 	  /* 6.5.7 */
@@ -113,7 +115,8 @@
 	    /* todo: mem cleanup */
 	    return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, seg_number,
 			       "Invalid SYMWIDTH value");
-	  printf ("SYMWIDTH = %d\n", SYMWIDTH);
+	  jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, seg_number,
+            "SYMWIDTH = %d", SYMWIDTH);
 
 	  /* 6.5.5 (4c.ii) */
 	  if (!params->SDHUFF || params->SDREFAGG)
@@ -123,7 +126,7 @@
 		{
 		  Jbig2GenericRegionParams region_params;
 		  int sdat_bytes;
-		  byte *gbreg;
+		  Jbig2Image *image;
 
 		  /* Table 16 */
 		  region_params.MMR = 0;
@@ -135,13 +138,12 @@
 		  sdat_bytes = params->SDTEMPLATE == 0 ? 8 : 2;
 		  memcpy(region_params.gbat, params->sdat, sdat_bytes);
 
-		  gbreg = jbig2_alloc(ctx->allocator,
-				      ((SYMWIDTH + 7) >> 3) * HCHEIGHT);
+		  image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
 
 		  code = jbig2_decode_generic_region(ctx, seg_number,
 						     &region_params,
 						     as,
-						     gbreg, GB_stats);
+						     image, GB_stats);
 		  /* todo: handle errors */
 		  /* todo: stash gbreg in SDNEWSYMS */
 						     
@@ -150,7 +152,8 @@
 
 	  /* 6.5.5 (4c.iv) */
 	  NSYMSDECODED = NSYMSDECODED + 1;
-	  printf ("%d of %d decoded\n", NSYMSDECODED, params->SDNUMNEWSYMS);
+	  jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, seg_number,
+            "%d of %d decoded", NSYMSDECODED, params->SDNUMNEWSYMS);
 	}
     }