jbig2dec

Ralph Giles <[email protected]> Sat, 22 Jun 2002 02:47:33 -0700
Newsgroups gmane.comp.printing.ghostscript.jbig2dec.cvs
Message-ID <[email protected]>
Update of /cvsroot/jbig2dec/jbig2dec
In directory usw-pr-cvs1:/tmp/cvs-serv17208

Modified Files:
	jbig2_generic.c jbig2_generic.h jbig2_symbol_dict.c 
Log Message:
remove the redundant width and height fields from Jbig2GenericRegionParams
in favor of the dimensions of the passed Jbig2Image


Index: jbig2_generic.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_generic.c	21 Jun 2002 19:10:02 -0000	1.6
+++ jbig2_generic.c	22 Jun 2002 09:47:31 -0000	1.7
@@ -408,8 +408,6 @@
   params.GBTEMPLATE = (seg_flags & 6) >> 1;
   params.TPGDON = (seg_flags & 8) >> 3;
   params.USESKIP = 0;
-  params.GBW = rsi.width;
-  params.GBH = rsi.height;
   memcpy (params.gbat, gbat, gbat_bytes);
 
   image = jbig2_image_new(ctx, rsi.width, rsi.height);

Index: jbig2_generic.h
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jbig2_generic.h	21 Jun 2002 19:10:02 -0000	1.4
+++ jbig2_generic.h	22 Jun 2002 09:47:31 -0000	1.5
@@ -14,8 +14,8 @@
 /* Table 2 */
 typedef struct {
   bool MMR;
-  int32_t GBW;
-  int32_t GBH;
+  /* GBW */
+  /* GBH */
   int GBTEMPLATE;
   bool TPGDON;
   bool USESKIP;

Index: jbig2_symbol_dict.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_symbol_dict.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jbig2_symbol_dict.c	21 Jun 2002 23:11:29 -0000	1.8
+++ jbig2_symbol_dict.c	22 Jun 2002 09:47:31 -0000	1.9
@@ -135,8 +135,6 @@
 
 		  /* Table 16 */
 		  region_params.MMR = 0;
-		  region_params.GBW = SYMWIDTH;
-		  region_params.GBH = HCHEIGHT;
 		  region_params.GBTEMPLATE = params->SDTEMPLATE;
 		  region_params.TPGDON = 0;
 		  region_params.USESKIP = 0;