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

[Mats Wichmann]

------------------------------------------------------------
revno: 2285
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Fri 2012-05-18 06:04:36 -0600
message:
  uplift cups/raster.h (bug 3506)
modified:
  ts/devchk/cups_raster_h.c
-------------- next part --------------
=== modified file 'ts/devchk/cups_raster_h.c'
--- a/ts/devchk/cups_raster_h.c	2011-12-08 09:18:09 +0000
+++ b/ts/devchk/cups_raster_h.c	2012-05-18 12:04:36 +0000
@@ -135,7 +135,75 @@
 CheckTypeSize(cups_page_header_t,420, 29632, 2, 3.2, NULL, 29631, NULL)
 #else
 Msg("Find size of cups_page_header_t (29632)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""3.2""',NULL,29631, NULL);\n",architecture,29632,0);
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""3.2""',NULL,29631,NULL);\n",architecture,29632,0);
+#endif
+
+#if 1
+CheckTypeSize(struct cups_page_header2_s,0, 40643, 1, 5.0, NULL, 0, NULL)
+Msg("Missing member data for cups_page_header2_s on All\n");
+CheckOffset(struct cups_page_header2_s,MediaClass,0,1,221170)
+CheckOffset(struct cups_page_header2_s,MediaColor,0,1,221171)
+CheckOffset(struct cups_page_header2_s,MediaType,0,1,221172)
+CheckOffset(struct cups_page_header2_s,OutputType,0,1,221173)
+CheckOffset(struct cups_page_header2_s,AdvanceDistance,0,1,221174)
+CheckOffset(struct cups_page_header2_s,AdvanceMedia,0,1,221175)
+CheckOffset(struct cups_page_header2_s,Collate,0,1,221176)
+CheckOffset(struct cups_page_header2_s,CutMedia,0,1,221177)
+CheckOffset(struct cups_page_header2_s,Duplex,0,1,221178)
+CheckOffset(struct cups_page_header2_s,HWResolution,0,1,221179)
+CheckOffset(struct cups_page_header2_s,ImagingBoundingBox,0,1,221180)
+CheckOffset(struct cups_page_header2_s,InsertSheet,0,1,221181)
+CheckOffset(struct cups_page_header2_s,Jog,0,1,221182)
+CheckOffset(struct cups_page_header2_s,LeadingEdge,0,1,221183)
+CheckOffset(struct cups_page_header2_s,Margins,0,1,221184)
+CheckOffset(struct cups_page_header2_s,ManualFeed,0,1,221185)
+CheckOffset(struct cups_page_header2_s,MediaPosition,0,1,221186)
+CheckOffset(struct cups_page_header2_s,MediaWeight,0,1,221187)
+CheckOffset(struct cups_page_header2_s,MirrorPrint,0,1,221188)
+CheckOffset(struct cups_page_header2_s,NegativePrint,0,1,221189)
+CheckOffset(struct cups_page_header2_s,NumCopies,0,1,221190)
+CheckOffset(struct cups_page_header2_s,Orientation,0,1,221191)
+CheckOffset(struct cups_page_header2_s,OutputFaceUp,0,1,221192)
+CheckOffset(struct cups_page_header2_s,PageSize,0,1,221193)
+CheckOffset(struct cups_page_header2_s,Separations,0,1,221194)
+CheckOffset(struct cups_page_header2_s,TraySwitch,0,1,221195)
+CheckOffset(struct cups_page_header2_s,Tumble,0,1,221196)
+CheckOffset(struct cups_page_header2_s,cupsWidth,0,1,221197)
+CheckOffset(struct cups_page_header2_s,cupsHeight,0,1,221198)
+CheckOffset(struct cups_page_header2_s,cupsMediaType,0,1,221199)
+CheckOffset(struct cups_page_header2_s,cupsBitsPerColor,0,1,221200)
+CheckOffset(struct cups_page_header2_s,cupsBitsPerPixel,0,1,221201)
+CheckOffset(struct cups_page_header2_s,cupsBytesPerLine,0,1,221202)
+CheckOffset(struct cups_page_header2_s,cupsColorOrder,0,1,221203)
+CheckOffset(struct cups_page_header2_s,cupsColorSpace,0,1,221204)
+CheckOffset(struct cups_page_header2_s,cupsCompression,0,1,221205)
+CheckOffset(struct cups_page_header2_s,cupsRowCount,0,1,221206)
+CheckOffset(struct cups_page_header2_s,cupsRowFeed,0,1,221207)
+CheckOffset(struct cups_page_header2_s,cupsRowStep,0,1,221208)
+CheckOffset(struct cups_page_header2_s,cupsNumColors,0,1,221209)
+CheckOffset(struct cups_page_header2_s,cupsBorderlessScalingFactor,0,1,221210)
+CheckOffset(struct cups_page_header2_s,cupsPageSize,0,1,221211)
+CheckOffset(struct cups_page_header2_s,cupsImagingBBox,0,1,221212)
+CheckOffset(struct cups_page_header2_s,cupsInteger,0,1,221213)
+CheckOffset(struct cups_page_header2_s,cupsReal,0,1,221214)
+CheckOffset(struct cups_page_header2_s,cupsString,0,1,221215)
+CheckOffset(struct cups_page_header2_s,cupsMarkerType,0,1,221216)
+CheckOffset(struct cups_page_header2_s,cupsRenderingIntent,0,1,221217)
+CheckOffset(struct cups_page_header2_s,cupsPageSizeName,0,1,221218)
+#endif
+
+#if 1
+CheckTypeSize(cups_page_header2_t,0, 40644, 1, 5.0, NULL, 40643, NULL)
+#endif
+
+#if 1
+CheckTypeSize(cups_interpret_cb_t,0, 40645, 1, 5.0, NULL, 40647, NULL)
+#endif
+
+#if 1
+/* All */
+typedef int (*cups_interpret_cb_t_db)(cups_page_header2_t *, int);
+CheckFunctionTypedef(cups_interpret_cb_t,cups_interpret_cb_t_db);
 #endif
 
 extern void cupsRasterClose_db(cups_raster_t *);
@@ -150,6 +218,10 @@
 CheckInterfacedef(cupsRasterOpen,cupsRasterOpen_db);
 extern unsigned int cupsRasterWriteHeader_db(cups_raster_t *, cups_page_header_t *);
 CheckInterfacedef(cupsRasterWriteHeader,cupsRasterWriteHeader_db);
+extern unsigned int cupsRasterReadHeader2_db(cups_raster_t *, cups_page_header2_t *);
+CheckInterfacedef(cupsRasterReadHeader2,cupsRasterReadHeader2_db);
+extern unsigned int cupsRasterWriteHeader2_db(cups_raster_t *, cups_page_header2_t *);
+CheckInterfacedef(cupsRasterWriteHeader2,cupsRasterWriteHeader2_db);
 #ifdef TET_TEST
 if (pcnt == cnt )
 	tet_result(TET_PASS);