[jbig2-cvs] rev 457 - trunk

[giles at ghostscript.com]

Author: giles
Date: 2007-10-25 15:13:42 -0700 (Thu, 25 Oct 2007)
New Revision: 457

Modified:
   trunk/jbig2_generic.c
   trunk/jbig2_image.h
   trunk/jbig2_page.c
   trunk/jbig2_refinement.c
   trunk/jbig2_symbol_dict.c
   trunk/jbig2_text.c
Log:
Remove some gcc warnings.


Modified: trunk/jbig2_generic.c
===================================================================
--- trunk/jbig2_generic.c	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_generic.c	2007-10-25 22:13:42 UTC (rev 457)
@@ -37,6 +37,7 @@
 
 #include "jbig2.h"
 #include "jbig2_priv.h"
+#include "jbig2_image.h"
 #include "jbig2_arith.h"
 #include "jbig2_generic.h"
 #include "jbig2_mmr.h"

Modified: trunk/jbig2_image.h
===================================================================
--- trunk/jbig2_image.h	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_image.h	2007-10-25 22:13:42 UTC (rev 457)
@@ -20,9 +20,14 @@
 #ifndef _JBIG2_IMAGE_H
 #define _JBIG2_IMAGE_H
 
+int jbig2_image_get_pixel(Jbig2Image *image, int x, int y);
+int jbig2_image_set_pixel(Jbig2Image *image, int x, int y, int value);
+
 /* routines for dumping the image data in various formats */
 /* FIXME: should these be in the client instead? */
 
+#include <stdio.h>
+
 int jbig2_image_write_pbm_file(Jbig2Image *image, char *filename);
 int jbig2_image_write_pbm(Jbig2Image *image, FILE *out);
 Jbig2Image *jbig2_image_read_pbm_file(Jbig2Ctx *ctx, char *filename);
@@ -33,8 +38,4 @@
 int jbig2_image_write_png(Jbig2Image *image, FILE *out);
 #endif
 
-int jbig2_image_get_pixel(Jbig2Image *image, int x, int y);
-int jbig2_image_set_pixel(Jbig2Image *image, int x, int y, int value);
-
-
 #endif /* _JBIG2_IMAGE_H */

Modified: trunk/jbig2_page.c
===================================================================
--- trunk/jbig2_page.c	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_page.c	2007-10-25 22:13:42 UTC (rev 457)
@@ -243,7 +243,6 @@
 {
     /* grow the page to accomodate a new stripe if necessary */
     if (page->striped) {
-	int old_height = page->image->height;
 	int new_height = y + image->height + page->end_row;
 	if (page->image->height < new_height) {
 	    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1,

Modified: trunk/jbig2_refinement.c
===================================================================
--- trunk/jbig2_refinement.c	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_refinement.c	2007-10-25 22:13:42 UTC (rev 457)
@@ -169,7 +169,6 @@
   const int GRH = image->height;
   const int stride = image->stride;
   const int refstride = params->reference->stride;
-  const int dx = params->DX;
   const int dy = params->DY;
   byte *grreg_line = (byte *)image->data;
   byte *grref_line = (byte *)params->reference->data;

Modified: trunk/jbig2_symbol_dict.c
===================================================================
--- trunk/jbig2_symbol_dict.c	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_symbol_dict.c	2007-10-25 22:13:42 UTC (rev 457)
@@ -456,7 +456,7 @@
 		      return NULL;
 		  } else {
 		      /* 6.5.8.2.2 */
-		      bool SBHUFF = params->SDHUFF;
+		      /* bool SBHUFF = params->SDHUFF; */
 		      Jbig2RefinementRegionParams rparams;
 		      Jbig2Image *image;
 		      uint32_t ID;

Modified: trunk/jbig2_text.c
===================================================================
--- trunk/jbig2_text.c	2007-10-25 22:13:23 UTC (rev 456)
+++ trunk/jbig2_text.c	2007-10-25 22:13:42 UTC (rev 457)
@@ -76,7 +76,7 @@
     Jbig2Image *IB;
     Jbig2WordStream *ws = NULL;
     Jbig2HuffmanState *hs = NULL;
-    Jbig2HuffmanTable *SBSYMCODES;
+    Jbig2HuffmanTable *SBSYMCODES = NULL;
     Jbig2ArithState *as = NULL;
     Jbig2ArithIntCtx *IADT = NULL;
     Jbig2ArithIntCtx *IAFS = NULL;