shithub: jbig2

Download patch

ref: 72591b23f58efc91e6b92b85540825f29344d520
parent: 8f1012147073d64f79de947930f1ac6b4fca959a
author: giles <giles@ded80894-8fb9-0310-811b-c03f3676ab4d>
date: Sat Jun 22 05:47:31 EDT 2002

remove the redundant width and height fields from Jbig2GenericRegionParams
in favor of the dimensions of the passed Jbig2Image


git-svn-id: http://svn.ghostscript.com/jbig2dec/trunk@81 ded80894-8fb9-0310-811b-c03f3676ab4d

--- a/jbig2_generic.c
+++ b/jbig2_generic.c
@@ -8,7 +8,7 @@
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
         
-    $Id: jbig2_generic.c,v 1.6 2002/06/21 19:10:02 giles Exp $
+    $Id: jbig2_generic.c,v 1.7 2002/06/22 09:47:31 giles Exp $
 */
 
 /**
@@ -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);
--- a/jbig2_generic.h
+++ b/jbig2_generic.h
@@ -8,14 +8,14 @@
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
         
-    $Id: jbig2_generic.h,v 1.4 2002/06/21 19:10:02 giles Exp $
+    $Id: jbig2_generic.h,v 1.5 2002/06/22 09:47:31 giles Exp $
 */
 
 /* Table 2 */
 typedef struct {
   bool MMR;
-  int32_t GBW;
-  int32_t GBH;
+  /* GBW */
+  /* GBH */
   int GBTEMPLATE;
   bool TPGDON;
   bool USESKIP;
--- a/jbig2_symbol_dict.c
+++ b/jbig2_symbol_dict.c
@@ -8,7 +8,7 @@
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    $Id: jbig2_symbol_dict.c,v 1.8 2002/06/21 23:11:29 giles Exp $
+    $Id: jbig2_symbol_dict.c,v 1.9 2002/06/22 09:47:31 giles Exp $
 */
 
 #include <stddef.h>
@@ -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;