Merge changes from CUPS 1.5.1-r9875.

[thirdparty/cups.git] / filter / image-private.h

diff --git a/filter/image-private.h b/filter/image-private.h
index dcf03a7e6235bc16cba7fdf59541af26624ed73d..2264cf1f72e2b745afbaf434ebbe46fb6ea5f4b6 100644 (file)
--- a/filter/image-private.h
+++ b/filter/image-private.h
@@ -1,10 +1,9 @@
 /*
- * "$Id: image-private.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: image-private.h 7473 2008-04-21 17:51:58Z mike $"
  *
- *   Private image library definitions for the Common UNIX Printing
- *   System (CUPS).
+ *   Private image library definitions for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,11 +24,15 @@
 
 #  include "image.h"
 #  include <cups/cups.h>
-#  include <cups/debug.h>
-#  include <cups/string.h>
+#  include <cups/debug-private.h>
+#  include <cups/string-private.h>
 #  include <stdlib.h>
 #  include <string.h>
-#  include <unistd.h>
+#  ifdef WIN32
+#    include <io.h>
+#  else
+#    include <unistd.h>
+#  endif /* WIN32 */
 #  include <errno.h>
 #  include <math.h>
 
@@ -40,8 +43,8 @@
 
 #  define CUPS_IMAGE_MAX_WIDTH 0x07ffffff
                                        /* 2^27-1 to allow for 15-channel data */
-#  define CUPS_IMAGE_MAX_HEIGHT        0x7fffffff
-                                       /* 2^31-1 */
+#  define CUPS_IMAGE_MAX_HEIGHT        0x3fffffff
+                                       /* 2^30-1 */
 
 #  define CUPS_TILE_SIZE       256     /* 256x256 pixel tiles */
 #  define CUPS_TILE_MINIMUM    10      /* Minimum number of tiles */
@@ -78,7 +81,7 @@ struct cups_ic_s;
 typedef struct cups_itile_s            /**** Image tile ****/
 {
   int                  dirty;          /* True if tile is dirty */
-  long                 pos;            /* Position of tile on disk (-1 if not written) */
+  off_t                        pos;            /* Position of tile on disk (-1 if not written) */
   struct cups_ic_s     *ic;            /* Pixel data */
 } cups_itile_t;
 
@@ -102,7 +105,7 @@ struct cups_image_s                 /**** Image file data ****/
   cups_itile_t         **tiles;        /* Tiles in image */
   cups_ic_t            *first,         /* First cached tile in image */
                        *last;          /* Last cached tile in image */
-  FILE                 *cachefile;     /* Tile cache file */
+  int                  cachefile;      /* Tile cache file */
   char                 cachename[256]; /* Tile cache filename */
 };
 
@@ -213,5 +216,5 @@ extern void         _cupsRasterClearError(void);
 #endif /* !_CUPS_IMAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id: image-private.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: image-private.h 7473 2008-04-21 17:51:58Z mike $".
  */