[jbig2-cvs] rev 293 - trunk

[giles at ghostscript.com]

Author: giles
Date: 2003-12-01 09:54:07 -0800 (Mon, 01 Dec 2003)
New Revision: 293

Modified:
   trunk/jbig2_generic.c
   trunk/jbig2_page.c
   trunk/jbig2_priv.h
   trunk/jbig2_segment.c
Log:
Prefer uint8_t to byte in some internal functions.


Modified: trunk/jbig2_generic.c
===================================================================
--- trunk/jbig2_generic.c	2003-12-01 17:53:45 UTC (rev 292)
+++ trunk/jbig2_generic.c	2003-12-01 17:54:07 UTC (rev 293)
@@ -372,7 +372,7 @@
 
 int
 jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
-			       const uint8_t *segment_data)
+			       const byte *segment_data)
 {
   Jbig2RegionSegmentInfo rsi;
   byte seg_flags;

Modified: trunk/jbig2_page.c
===================================================================
--- trunk/jbig2_page.c	2003-12-01 17:53:45 UTC (rev 292)
+++ trunk/jbig2_page.c	2003-12-01 17:54:07 UTC (rev 293)
@@ -13,7 +13,7 @@
     Artifex Software, Inc.,  101 Lucas Valley Road #110,
     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
 
-    $Id: jbig2_page.c,v 1.15 2002/08/15 14:54:45 giles Exp $
+    $Id$
 */
 
 #ifdef HAVE_CONFIG_H
@@ -63,7 +63,7 @@
  * buffer for the page (or the first stripe)
  **/
 int
-jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data)
+jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data)
 {
     Jbig2Page *page;
 
@@ -178,7 +178,7 @@
  * jbig2_parse_end_of_page: parse an end of page segment
  **/
 int
-jbig2_parse_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data)
+jbig2_parse_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data)
 {
     uint32_t page_number = ctx->pages[ctx->current_page].number;
 

Modified: trunk/jbig2_priv.h
===================================================================
--- trunk/jbig2_priv.h	2003-12-01 17:53:45 UTC (rev 292)
+++ trunk/jbig2_priv.h	2003-12-01 17:54:07 UTC (rev 293)
@@ -55,7 +55,7 @@
 
   Jbig2FileState state;
 
-  byte file_header_flags;
+  uint8_t file_header_flags;
   int32_t n_pages;
 
   int n_segments_max;
@@ -119,9 +119,9 @@
     Jbig2Image *image;
 };
 
-int jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data);
-int jbig2_parse_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data);
-int jbig2_parse_extension_segment(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data);
+int jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data);
+int jbig2_parse_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data);
+int jbig2_parse_extension_segment(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data);
 
 typedef enum {
     JBIG2_COMPOSE_OR = 0,
@@ -139,11 +139,11 @@
   int32_t height;
   int32_t x;
   int32_t y;
-  byte flags;
+  uint8_t flags;
 } Jbig2RegionSegmentInfo;
 
-void jbig2_get_region_segment_info(Jbig2RegionSegmentInfo *info, const byte *segment_data);
-int jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segment_data);
+void jbig2_get_region_segment_info(Jbig2RegionSegmentInfo *info, const uint8_t *segment_data);
+int jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segment_data);
 
 /* 7.4 */
 int jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,

Modified: trunk/jbig2_segment.c
===================================================================
--- trunk/jbig2_segment.c	2003-12-01 17:53:45 UTC (rev 292)
+++ trunk/jbig2_segment.c	2003-12-01 17:54:07 UTC (rev 293)
@@ -157,7 +157,7 @@
 /* parse the generic portion of a region segment data header */
 void
 jbig2_get_region_segment_info(Jbig2RegionSegmentInfo *info,
-			      const byte *segment_data)
+			      const uint8_t *segment_data)
 {
   /* 7.4.1 */
   info->width = jbig2_get_int32(segment_data);