jbig2dec

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

Modified Files:
	jbig2.c jbig2_arith_iaid.c jbig2_arith_int.c jbig2_generic.c 
	jbig2_generic.h jbig2_image.c jbig2_image_pbm.c jbig2_mmr.c 
	jbig2_page.c jbig2_priv.h jbig2_segment.c jbig2_symbol_dict.c 
Log Message:
Clean up some warnings from MSVC. Thanks to Russell Lang for the report.


Index: jbig2.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jbig2.c	24 Jun 2002 23:28:13 -0000	1.10
+++ jbig2.c	4 Jul 2002 13:34:29 -0000	1.11
@@ -157,7 +157,7 @@
 int
 jbig2_write (Jbig2Ctx *ctx, const unsigned char *data, size_t size)
 {
-  const int initial_buf_size = 1024;
+  const size_t initial_buf_size = 1024;
 
   if (ctx->buf == NULL)
     {
@@ -182,7 +182,7 @@
       else
 	{
 	  byte *buf;
-	  int buf_size = initial_buf_size;
+	  size_t buf_size = initial_buf_size;
 	  
 	  do
 	    buf_size <<= 1;
@@ -310,7 +310,6 @@
 {
   Jbig2Allocator *ca = ctx->allocator;
   int i;
-  uint32_t seg_ix;
 
   jbig2_free(ca, ctx->buf);
   if (ctx->segments != NULL)

Index: jbig2_arith_iaid.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_iaid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jbig2_arith_iaid.c	1 Jul 2002 19:34:31 -0000	1.1
+++ jbig2_arith_iaid.c	4 Jul 2002 13:34:29 -0000	1.2
@@ -6,6 +6,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h> /* memset() */
+
 #include "jbig2.h"
 #include "jbig2_priv.h"
 #include "jbig2_arith.h"

Index: jbig2_arith_int.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_arith_int.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jbig2_arith_int.c	5 Jun 2002 00:03:49 -0000	1.2
+++ jbig2_arith_int.c	4 Jul 2002 13:34:29 -0000	1.3
@@ -2,6 +2,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h> /* memset() */
+
 #include "jbig2.h"
 #include "jbig2_priv.h"
 #include "jbig2_arith.h"

Index: jbig2_generic.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jbig2_generic.c	24 Jun 2002 15:51:57 -0000	1.9
+++ jbig2_generic.c	4 Jul 2002 13:34:29 -0000	1.10
@@ -17,6 +17,8 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <string.h> /* memcpy(), memset() */
+
 #ifdef OUTPUT_PBM
 #include <stdio.h>
 #endif
@@ -346,7 +348,8 @@
   {
     int i;
     for (i = 0; i < 8; i++)
-      printf ("gbat[%d] = %d\n", i, params->gbat[i]);
+      jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+        "gbat[%d] = %d", i, params->gbat[i]);
   }
   jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
 	      "decode_generic_region: MMR=%d, GBTEMPLATE=%d NYI",

Index: jbig2_generic.h
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_generic.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_generic.h	22 Jun 2002 16:05:45 -0000	1.6
+++ jbig2_generic.h	4 Jul 2002 13:34:29 -0000	1.7
@@ -32,8 +32,4 @@
 			    Jbig2Image *image,
 			    Jbig2ArithCx *GB_stats);
 
-/* 7.4 */
-int
-jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
-			       const uint8_t *segment_data);
 

Index: jbig2_image.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jbig2_image.c	4 Jul 2002 12:08:02 -0000	1.15
+++ jbig2_image.c	4 Jul 2002 13:34:29 -0000	1.16
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h> /* memcpy() */
 
 #include "jbig2.h"
 #include "jbig2_priv.h"

Index: jbig2_image_pbm.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image_pbm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_image_pbm.c	3 Jul 2002 19:43:21 -0000	1.6
+++ jbig2_image_pbm.c	4 Jul 2002 13:34:29 -0000	1.7
@@ -12,6 +12,7 @@
 */
 
 #include <stdio.h>
+#include <ctype.h>
 
 #include "jbig2.h"
 #include "jbig2_image.h"
@@ -38,9 +39,6 @@
 
 int jbig2_image_write_pbm(Jbig2Image *image, FILE *out)
 {
-        int i;
-        char *p = (char *)image->data;
-        
         // pbm header
         fprintf(out, "P4\n%d %d\n", image->width, image->height);
         
@@ -73,11 +71,10 @@
 Jbig2Image *jbig2_image_read_pbm(Jbig2Ctx *ctx, FILE *in)
 {
     int i, dim[2];
-    int stride, pbm_stride;
     int done;
     Jbig2Image *image;
-    char c,buf[32];
-    char *data;
+    int c;
+    char buf[32];
     
     // look for 'P4' magic
     while ((c = fgetc(in)) != 'P') {

Index: jbig2_mmr.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_mmr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jbig2_mmr.c	22 Jun 2002 16:05:45 -0000	1.4
+++ jbig2_mmr.c	4 Jul 2002 13:34:29 -0000	1.5
@@ -4,9 +4,8 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#ifdef OUTPUT_PBM
 #include <stdio.h>
-#endif
+
 #include "jbig2.h"
 #include "jbig2_priv.h"
 #include "jbig2_arith.h"

Index: jbig2_page.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_page.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jbig2_page.c	22 Jun 2002 16:05:45 -0000	1.6
+++ jbig2_page.c	4 Jul 2002 13:34:29 -0000	1.7
@@ -11,7 +11,6 @@
     $Id$
 */
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "jbig2.h"
@@ -93,9 +92,8 @@
     
     // FIXME: would be nice if we tried to work around this
     if (segment->data_length < 19) {
-        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+        return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
             "segment too short");
-        return NULL;
     }
     
     /* 7.4.8.x */
@@ -138,10 +136,9 @@
         page->image = jbig2_image_new(ctx, page->width, page->height);
     }
     if (page->image == NULL) {
-        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
-            "failed to allocate buffer for page image");
         jbig2_free(ctx->allocator, page);
-        return NULL;
+        return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+            "failed to allocate buffer for page image");
     } else {
         jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
             "allocated %dx%d page image (%d bytes)",
@@ -196,7 +193,6 @@
 Jbig2Image *jbig2_get_page(Jbig2Ctx *ctx)
 {
     int index;
-    Jbig2Image *image;
 
     /* search for a completed page */
     for (index=0; index < ctx->max_page_index; index++) {

Index: jbig2_priv.h
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_priv.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jbig2_priv.h	24 Jun 2002 23:28:13 -0000	1.10
+++ jbig2_priv.h	4 Jul 2002 13:34:29 -0000	1.11
@@ -19,6 +19,10 @@
 #define TRUE 1
 #define FALSE 0
 
+#ifndef NULL
+#define NULL ((void*)0)
+#endif
+
 typedef enum {
   JBIG2_FILE_HEADER,
   JBIG2_FILE_SEQUENTIAL_HEADER,
@@ -36,7 +40,7 @@
   void *error_callback_data;
 
   byte *buf;
-  int buf_size;
+  size_t buf_size;
   int buf_rd_ix;
   int buf_wr_ix;
 
@@ -131,6 +135,10 @@
 void jbig2_get_region_segment_info(Jbig2RegionSegmentInfo *info, const byte *segment_data);
 int jbig2_read_text_info(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data);
 
+/* 7.4 */
+int jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+			       const uint8_t *segment_data);
+                               
 /* The word stream design is a compromise between simplicity and
    trying to amortize the number of method calls. Each ::get_next_word
    invocation pulls 4 bytes from the stream, packed big-endian into a

Index: jbig2_segment.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_segment.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jbig2_segment.c	24 Jun 2002 23:28:13 -0000	1.9
+++ jbig2_segment.c	4 Jul 2002 13:34:29 -0000	1.10
@@ -11,8 +11,7 @@
     $Id$
 */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h> /* size_t */
 #include <stdint.h>
 
 #include "jbig2.h"

Index: jbig2_symbol_dict.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_symbol_dict.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jbig2_symbol_dict.c	24 Jun 2002 19:09:47 -0000	1.13
+++ jbig2_symbol_dict.c	4 Jul 2002 13:34:29 -0000	1.14
@@ -15,6 +15,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h> /* memset() */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"