Add floating point PageSize and ImagingBBox values along with page

scaling (used for full-bleed with some CUPS drivers) and the name of
the page size that was selected.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4981 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/filter/raster.c b/filter/raster.c
index 8746f5197d2edaab69a2f540f1a528c62454ab04..d790317ff459c4f7279381dfefb2e4061487bc45 100644 (file)
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -609,7 +609,7 @@ cups_raster_read_header(
   */
 
   if (r->sync == CUPS_RASTER_REVSYNC || r->sync == CUPS_RASTER_REVSYNCv1)
-    for (len = 74, s = (union swap_s *)&(r->header.AdvanceDistance);
+    for (len = 81, s = (union swap_s *)&(r->header.AdvanceDistance);
         len > 0;
         len --, s ++)
       s->v = (((((s->b[3] << 8) | s->b[2]) << 8) | s->b[1]) << 8) | s->b[0];

diff --git a/filter/raster.h b/filter/raster.h
index 158303d4fadc811a69e8662c98e26f796438e043..9febee1272892563929c1c88f76ff2df49033690 100644 (file)
--- a/filter/raster.h
+++ b/filter/raster.h
@@ -288,12 +288,16 @@ typedef struct cups_page_header2_s        /**** Version 2 Page Header @since CUPS 1.2@
   unsigned     cupsRowStep;            /* Spacing between lines */
 
   /**** Version 2 Dictionary Values ****/
-  unsigned     cupsNumColors;          /* Number of colors */
-  unsigned     cupsInteger[16];        /* User-defined integer values */
-  float                cupsReal[16];           /* User-defined floating-point values */
-  char         cupsString[16][64];     /* User-defined string values */
-  char         cupsMarkerType[64];     /* Ink/toner type */
-  char         cupsRenderingIntent[64];/* Color rendering intent */
+  unsigned     cupsNumColors;          /* Number of colors @since CUPS 1.2@ */
+  float                cupsPageScaling;        /* Scaling that was applied to page data */
+  float                cupsPageSize[2];        /* Floating point PageSize @since CUPS 1.2@ */
+  float                cupsImagingBBox[4];     /* Floating point ImagingBoundingBox @since CUPS 1.2@ */
+  unsigned     cupsInteger[16];        /* User-defined integer values @since CUPS 1.2@ */
+  float                cupsReal[16];           /* User-defined floating-point values @since CUPS 1.2@ */
+  char         cupsString[16][64];     /* User-defined string values @since CUPS 1.2@ */
+  char         cupsMarkerType[64];     /* Ink/toner type @since CUPS 1.2@ */
+  char         cupsRenderingIntent[64];/* Color rendering intent @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 ****/