Load cups into easysw/current.

[thirdparty/cups.git] / filter / raster.h

diff --git a/filter/raster.h b/filter/raster.h
index f970f557869e9f94fd3a7680789c1fb1dd2831be..3c5b671181ad03d7d5c1e98f4ecdde436bba9a38 100644 (file)
--- a/filter/raster.h
+++ b/filter/raster.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.h 5192 2006-02-27 03:08:47Z mike $"
+ * "$Id: raster.h 5516 2006-05-11 23:54:05Z mike $"
  *
  *   Raster file definitions for the Common UNIX Printing System (CUPS).
  *
@@ -303,19 +303,10 @@ typedef struct cups_page_header2_s        /**** Version 2 Page Header @since CUPS 1.2@
   char         cupsPageSizeName[64];   /* PageSize name @since CUPS 1.2@ */
 } cups_page_header2_t;
 
-typedef struct _cups_raster_s          /**** Raster stream data ****/
-{
-  unsigned             sync;           /* Sync word from start of stream */
-  int                  fd;             /* File descriptor */
-  cups_mode_t          mode;           /* Read/write mode */
-  cups_page_header2_t  header;         /* Raster header for current page */
-  int                  count,          /* Current row run-length count */
-                       remaining,      /* Remaining rows in page image */
-                       bpp;            /* Bytes per pixel/color */
-  unsigned char                *pixels,        /* Pixels for current row */
-                       *pend,          /* End of pixel buffer */
-                       *pcurrent;      /* Current byte in pixel buffer */
-} cups_raster_t;
+typedef struct _cups_raster_s cups_raster_t;
+                                       /**** Raster stream data ****/
+
+typedef int (*cups_interpret_cb_t)(cups_page_header2_t *header, int preferred_bits);
 
 
 /*
@@ -337,7 +328,8 @@ extern unsigned             cupsRasterWritePixels(cups_raster_t *r,
 extern int             cupsRasterInterpretPPD(cups_page_header2_t *h,
                                               ppd_file_t *ppd,
                                               int num_options,
-                                              cups_option_t *options);
+                                              cups_option_t *options,
+                                              cups_interpret_cb_t func);
 extern unsigned                cupsRasterReadHeader2(cups_raster_t *r,
                                              cups_page_header2_t *h);
 extern unsigned                cupsRasterWriteHeader2(cups_raster_t *r,
@@ -350,5 +342,5 @@ extern unsigned             cupsRasterWriteHeader2(cups_raster_t *r,
 #endif /* !_CUPS_RASTER_H_ */
 
 /*
- * End of "$Id: raster.h 5192 2006-02-27 03:08:47Z mike $".
+ * End of "$Id: raster.h 5516 2006-05-11 23:54:05Z mike $".
  */