[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1962: uplift cups/raster.h (bug 3506)

Mats Wichmann mats at linuxfoundation.org
Fri May 18 12:04:09 UTC 2012


------------------------------------------------------------
revno: 1962
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2012-05-18 06:04:09 -0600
message:
  uplift cups/raster.h (bug 3506)
modified:
  headers/All/5.0/cups/raster.h.defs
  headers/cups/raster.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/cups/raster.h.defs'
--- a/headers/All/5.0/cups/raster.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/cups/raster.h.defs	2012-05-18 12:04:09 +0000
@@ -125,15 +125,71 @@
     unsigned int cupsRowFeed;
     unsigned int cupsRowStep;
 } cups_page_header_t;
+typedef struct cups_page_header2_s {
+    char MediaClass[64];
+    char MediaColor[64];
+    char MediaType[64];
+    char OutputType[64];
+    unsigned int AdvanceDistance;
+    cups_adv_t AdvanceMedia;
+    cups_bool_t Collate;
+    cups_cut_t CutMedia;
+    cups_bool_t Duplex;
+    unsigned int HWResolution[3];
+    unsigned int ImagingBoundingBox[4];
+    cups_bool_t InsertSheet;
+    cups_jog_t Jog;
+    cups_edge_t LeadingEdge;
+    unsigned int Margins[3];
+    cups_bool_t ManualFeed;
+    unsigned int MediaPosition;
+    unsigned int MediaWeight;
+    cups_bool_t MirrorPrint;
+    cups_bool_t NegativePrint;
+    unsigned int NumCopies;
+    cups_orient_t Orientation;
+    cups_bool_t OutputFaceUp;
+    unsigned int PageSize[3];
+    cups_bool_t Separations;
+    cups_bool_t TraySwitch;
+    cups_bool_t Tumble;
+    unsigned int cupsWidth;
+    unsigned int cupsHeight;
+    unsigned int cupsMediaType;
+    unsigned int cupsBitsPerColor;
+    unsigned int cupsBitsPerPixel;
+    unsigned int cupsBytesPerLine;
+    cups_order_t cupsColorOrder;
+    cups_cspace_t cupsColorSpace;
+    unsigned int cupsCompression;
+    unsigned int cupsRowCount;
+    unsigned int cupsRowFeed;
+    unsigned int cupsRowStep;
+    unsigned int cupsNumColors;
+    float cupsBorderlessScalingFactor;
+    float cupsPageSize[2];
+    float cupsImagingBBox[4];
+    unsigned int cupsInteger[16];
+    float cupsReal[16];
+    char cupsString[16][64];
+    char cupsMarkerType[64];
+    char cupsRenderingIntent[64];
+    char cupsPageSizeName[64];
+} cups_page_header2_t;
+typedef int (*cups_interpret_cb_t) (cups_page_header2_t *, int);
 extern void cupsRasterClose(cups_raster_t * r);
 extern cups_raster_t *cupsRasterOpen(int fd, cups_mode_t mode);
 extern unsigned int cupsRasterReadHeader(cups_raster_t * r,
 					 cups_page_header_t * h);
+extern unsigned int cupsRasterReadHeader2(cups_raster_t * r,
+					  cups_page_header2_t * h);
 extern unsigned int cupsRasterReadPixels(cups_raster_t * r,
 					 unsigned char *p,
 					 unsigned int len);
 extern unsigned int cupsRasterWriteHeader(cups_raster_t * r,
 					  cups_page_header_t * h);
+extern unsigned int cupsRasterWriteHeader2(cups_raster_t * r,
+					   cups_page_header2_t * h);
 extern unsigned int cupsRasterWritePixels(cups_raster_t * r,
 					  unsigned char *p,
 					  unsigned int len);

=== modified file 'headers/cups/raster.h'
--- a/headers/cups/raster.h	2009-04-26 12:14:54 +0000
+++ b/headers/cups/raster.h	2012-05-18 12:04:09 +0000
@@ -158,6 +158,68 @@
 
 #endif				/* __LSB_VERSION__ >= 4.0 */
 
+#if __LSB_VERSION__ >= 50
+    typedef struct cups_page_header2_s cups_page_header2_t;
+
+    typedef int (*cups_interpret_cb_t) (cups_page_header2_t *, int);
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
+#if __LSB_VERSION__ >= 50
+    struct cups_page_header2_s {
+	char MediaClass[64];
+	char MediaColor[64];
+	char MediaType[64];
+	char OutputType[64];
+	unsigned int AdvanceDistance;
+	cups_adv_t AdvanceMedia;
+	cups_bool_t Collate;
+	cups_cut_t CutMedia;
+	cups_bool_t Duplex;
+	unsigned int HWResolution[3];
+	unsigned int ImagingBoundingBox[4];
+	cups_bool_t InsertSheet;
+	cups_jog_t Jog;
+	cups_edge_t LeadingEdge;
+	unsigned int Margins[3];
+	cups_bool_t ManualFeed;
+	unsigned int MediaPosition;
+	unsigned int MediaWeight;
+	cups_bool_t MirrorPrint;
+	cups_bool_t NegativePrint;
+	unsigned int NumCopies;
+	cups_orient_t Orientation;
+	cups_bool_t OutputFaceUp;
+	unsigned int PageSize[3];
+	cups_bool_t Separations;
+	cups_bool_t TraySwitch;
+	cups_bool_t Tumble;
+	unsigned int cupsWidth;
+	unsigned int cupsHeight;
+	unsigned int cupsMediaType;
+	unsigned int cupsBitsPerColor;
+	unsigned int cupsBitsPerPixel;
+	unsigned int cupsBytesPerLine;
+	cups_order_t cupsColorOrder;
+	cups_cspace_t cupsColorSpace;
+	unsigned int cupsCompression;
+	unsigned int cupsRowCount;
+	unsigned int cupsRowFeed;
+	unsigned int cupsRowStep;
+	unsigned int cupsNumColors;
+	float cupsBorderlessScalingFactor;
+	float cupsPageSize[2];
+	float cupsImagingBBox[4];
+	unsigned int cupsInteger[16];
+	float cupsReal[16];
+	char cupsString[16][64];
+	char cupsMarkerType[64];
+	char cupsRenderingIntent[64];
+	char cupsPageSizeName[64];
+    };
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 
 /* Function prototypes */
 
@@ -173,6 +235,13 @@
     extern unsigned int cupsRasterWritePixels(cups_raster_t * r,
 					      unsigned char *p,
 					      unsigned int len);
+#if __LSB_VERSION__ >= 50
+    extern unsigned int cupsRasterReadHeader2(cups_raster_t * r,
+					      cups_page_header2_t * h);
+    extern unsigned int cupsRasterWriteHeader2(cups_raster_t * r,
+					       cups_page_header2_t * h);
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-18 11:07:48 +0000
+++ b/package/Makefile	2012-05-18 12:04:09 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=4
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list