From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 18 Dec 2015 20:34:33 +0000 (+0000)
Subject: Add cupsRasterInitPWGHeader API to setup a raster header using IPP Everywhere
X-Git-Tag: v2.2b1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e5a57e8af67faf6868aab7f69c695120ad77afb;p=thirdparty%2Fcups.git

Add cupsRasterInitPWGHeader API to setup a raster header using IPP Everywhere
attribute values.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13024 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/backend/Dependencies b/backend/Dependencies
index 66b2de5645..2f4f0c195e 100644
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -6,7 +6,7 @@ ipp.o: ipp.c backend-private.h ../cups/cups-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
   ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
-  ../cups/ppd-private.h ../cups/ppd.h
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
 lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/language.h \
   ../cups/array.h ../cups/versioning.h ../cups/http.h \
   ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h \
@@ -47,7 +47,7 @@ test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
   ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
-  ../cups/ppd-private.h ../cups/ppd.h
+  ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
 testbackend.o: testbackend.c ../cups/string-private.h ../config.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
@@ -69,4 +69,4 @@ usb.o: usb.c backend-private.h ../cups/cups-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
   ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
   usb-darwin.c ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h ../cups/raster.h
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index 9dda29c78a..b006fe1939 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -36,7 +36,8 @@ admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   ../cups/language-private.h ../cups/transcode.h \
   ../cups/string-private.h ../config.h ../cups/ipp-private.h \
   ../cups/http-private.h ../cups/md5-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/adminutil.h
+  ../cups/ppd.h ../cups/raster.h ../cups/pwg-private.h \
+  ../cups/adminutil.h
 classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
   ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
diff --git a/cups/Dependencies b/cups/Dependencies
index 6a9b80cf4f..d990a0ca01 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -2,7 +2,8 @@ adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h thread-private.h ppd.h adminutil.h
+  ../cups/cups.h file.h pwg.h thread-private.h ppd.h raster.h \
+  adminutil.h
 array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
   language.h pwg.h string-private.h ../config.h debug-private.h \
   array-private.h
@@ -17,7 +18,7 @@ backend.o: backend.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h thread-private.h backend.h ppd.h
+  ../cups/cups.h file.h pwg.h thread-private.h backend.h ppd.h raster.h
 debug.o: debug.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
@@ -140,57 +141,57 @@ ppd.o: ppd.c cups-private.h string-private.h ../config.h debug-private.h \
   ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
   ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
   language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
-  file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h
+  file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
 ppd-attr.o: ppd-attr.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 ppd-cache.o: ppd-cache.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 ppd-conflicts.o: ppd-conflicts.c cups-private.h string-private.h \
   ../config.h debug-private.h ../cups/versioning.h array-private.h \
   ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
   ../cups/language.h md5-private.h language-private.h \
   ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  thread-private.h ppd-private.h ../cups/ppd.h
+  thread-private.h ppd-private.h ../cups/ppd.h raster.h
 ppd-custom.o: ppd-custom.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 ppd-emit.o: ppd-emit.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h thread-private.h ppd.h
+  ../cups/cups.h file.h pwg.h thread-private.h ppd.h raster.h
 ppd-localize.o: ppd-localize.c cups-private.h string-private.h \
   ../config.h debug-private.h ../cups/versioning.h array-private.h \
   ../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
   ../cups/language.h md5-private.h language-private.h \
   ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
-  thread-private.h ppd-private.h ../cups/ppd.h
+  thread-private.h ppd-private.h ../cups/ppd.h raster.h
 ppd-mark.o: ppd-mark.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 ppd-page.o: ppd-page.c string-private.h ../config.h debug-private.h \
   ../cups/versioning.h ppd.h cups.h file.h ipp.h http.h array.h \
-  language.h pwg.h
+  language.h pwg.h raster.h
 ppd-util.o: ppd-util.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
@@ -253,14 +254,15 @@ testadmin.o: testadmin.c adminutil.h cups.h file.h versioning.h ipp.h \
 testarray.o: testarray.c string-private.h ../config.h debug-private.h \
   ../cups/versioning.h array-private.h ../cups/array.h dir.h
 testcache.o: testcache.c ppd-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h pwg.h ../cups/ppd.h pwg-private.h \
-  file-private.h cups-private.h string-private.h ../config.h \
-  debug-private.h array-private.h ipp-private.h http-private.h \
-  md5-private.h language-private.h ../cups/transcode.h thread-private.h
+  ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \
+  pwg-private.h file-private.h cups-private.h string-private.h \
+  ../config.h debug-private.h array-private.h ipp-private.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  thread-private.h
 testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \
-  array.h language.h pwg.h ppd.h string-private.h ../config.h
+  array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h
 testcups.o: testcups.c string-private.h ../config.h cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h pwg.h ppd.h
+  versioning.h ipp.h http.h array.h language.h pwg.h ppd.h raster.h
 testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \
   language.h pwg.h
 testfile.o: testfile.c string-private.h ../config.h debug-private.h \
@@ -284,18 +286,19 @@ testlang.o: testlang.c cups-private.h string-private.h ../config.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 testppd.o: testppd.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
   ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h raster.h
 testpwg.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h \
-  ipp.h http.h array.h language.h pwg.h ../cups/ppd.h pwg-private.h \
-  file-private.h cups-private.h string-private.h ../config.h \
-  debug-private.h array-private.h ipp-private.h http-private.h \
-  md5-private.h language-private.h ../cups/transcode.h thread-private.h
+  ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \
+  pwg-private.h file-private.h cups-private.h string-private.h \
+  ../config.h debug-private.h array-private.h ipp-private.h \
+  http-private.h md5-private.h language-private.h ../cups/transcode.h \
+  thread-private.h
 testsnmp.o: testsnmp.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
diff --git a/cups/Makefile b/cups/Makefile
index bb360aa3bc..473328b51f 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -592,9 +592,7 @@ apihelp:
 	mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
 		--css ../doc/cups-printable.css \
 		--header api-ppd.header --intro api-ppd.shtml \
-		api-ppd.xml \
-		ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c page.c \
-		ppd.c >../doc/help/api-ppd.html
+		api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
 	mxmldoc --tokens help/api-ppd.html api-ppd.xml >../doc/help/api-ppd.tokens
 	$(RM) api-ppd.xml
 	mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
diff --git a/cups/ppd.h b/cups/ppd.h
index 34d1b4f733..c5989835d1 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -39,6 +39,7 @@
 #  include "cups.h"
 #  include "array.h"
 #  include "file.h"
+#  include "raster.h"
 
 
 /*
@@ -413,6 +414,11 @@ extern ppd_status_t	ppdLastError(int *line) _PPD_DEPRECATED;
 extern void		ppdSetConformance(ppd_conform_t c) _PPD_DEPRECATED;
 
 /**** New in CUPS 1.2 ****/
+extern int		cupsRasterInterpretPPD(cups_page_header2_t *h,
+			                       ppd_file_t *ppd,
+					       int num_options,
+					       cups_option_t *options,
+					       cups_interpret_cb_t func) _PPD_DEPRECATED;
 extern int		ppdCollect2(ppd_file_t *ppd, ppd_section_t section,
 			            float min_order, ppd_choice_t  ***choices)
 			            _PPD_DEPRECATED;
diff --git a/cups/raster-private.h b/cups/raster-private.h
index 0e9118fcbc..95e54dc02b 100644
--- a/cups/raster-private.h
+++ b/cups/raster-private.h
@@ -1,18 +1,18 @@
 /*
  * "$Id$"
  *
- *   Private image library definitions for CUPS.
+ * Private image library definitions for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1993-2006 by Easy Software Products.
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1993-2006 by Easy Software Products.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_RASTER_PRIVATE_H_
diff --git a/cups/raster.h b/cups/raster.h
index cfacc906dc..a5aff2e048 100644
--- a/cups/raster.h
+++ b/cups/raster.h
@@ -1,20 +1,20 @@
 /*
  * "$Id$"
  *
- *   Raster file definitions for CUPS.
+ * Raster file definitions for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   This file is part of the CUPS Imaging library.
+ * This file is part of the CUPS Imaging library.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_RASTER_H_
@@ -25,7 +25,6 @@
  */
 
 #  include "cups.h"
-#  include "ppd.h"
 
 
 #  ifdef __cplusplus
@@ -377,11 +376,6 @@ extern unsigned		cupsRasterWritePixels(cups_raster_t *r,
 			                      unsigned char *p, unsigned len);
 
 /**** New in CUPS 1.2 ****/
-extern int		cupsRasterInterpretPPD(cups_page_header2_t *h,
-			                       ppd_file_t *ppd,
-					       int num_options,
-					       cups_option_t *options,
-					       cups_interpret_cb_t func) _CUPS_API_1_2;
 extern unsigned		cupsRasterReadHeader2(cups_raster_t *r,
 			                      cups_page_header2_t *h) _CUPS_API_1_2;
 extern unsigned		cupsRasterWriteHeader2(cups_raster_t *r,
@@ -394,6 +388,9 @@ extern const char	*cupsRasterErrorString(void) _CUPS_API_1_3;
 extern cups_raster_t	*cupsRasterOpenIO(cups_raster_iocb_t iocb, void *ctx,
 			                  cups_mode_t mode);
 
+/**** New in CUPS 2.2 ****/
+extern int		cupsRasterInitPWGHeader(cups_page_header2_t *h, pwg_media_t *media, const char *type, int xdpi, int ydpi, const char *sides, const char *sheet_back) _CUPS_API_2_2;
+
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 12691827fb..e3917d814b 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -455,15 +455,10 @@ destination.">cupsGetDestMediaCount</a></li>
 	<li><a href="#cupsGetJobs2" title="Get the jobs from the specified server.">cupsGetJobs2</a></li>
 	<li><a href="#cupsGetNamedDest" title="Get options for the named destination.">cupsGetNamedDest</a></li>
 	<li><a href="#cupsGetOption" title="Get an option value.">cupsGetOption</a></li>
-	<li><a href="#cupsGetPPD" title="Get the PPD file for a printer on the default server.">cupsGetPPD</a></li>
-	<li><a href="#cupsGetPPD2" title="Get the PPD file for a printer from the specified server.">cupsGetPPD2</a></li>
-	<li><a href="#cupsGetPPD3" title="Get the PPD file for a printer on the specified
-server if it has changed.">cupsGetPPD3</a></li>
 	<li><a href="#cupsGetPassword" title="Get a password from the user.">cupsGetPassword</a></li>
 	<li><a href="#cupsGetPassword2" title="Get a password from the user using the advanced
 password callback.">cupsGetPassword2</a></li>
 	<li><a href="#cupsGetPrinters" title="Get a list of printers from the default server.">cupsGetPrinters</a></li>
-	<li><a href="#cupsGetServerPPD" title="Get an available PPD file from the server.">cupsGetServerPPD</a></li>
 	<li><a href="#cupsLangDefault" title="Return the default language.">cupsLangDefault</a></li>
 	<li><a href="#cupsLangEncoding" title="Return the character encoding (us-ascii, etc.)
 for the given language.">cupsLangEncoding</a></li>
@@ -2287,95 +2282,6 @@ const char *cupsGetOption (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Option value or <code>NULL</code></p>
-<h3 class="function"><a name="cupsGetPPD">cupsGetPPD</a></h3>
-<p class="description">Get the PPD file for a printer on the default server.</p>
-<p class="code">
-const char *cupsGetPPD (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>name</dt>
-<dd class="description">Destination name</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Filename for PPD file</p>
-<h4 class="discussion">Discussion</h4>
-<p class="discussion">For classes, <code>cupsGetPPD</code> returns the PPD file for the first printer
-in the class.<br>
-<br>
-The returned filename is stored in a static buffer and is overwritten with
-each call to <code>cupsGetPPD</code> or <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>.  The caller &quot;owns&quot; the
-file that is created and must <code>unlink</code> the returned filename.</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.1.21/OS X 10.4&nbsp;</span><a name="cupsGetPPD2">cupsGetPPD2</a></h3>
-<p class="description">Get the PPD file for a printer from the specified server.</p>
-<p class="code">
-const char *cupsGetPPD2 (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>http</dt>
-<dd class="description">Connection to server or <code>CUPS_HTTP_DEFAULT</code></dd>
-<dt>name</dt>
-<dd class="description">Destination name</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Filename for PPD file</p>
-<h4 class="discussion">Discussion</h4>
-<p class="discussion">For classes, <code>cupsGetPPD2</code> returns the PPD file for the first printer
-in the class.<br>
-<br>
-The returned filename is stored in a static buffer and is overwritten with
-each call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a> or <code>cupsGetPPD2</code>.  The caller &quot;owns&quot; the
-file that is created and must <code>unlink</code> the returned filename.
-
-</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsGetPPD3">cupsGetPPD3</a></h3>
-<p class="description">Get the PPD file for a printer on the specified
-server if it has changed.</p>
-<p class="code">
-http_status_t cupsGetPPD3 (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *name,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;time_t *modtime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;char *buffer,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;size_t bufsize<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>http</dt>
-<dd class="description">HTTP connection or <code>CUPS_HTTP_DEFAULT</code></dd>
-<dt>name</dt>
-<dd class="description">Destination name</dd>
-<dt>modtime</dt>
-<dd class="description">Modification time</dd>
-<dt>buffer</dt>
-<dd class="description">Filename buffer</dd>
-<dt>bufsize</dt>
-<dd class="description">Size of filename buffer</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">HTTP status</p>
-<h4 class="discussion">Discussion</h4>
-<p class="discussion">The &quot;modtime&quot; parameter contains the modification time of any
-locally-cached content and is updated with the time from the PPD file on
-the server.<br>
-<br>
-The &quot;buffer&quot; parameter contains the local PPD filename.  If it contains
-the empty string, a new temporary file is created, otherwise the existing
-file will be overwritten as needed.  The caller &quot;owns&quot; the file that is
-created and must <code>unlink</code> the returned filename.<br>
-<br>
-On success, <code>HTTP_STATUS_OK</code> is returned for a new PPD file and
-<code>HTTP_STATUS_NOT_MODIFIED</code> if the existing PPD file is up-to-date.  Any other
-status is an error.<br>
-<br>
-For classes, <code>cupsGetPPD3</code> returns the PPD file for the first printer
-in the class.
-
-</p>
 <h3 class="function"><a name="cupsGetPassword">cupsGetPassword</a></h3>
 <p class="description">Get a password from the user.</p>
 <p class="code">
@@ -2447,33 +2353,6 @@ int cupsGetPrinters (<br>
 <p class="discussion">This function is deprecated and no longer returns a list of printers - use
 <a href="#cupsGetDests"><code>cupsGetDests</code></a> instead.
 
-</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.3/OS X 10.5&nbsp;</span><a name="cupsGetServerPPD">cupsGetServerPPD</a></h3>
-<p class="description">Get an available PPD file from the server.</p>
-<p class="code">
-char *cupsGetServerPPD (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>http</dt>
-<dd class="description">Connection to server or <code>CUPS_HTTP_DEFAULT</code></dd>
-<dt>name</dt>
-<dd class="description">Name of PPD file (&quot;ppd-name&quot;)</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Name of PPD file or <code>NULL</code> on error</p>
-<h4 class="discussion">Discussion</h4>
-<p class="discussion">This function returns the named PPD file from the server.  The
-list of available PPDs is provided by the IPP <code>CUPS_GET_PPDS</code>
-operation.<br>
-<br>
-You must remove (unlink) the PPD file when you are finished with
-it. The PPD filename is stored in a static location that will be
-overwritten on the next call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a>, <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>,
-or <a href="#cupsGetServerPPD"><code>cupsGetServerPPD</code></a>.
-
 </p>
 <h3 class="function"><a name="cupsLangDefault">cupsLangDefault</a></h3>
 <p class="description">Return the default language.</p>
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index 7fc0c066c4..795ebbf474 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -6639,6 +6639,8 @@ are server-oriented...</p>
 <dd class="description">client-error-not-authenticated</dd>
 <dt>IPP_STATUS_ERROR_NOT_AUTHORIZED </dt>
 <dd class="description">client-error-not-authorized</dd>
+<dt>IPP_STATUS_ERROR_NOT_FETCHABLE </dt>
+<dd class="description">client-error-not-fetchable</dd>
 <dt>IPP_STATUS_ERROR_NOT_FOUND </dt>
 <dd class="description">client-error-not-found</dd>
 <dt>IPP_STATUS_ERROR_NOT_POSSIBLE </dt>
diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html
index df8f7a98c5..1ace094249 100644
--- a/doc/help/api-ppd.html
+++ b/doc/help/api-ppd.html
@@ -401,9 +401,13 @@ div.contents ul.subcontents li {
 </ul></li>
 <li><a href="#FUNCTIONS">Functions</a><ul class="code">
 	<li><a href="#cupsGetConflicts" title="Get a list of conflicting options in a marked PPD.">cupsGetConflicts</a></li>
+	<li><a href="#cupsGetPPD" title="Get the PPD file for a printer on the default server.">cupsGetPPD</a></li>
+	<li><a href="#cupsGetPPD2" title="Get the PPD file for a printer from the specified server.">cupsGetPPD2</a></li>
+	<li><a href="#cupsGetPPD3" title="Get the PPD file for a printer on the specified
+server if it has changed.">cupsGetPPD3</a></li>
+	<li><a href="#cupsGetServerPPD" title="Get an available PPD file from the server.">cupsGetServerPPD</a></li>
 	<li><a href="#cupsMarkOptions" title="Mark command-line options in a PPD file.">cupsMarkOptions</a></li>
 	<li><a href="#cupsResolveConflicts" title="Resolve conflicts in a marked PPD.">cupsResolveConflicts</a></li>
-	<li><a href="#ppdClose" title="Free all memory used by the PPD file.">ppdClose</a></li>
 	<li><a href="#ppdCollect" title="Collect all marked options that reside in the specified
 section.">ppdCollect</a></li>
 	<li><a href="#ppdCollect2" title="Collect all marked options that reside in the
@@ -416,7 +420,6 @@ marked option choices.">ppdConflicts</a></li>
 	<li><a href="#ppdEmitJCL" title="Emit code for JCL options to a file.">ppdEmitJCL</a></li>
 	<li><a href="#ppdEmitJCLEnd" title="Emit JCLEnd code to a file.">ppdEmitJCLEnd</a></li>
 	<li><a href="#ppdEmitString" title="Get a string containing the code for marked options.">ppdEmitString</a></li>
-	<li><a href="#ppdErrorString" title="Returns the text associated with a status.">ppdErrorString</a></li>
 	<li><a href="#ppdFindAttr" title="Find the first matching attribute.">ppdFindAttr</a></li>
 	<li><a href="#ppdFindChoice" title="Return a pointer to an option choice.">ppdFindChoice</a></li>
 	<li><a href="#ppdFindCustomOption" title="Find a custom option.">ppdFindCustomOption</a></li>
@@ -429,7 +432,6 @@ marked option choices.">ppdConflicts</a></li>
 	<li><a href="#ppdInstallableConflict" title="Test whether an option choice conflicts with
 an installable option.">ppdInstallableConflict</a></li>
 	<li><a href="#ppdIsMarked" title="Check to see if an option is marked.">ppdIsMarked</a></li>
-	<li><a href="#ppdLastError" title="Return the status from the last ppdOpen*().">ppdLastError</a></li>
 	<li><a href="#ppdLocalize" title="Localize the PPD file to the current locale.">ppdLocalize</a></li>
 	<li><a href="#ppdLocalizeAttr" title="Localize an attribute.">ppdLocalizeAttr</a></li>
 	<li><a href="#ppdLocalizeIPPReason" title="Get the localized version of a cupsIPPReason
@@ -441,15 +443,10 @@ attribute value.">ppdLocalizeMarkerName</a></li>
 conflicts.">ppdMarkOption</a></li>
 	<li><a href="#ppdNextCustomParam" title="Return the next parameter for a custom option.">ppdNextCustomParam</a></li>
 	<li><a href="#ppdNextOption" title="Return the next option in the PPD file.">ppdNextOption</a></li>
-	<li><a href="#ppdOpen" title="Read a PPD file into memory.">ppdOpen</a></li>
-	<li><a href="#ppdOpen2" title="Read a PPD file into memory.">ppdOpen2</a></li>
-	<li><a href="#ppdOpenFd" title="Read a PPD file into memory.">ppdOpenFd</a></li>
-	<li><a href="#ppdOpenFile" title="Read a PPD file into memory.">ppdOpenFile</a></li>
 	<li><a href="#ppdPageLength" title="Get the page length for the given size.">ppdPageLength</a></li>
 	<li><a href="#ppdPageSize" title="Get the page size record for the named size.">ppdPageSize</a></li>
 	<li><a href="#ppdPageSizeLimits" title="Return the custom page size limits.">ppdPageSizeLimits</a></li>
 	<li><a href="#ppdPageWidth" title="Get the page width for the given size.">ppdPageWidth</a></li>
-	<li><a href="#ppdSetConformance" title="Set the conformance level for PPD files.">ppdSetConformance</a></li>
 </ul></li>
 <li><a href="#TYPES">Data Types</a><ul class="code">
 	<li><a href="#ppd_attr_t" title="PPD Attribute Structure ">ppd_attr_t</a></li>
@@ -749,6 +746,122 @@ The number of conflicting options are returned with &quot;options&quot; pointing
 the conflicting options.  The returned option array must be freed using
 <a href="#cupsFreeOptions"><code>cupsFreeOptions</code></a>.
 
+</p>
+<h3 class="function"><a name="cupsGetPPD">cupsGetPPD</a></h3>
+<p class="description">Get the PPD file for a printer on the default server.</p>
+<p class="code">
+const char *cupsGetPPD (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>name</dt>
+<dd class="description">Destination name</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Filename for PPD file</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">For classes, <code>cupsGetPPD</code> returns the PPD file for the first printer
+in the class.<br>
+<br>
+The returned filename is stored in a static buffer and is overwritten with
+each call to <code>cupsGetPPD</code> or <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>.  The caller &quot;owns&quot; the
+file that is created and must <code>unlink</code> the returned filename.</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.1.21/OS X 10.4&nbsp;</span><a name="cupsGetPPD2">cupsGetPPD2</a></h3>
+<p class="description">Get the PPD file for a printer from the specified server.</p>
+<p class="code">
+const char *cupsGetPPD2 (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to server or <code>CUPS_HTTP_DEFAULT</code></dd>
+<dt>name</dt>
+<dd class="description">Destination name</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Filename for PPD file</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">For classes, <code>cupsGetPPD2</code> returns the PPD file for the first printer
+in the class.<br>
+<br>
+The returned filename is stored in a static buffer and is overwritten with
+each call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a> or <code>cupsGetPPD2</code>.  The caller &quot;owns&quot; the
+file that is created and must <code>unlink</code> the returned filename.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.4/OS X 10.6&nbsp;</span><a name="cupsGetPPD3">cupsGetPPD3</a></h3>
+<p class="description">Get the PPD file for a printer on the specified
+server if it has changed.</p>
+<p class="code">
+http_status_t cupsGetPPD3 (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *name,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;time_t *modtime,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;char *buffer,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;size_t bufsize<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">HTTP connection or <code>CUPS_HTTP_DEFAULT</code></dd>
+<dt>name</dt>
+<dd class="description">Destination name</dd>
+<dt>modtime</dt>
+<dd class="description">Modification time</dd>
+<dt>buffer</dt>
+<dd class="description">Filename buffer</dd>
+<dt>bufsize</dt>
+<dd class="description">Size of filename buffer</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">HTTP status</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The &quot;modtime&quot; parameter contains the modification time of any
+locally-cached content and is updated with the time from the PPD file on
+the server.<br>
+<br>
+The &quot;buffer&quot; parameter contains the local PPD filename.  If it contains
+the empty string, a new temporary file is created, otherwise the existing
+file will be overwritten as needed.  The caller &quot;owns&quot; the file that is
+created and must <code>unlink</code> the returned filename.<br>
+<br>
+On success, <code>HTTP_STATUS_OK</code> is returned for a new PPD file and
+<code>HTTP_STATUS_NOT_MODIFIED</code> if the existing PPD file is up-to-date.  Any other
+status is an error.<br>
+<br>
+For classes, <code>cupsGetPPD3</code> returns the PPD file for the first printer
+in the class.
+
+</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.3/OS X 10.5&nbsp;</span><a name="cupsGetServerPPD">cupsGetServerPPD</a></h3>
+<p class="description">Get an available PPD file from the server.</p>
+<p class="code">
+char *cupsGetServerPPD (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;http_t *http,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *name<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>http</dt>
+<dd class="description">Connection to server or <code>CUPS_HTTP_DEFAULT</code></dd>
+<dt>name</dt>
+<dd class="description">Name of PPD file (&quot;ppd-name&quot;)</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">Name of PPD file or <code>NULL</code> on error</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">This function returns the named PPD file from the server.  The
+list of available PPDs is provided by the IPP <code>CUPS_GET_PPDS</code>
+operation.<br>
+<br>
+You must remove (unlink) the PPD file when you are finished with
+it. The PPD filename is stored in a static location that will be
+overwritten on the next call to <a href="#cupsGetPPD"><code>cupsGetPPD</code></a>, <a href="#cupsGetPPD2"><code>cupsGetPPD2</code></a>,
+or <a href="#cupsGetServerPPD"><code>cupsGetServerPPD</code></a>.
+
 </p>
 <h3 class="function"><a name="cupsMarkOptions">cupsMarkOptions</a></h3>
 <p class="description">Mark command-line options in a PPD file.</p>
@@ -832,17 +945,6 @@ choice for the conflicting option, then iterating over all possible choices
 until a non-conflicting option choice is found.
 
 </p>
-<h3 class="function"><a name="ppdClose">ppdClose</a></h3>
-<p class="description">Free all memory used by the PPD file.</p>
-<p class="code">
-void ppdClose (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="#ppd_file_t">ppd_file_t</a> *ppd<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>ppd</dt>
-<dd class="description">PPD file record</dd>
-</dl>
 <h3 class="function"><a name="ppdCollect">ppdCollect</a></h3>
 <p class="description">Collect all marked options that reside in the specified
 section.</p>
@@ -1050,19 +1152,6 @@ The return string is allocated on the heap and should be freed using
 <code>free</code> when you are done with it.
 
 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.1.19/OS X 10.3&nbsp;</span><a name="ppdErrorString">ppdErrorString</a></h3>
-<p class="description">Returns the text associated with a status.</p>
-<p class="code">
-const char *ppdErrorString (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="#ppd_status_t">ppd_status_t</a> status<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>status</dt>
-<dd class="description">PPD status</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Status string</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.1.19/OS X 10.3&nbsp;</span><a name="ppdFindAttr">ppdFindAttr</a></h3>
 <p class="description">Find the first matching attribute.</p>
 <p class="code">
@@ -1255,19 +1344,6 @@ int ppdIsMarked (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Non-zero if option is marked</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.1.19/OS X 10.3&nbsp;</span><a name="ppdLastError">ppdLastError</a></h3>
-<p class="description">Return the status from the last ppdOpen*().</p>
-<p class="code">
-<a href="#ppd_status_t">ppd_status_t</a> ppdLastError (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;int *line<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>line</dt>
-<dd class="description">Line number</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">Status code</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="ppdLocalize">ppdLocalize</a></h3>
 <p class="description">Localize the PPD file to the current locale.</p>
 <p class="code">
@@ -1429,58 +1505,6 @@ int ppdMarkOption (<br>
 <p class="discussion">Options are returned from all groups in ascending alphanumeric order.
 
 </p>
-<h3 class="function"><a name="ppdOpen">ppdOpen</a></h3>
-<p class="description">Read a PPD file into memory.</p>
-<p class="code">
-<a href="#ppd_file_t">ppd_file_t</a> *ppdOpen (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;FILE *fp<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>fp</dt>
-<dd class="description">File to read from</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">PPD file record</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="ppdOpen2">ppdOpen2</a></h3>
-<p class="description">Read a PPD file into memory.</p>
-<p class="code">
-<a href="#ppd_file_t">ppd_file_t</a> *ppdOpen2 (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;cups_file_t *fp<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>fp</dt>
-<dd class="description">File to read from</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">PPD file record or <code>NULL</code> if the PPD file could not be opened.</p>
-<h3 class="function"><a name="ppdOpenFd">ppdOpenFd</a></h3>
-<p class="description">Read a PPD file into memory.</p>
-<p class="code">
-<a href="#ppd_file_t">ppd_file_t</a> *ppdOpenFd (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;int fd<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>fd</dt>
-<dd class="description">File to read from</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">PPD file record or <code>NULL</code> if the PPD file could not be opened.</p>
-<h3 class="function"><a name="ppdOpenFile">ppdOpenFile</a></h3>
-<p class="description">Read a PPD file into memory.</p>
-<p class="code">
-<a href="#ppd_file_t">ppd_file_t</a> *ppdOpenFile (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *filename<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>filename</dt>
-<dd class="description">File to read from</dd>
-</dl>
-<h4 class="returnvalue">Return Value</h4>
-<p class="description">PPD file record or <code>NULL</code> if the PPD file could not be opened.</p>
 <h3 class="function"><a name="ppdPageLength">ppdPageLength</a></h3>
 <p class="description">Get the page length for the given size.</p>
 <p class="code">
@@ -1556,17 +1580,6 @@ float ppdPageWidth (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Width of page in points or 0.0</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.1.20/OS X 10.4&nbsp;</span><a name="ppdSetConformance">ppdSetConformance</a></h3>
-<p class="description">Set the conformance level for PPD files.</p>
-<p class="code">
-void ppdSetConformance (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="#ppd_conform_t">ppd_conform_t</a> c<br>
-);</p>
-<h4 class="parameters">Parameters</h4>
-<dl>
-<dt>c</dt>
-<dd class="description">Conformance level</dd>
-</dl>
 <h2 class="title"><a name="TYPES">Data Types</a></h2>
 <h3 class="typedef"><span class="info">&nbsp;CUPS 1.1.19/OS X 10.3&nbsp;</span><a name="ppd_attr_t">ppd_attr_t</a></h3>
 <p class="description">PPD Attribute Structure </p>
diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html
index 9acda474fd..a604bd09a1 100644
--- a/doc/help/api-raster.html
+++ b/doc/help/api-raster.html
@@ -399,6 +399,7 @@ div.contents ul.subcontents li {
 </ul></li>
 <li><a href="#FUNCTIONS">Functions</a><ul class="code">
 	<li><a href="#cupsRasterClose" title="Close a raster stream.">cupsRasterClose</a></li>
+	<li><a href="#cupsRasterInitPWGHeader" title="Initialize a page header for PWG Raster output.">cupsRasterInitPWGHeader</a></li>
 	<li><a href="#cupsRasterInterpretPPD" title="Interpret PPD commands to create a page header.">cupsRasterInterpretPPD</a></li>
 	<li><a href="#cupsRasterOpen" title="Open a raster stream using a file descriptor.">cupsRasterOpen</a></li>
 	<li><a href="#cupsRasterOpenIO" title="Open a raster stream using a callback function.">cupsRasterOpenIO</a></li>
@@ -620,6 +621,50 @@ void cupsRasterClose (<br>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">The file descriptor associated with the raster stream must be closed
 separately as needed.</p>
+<h3 class="function"><span class="info">&nbsp;CUPS 2.2&nbsp;</span><a name="cupsRasterInitPWGHeader">cupsRasterInitPWGHeader</a></h3>
+<p class="description">Initialize a page header for PWG Raster output.</p>
+<p class="code">
+int cupsRasterInitPWGHeader (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#cups_page_header2_t">cups_page_header2_t</a> *h,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;pwg_media_t *media,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *type,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int xdpi,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int ydpi,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *sides,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;const char *sheet_back<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>h</dt>
+<dd class="description">Page header</dd>
+<dt>media</dt>
+<dd class="description">PWG media information</dd>
+<dt>type</dt>
+<dd class="description">PWG raster type string</dd>
+<dt>xdpi</dt>
+<dd class="description">Cross-feed direction (horizontal) resolution</dd>
+<dt>ydpi</dt>
+<dd class="description">Feed direction (vertical) resolution</dd>
+<dt>sides</dt>
+<dd class="description">IPP &quot;sides&quot; option value</dd>
+<dt>sheet_back</dt>
+<dd class="description">Transform for back side or <code>NULL</code> for none</dd>
+</dl>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">1 on success, 0 on failure</p>
+<h4 class="discussion">Discussion</h4>
+<p class="discussion">The &quot;media&quot; argument specifies the media to use.<br>
+<br>
+The &quot;type&quot; argument specifies a &quot;pwg-raster-document-type-supported&quot; value
+that controls the color space and bit depth of the raster data.<br>
+<br>
+The &quot;xres&quot; and &quot;yres&quot; arguments specify the raster resolution in dots per
+inch.<br>
+<br>
+The &quot;sheet_back&quot; argument specifies a &quot;pwg-raster-document-sheet-back&quot; value
+to apply for the back side of a page.  Pass <code>NULL</code> for the front side.
+
+</p>
 <h3 class="function"><span class="info">&nbsp;CUPS 1.2/OS X 10.5&nbsp;</span><a name="cupsRasterInterpretPPD">cupsRasterInterpretPPD</a></h3>
 <p class="description">Interpret PPD commands to create a page header.</p>
 <p class="code">
diff --git a/filter/Dependencies b/filter/Dependencies
index bacd5646fd..7b8c4836e4 100644
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -1,17 +1,16 @@
 error.o: error.c ../cups/raster-private.h ../cups/raster.h ../cups/cups.h \
   ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/pwg.h ../cups/ppd.h \
+  ../cups/array.h ../cups/language.h ../cups/pwg.h \
   ../cups/debug-private.h ../cups/string-private.h ../config.h
 interpret.o: interpret.c ../cups/raster-private.h ../cups/raster.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/ppd.h ../cups/debug-private.h ../cups/string-private.h \
-  ../config.h
+  ../cups/debug-private.h ../cups/string-private.h ../config.h \
+  ../cups/ppd.h
 raster.o: raster.c ../cups/raster-private.h ../cups/raster.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/ppd.h ../cups/debug-private.h ../cups/string-private.h \
-  ../config.h
+  ../cups/debug-private.h ../cups/string-private.h ../config.h
 commandtops.o: commandtops.c ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -19,7 +18,7 @@ commandtops.o: commandtops.c ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/ppd.h ../cups/sidechannel.h
+  ../cups/ppd.h ../cups/raster.h ../cups/sidechannel.h
 gziptoany.o: gziptoany.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -30,29 +29,30 @@ gziptoany.o: gziptoany.c ../cups/cups-private.h ../cups/string-private.h \
 common.o: common.c common.h ../cups/string-private.h ../config.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/ppd.h
+  ../cups/ppd.h ../cups/raster.h
 pstops.o: pstops.c common.h ../cups/string-private.h ../config.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/ppd.h ../cups/language-private.h ../cups/transcode.h
+  ../cups/ppd.h ../cups/raster.h ../cups/language-private.h \
+  ../cups/transcode.h
 rasterbench.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h \
   ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/pwg.h ../cups/ppd.h
+  ../cups/array.h ../cups/language.h ../cups/pwg.h
 rastertoepson.o: rastertoepson.c ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/ppd.h \
+  ../cups/language.h ../cups/pwg.h ../cups/ppd.h ../cups/raster.h \
   ../cups/string-private.h ../config.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/raster.h
+  ../cups/transcode.h
 rastertohp.o: rastertohp.c ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/ppd.h \
+  ../cups/language.h ../cups/pwg.h ../cups/ppd.h ../cups/raster.h \
   ../cups/string-private.h ../config.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/raster.h
+  ../cups/transcode.h
 rastertolabel.o: rastertolabel.c ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/ppd.h \
+  ../cups/language.h ../cups/pwg.h ../cups/ppd.h ../cups/raster.h \
   ../cups/string-private.h ../config.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/raster.h
+  ../cups/transcode.h
 rastertopwg.o: rastertopwg.c ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -64,5 +64,4 @@ rastertopwg.o: rastertopwg.c ../cups/cups-private.h \
 testraster.o: testraster.c ../cups/raster-private.h ../cups/raster.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/ppd.h ../cups/debug-private.h ../cups/string-private.h \
-  ../config.h
+  ../cups/debug-private.h ../cups/string-private.h ../config.h
diff --git a/filter/interpret.c b/filter/interpret.c
index c2bdc03152..b38d4eae1a 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -20,6 +20,7 @@
  */
 
 #include <cups/raster-private.h>
+#include <cups/ppd.h>
 
 
 /*
diff --git a/filter/raster.c b/filter/raster.c
index ea4acccbee..ead19c0b10 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -95,6 +95,248 @@ cupsRasterClose(cups_raster_t *r)	/* I - Stream to close */
 }
 
 
+/*
+ * 'cupsRasterInitPWGHeader()' - Initialize a page header for PWG Raster output.
+ *
+ * The "media" argument specifies the media to use.
+ *
+ * The "type" argument specifies a "pwg-raster-document-type-supported" value
+ * that controls the color space and bit depth of the raster data.
+ *
+ * The "xres" and "yres" arguments specify the raster resolution in dots per
+ * inch.
+ *
+ * The "sheet_back" argument specifies a "pwg-raster-document-sheet-back" value
+ * to apply for the back side of a page.  Pass @code NULL@ for the front side.
+ *
+ * @since CUPS 2.2@
+ */
+
+int					/* O - 1 on success, 0 on failure */
+cupsRasterInitPWGHeader(
+    cups_page_header2_t *h,		/* I - Page header */
+    pwg_media_t         *media,		/* I - PWG media information */
+    const char          *type,		/* I - PWG raster type string */
+    int                 xdpi,		/* I - Cross-feed direction (horizontal) resolution */
+    int                 ydpi,		/* I - Feed direction (vertical) resolution */
+    const char          *sides,		/* I - IPP "sides" option value */
+    const char          *sheet_back)	/* I - Transform for back side or @code NULL@ for none */
+{
+  if (!h || !media || !type || xdpi <= 0 || ydpi <= 0)
+  {
+    _cupsRasterAddError("%s", strerror(EINVAL));
+    return (0);
+  }
+
+ /*
+  * Initialize the page header...
+  */
+
+  memset(h, 0, sizeof(cups_page_header2_t));
+
+  strlcpy(h->cupsPageSizeName, media->pwg, sizeof(h->cupsPageSizeName));
+
+  h->PageSize[0] = (unsigned)(72 * media->width / 2540);
+  h->PageSize[1] = (unsigned)(72 * media->length / 2540);
+
+  h->ImagingBoundingBox[2] = h->PageSize[0];
+  h->ImagingBoundingBox[3] = h->PageSize[1];
+
+  h->HWResolution[0] = (unsigned)xdpi;
+  h->HWResolution[1] = (unsigned)ydpi;
+
+  h->cupsWidth  = (unsigned)(media->width * xdpi / 2540);
+  h->cupsHeight = (unsigned)(media->length * ydpi / 2540);
+
+  if (h->cupsWidth > 0x00ffffff || h->cupsHeight > 0x00ffffff)
+  {
+    _cupsRasterAddError("Raster dimensions too large.");
+    return (0);
+  }
+
+  h->cupsInteger[5] = h->cupsWidth;
+  h->cupsInteger[6] = h->cupsHeight;
+
+ /*
+  * Colorspace and bytes per line...
+  */
+
+  if (!strcmp(type, "adobe-rgb_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 24;
+    h->cupsColorSpace   = CUPS_CSPACE_ADOBERGB;
+  }
+  else if (!strcmp(type, "adobe-rgb_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 48;
+    h->cupsColorSpace   = CUPS_CSPACE_ADOBERGB;
+  }
+  else if (!strcmp(type, "black_1"))
+  {
+    h->cupsBitsPerColor = 1;
+    h->cupsBitsPerPixel = 1;
+    h->cupsColorSpace   = CUPS_CSPACE_K;
+  }
+  else if (!strcmp(type, "black_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 8;
+    h->cupsColorSpace   = CUPS_CSPACE_K;
+  }
+  else if (!strcmp(type, "black_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 16;
+    h->cupsColorSpace   = CUPS_CSPACE_K;
+  }
+  else if (!strcmp(type, "cmyk_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 32;
+    h->cupsColorSpace   = CUPS_CSPACE_CMYK;
+  }
+  else if (!strcmp(type, "cmyk_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 64;
+    h->cupsColorSpace   = CUPS_CSPACE_CMYK;
+  }
+  else if (!strncmp(type, "device", 6) && type[6] >= '1' && type[6] <= '9')
+  {
+    int ncolors, bits;			/* Number of colors and bits */
+
+
+    if (sscanf(type, "device%d_%d", &ncolors, &bits) != 2 || ncolors > 15 || (bits != 8 && bits != 16))
+    {
+      _cupsRasterAddError("Unsupported raster type \'%s\'.", type);
+      return (0);
+    }
+
+    h->cupsBitsPerColor = (unsigned)bits;
+    h->cupsBitsPerPixel = (unsigned)(ncolors * bits);
+    h->cupsColorSpace   = (cups_cspace_t)(CUPS_CSPACE_DEVICE1 + ncolors - 1);
+  }
+  else if (!strcmp(type, "rgb_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 24;
+    h->cupsColorSpace   = CUPS_CSPACE_RGB;
+  }
+  else if (!strcmp(type, "rgb_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 48;
+    h->cupsColorSpace   = CUPS_CSPACE_RGB;
+  }
+  else if (!strcmp(type, "sgray_1"))
+  {
+    h->cupsBitsPerColor = 1;
+    h->cupsBitsPerPixel = 1;
+    h->cupsColorSpace   = CUPS_CSPACE_SW;
+  }
+  else if (!strcmp(type, "sgray_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 8;
+    h->cupsColorSpace   = CUPS_CSPACE_SW;
+  }
+  else if (!strcmp(type, "sgray_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 16;
+    h->cupsColorSpace   = CUPS_CSPACE_SW;
+  }
+  else if (!strcmp(type, "srgb_8"))
+  {
+    h->cupsBitsPerColor = 8;
+    h->cupsBitsPerPixel = 24;
+    h->cupsColorSpace   = CUPS_CSPACE_SRGB;
+  }
+  else if (!strcmp(type, "srgb_16"))
+  {
+    h->cupsBitsPerColor = 16;
+    h->cupsBitsPerPixel = 48;
+    h->cupsColorSpace   = CUPS_CSPACE_SRGB;
+  }
+  else
+  {
+    _cupsRasterAddError("Unsupported raster type \'%s\'.", type);
+    return (0);
+  }
+
+  h->cupsColorOrder   = CUPS_ORDER_CHUNKED;
+  h->cupsNumColors    = h->cupsBitsPerPixel / h->cupsBitsPerColor;
+  h->cupsBytesPerLine = (h->cupsWidth * h->cupsBitsPerPixel + 7) / 8;
+
+ /*
+  * Duplex support...
+  */
+
+  h->cupsInteger[1] = 1;		/* CrossFeedTransform */
+  h->cupsInteger[2] = 1;		/* FeedTransform */
+
+  if (sides)
+  {
+    if (!strcmp(sides, "two-sided-long-edge"))
+    {
+      h->Duplex = 1;
+    }
+    else if (!strcmp(sides, "two-sided-short-edge"))
+    {
+      h->Duplex = 1;
+      h->Tumble = 1;
+    }
+    else if (strcmp(sides, "one-sided"))
+    {
+      _cupsRasterAddError("Unsupported sides value \'%s\'.", sides);
+      return (0);
+    }
+
+    if (sheet_back)
+    {
+      if (!strcmp(sheet_back, "flipped"))
+      {
+        if (h->Tumble)
+        {
+          h->cupsInteger[1] = 0xffffffffU;
+          h->cupsInteger[2] = 1;
+        }
+        else
+        {
+          h->cupsInteger[1] = 1;
+          h->cupsInteger[2] = 0xffffffffU;
+        }
+      }
+      else if (!strcmp(sheet_back, "manual-tumble"))
+      {
+        if (h->Tumble)
+        {
+          h->cupsInteger[1] = 0xffffffffU;
+          h->cupsInteger[2] = 0xffffffffU;
+        }
+      }
+      else if (!strcmp(sheet_back, "rotated"))
+      {
+        if (!h->Tumble)
+        {
+          h->cupsInteger[1] = 0xffffffffU;
+          h->cupsInteger[2] = 0xffffffffU;
+        }
+      }
+      else if (strcmp(sheet_back, "normal"))
+      {
+	_cupsRasterAddError("Unsupported sheet_back value \'%s\'.", sheet_back);
+	return (0);
+      }
+    }
+  }
+
+  return (1);
+}
+
+
 /*
  * 'cupsRasterOpen()' - Open a raster stream using a file descriptor.
  *
diff --git a/monitor/Dependencies b/monitor/Dependencies
index acc2157cbd..ae6d2bf09f 100644
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -4,11 +4,11 @@ bcp.o: bcp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/ppd.h
+  ../cups/ppd.h ../cups/raster.h
 tbcp.o: tbcp.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
   ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
-  ../cups/thread-private.h ../cups/ppd.h
+  ../cups/thread-private.h ../cups/ppd.h ../cups/raster.h
diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index c08ea55628..44c4bbdb86 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -75,7 +75,8 @@ ppdc-import.o: ppdc-import.cxx ppdc-private.h ppdc.h ../cups/file.h \
   ../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h ../cups/ppd.h
+  ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h ../cups/ppd.h \
+  ../cups/raster.h
 ppdc-mediasize.o: ppdc-mediasize.cxx ppdc-private.h ppdc.h ../cups/file.h \
   ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/array-private.h \
@@ -118,7 +119,7 @@ ppdc-source.o: ppdc-source.cxx ppdc-private.h ppdc.h ../cups/file.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h ../cups/raster.h \
-  ../cups/ppd.h ../data/epson.h ../data/hp.h ../data/label.h
+  ../data/epson.h ../data/hp.h ../data/label.h
 ppdc-string.o: ppdc-string.cxx ppdc-private.h ppdc.h ../cups/file.h \
   ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/array-private.h \
@@ -167,7 +168,8 @@ ppdmerge.o: ppdmerge.cxx ../cups/cups-private.h ../cups/string-private.h \
   ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
-  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h
+  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h
 ppdpo.o: ppdpo.cxx ppdc-private.h ppdc.h ../cups/file.h \
   ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/array-private.h \
diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index fac4b488a2..a6bc874868 100644
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -5,9 +5,9 @@ auth.o: auth.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 banners.o: banners.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -15,10 +15,10 @@ banners.o: banners.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h ../cups/dir.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h ../cups/dir.h
 cert.o: cert.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -26,9 +26,9 @@ cert.o: cert.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 classes.o: classes.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -36,10 +36,10 @@ classes.o: classes.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 client.o: client.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -47,10 +47,10 @@ client.o: client.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 colorman.o: colorman.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -58,10 +58,10 @@ colorman.o: colorman.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 conf.o: conf.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -69,9 +69,9 @@ conf.o: conf.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 dirsvc.o: dirsvc.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -79,10 +79,10 @@ dirsvc.o: dirsvc.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 env.o: env.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -90,9 +90,9 @@ env.o: env.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 file.o: file.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -100,9 +100,9 @@ file.o: file.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h ../cups/dir.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
 main.o: main.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -110,9 +110,9 @@ main.o: main.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 ipp.o: ipp.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -120,9 +120,9 @@ ipp.o: ipp.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 listen.o: listen.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -130,10 +130,10 @@ listen.o: listen.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 job.o: job.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -141,9 +141,10 @@ job.o: job.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h ../cups/backend.h ../cups/dir.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h \
+  ../cups/dir.h
 log.o: log.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -151,9 +152,9 @@ log.o: log.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
-  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
-  dirsvc.h network.h subscriptions.h
+  ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+  client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+  banners.h dirsvc.h network.h subscriptions.h
 network.o: network.c ../cups/http-private.h ../config.h \
   ../cups/language.h ../cups/array.h ../cups/versioning.h ../cups/http.h \
   ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h \
@@ -161,10 +162,10 @@ network.o: network.c ../cups/http-private.h ../config.h \
   ../cups/debug-private.h ../cups/array-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 policy.o: policy.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -172,10 +173,10 @@ policy.o: policy.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 printers.o: printers.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -183,10 +184,10 @@ printers.o: printers.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h ../cups/dir.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h ../cups/dir.h
 process.o: process.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -194,10 +195,10 @@ process.o: process.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 quotas.o: quotas.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -205,10 +206,10 @@ quotas.o: quotas.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 select.o: select.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -216,10 +217,10 @@ select.o: select.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 server.o: server.c ../cups/http-private.h ../config.h ../cups/language.h \
   ../cups/array.h ../cups/versioning.h ../cups/http.h \
   ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h \
@@ -227,10 +228,10 @@ server.o: server.c ../cups/http-private.h ../config.h ../cups/language.h \
   ../cups/debug-private.h ../cups/array-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 statbuf.o: statbuf.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -238,10 +239,10 @@ statbuf.o: statbuf.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 subscriptions.o: subscriptions.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -249,10 +250,10 @@ subscriptions.o: subscriptions.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 sysman.o: sysman.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/debug-private.h \
   ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
@@ -260,10 +261,10 @@ sysman.o: sysman.c cupsd.h ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h \
-  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h \
-  classes.h job.h colorman.h conf.h banners.h dirsvc.h network.h \
-  subscriptions.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+  policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+  dirsvc.h network.h subscriptions.h
 filter.o: filter.c ../cups/string-private.h ../config.h \
   ../cups/debug-private.h ../cups/versioning.h mime.h ../cups/array.h \
   ../cups/ipp.h ../cups/http.h ../cups/file.h
@@ -281,7 +282,8 @@ cupsfilter.o: cupsfilter.c ../cups/cups-private.h \
   ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
-  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h mime.h
+  ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h mime.h
 cups-deviced.o: cups-deviced.c util.h ../cups/array-private.h \
   ../cups/array.h ../cups/versioning.h ../cups/file-private.h \
   ../cups/cups-private.h ../cups/string-private.h ../config.h \
@@ -306,7 +308,7 @@ testmime.o: testmime.c ../cups/string-private.h ../config.h ../cups/dir.h \
   ../cups/versioning.h ../cups/debug-private.h ../cups/ppd-private.h \
   ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
   ../cups/array.h ../cups/language.h ../cups/pwg.h ../cups/ppd.h \
-  ../cups/pwg-private.h mime.h
+  ../cups/raster.h ../cups/pwg-private.h mime.h
 testspeed.o: testspeed.c ../cups/string-private.h ../config.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
@@ -330,4 +332,4 @@ cups-driverd.o: cups-driverd.cxx util.h ../cups/array-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../ppdc/ppdc.h
+  ../cups/ppd.h ../cups/raster.h ../ppdc/ppdc.h
diff --git a/systemv/Dependencies b/systemv/Dependencies
index 585e9c6d30..9c5e0644d4 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -54,7 +54,8 @@ lpadmin.o: lpadmin.c ../cups/cups-private.h ../cups/string-private.h \
   ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
-  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h
+  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h
 lpinfo.o: lpinfo.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -75,7 +76,8 @@ lpoptions.o: lpoptions.c ../cups/cups-private.h ../cups/string-private.h \
   ../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
-  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h
+  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/raster.h
 lpstat.o: lpstat.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \