[project @ 2006-05-16 08:52:18 by twaugh]

2006-05-16 Tim Waugh <[email protected]> * cupsppd.c (PPD_writeFd): Follow upstream behaviour for PaperDimension and ImageableArea (see STR #1689). Original author: twaugh Date: 2006-05-16 08:52:18+00:00 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pycups/pycups@142 e7545f15-59ab-4934-8816-61942c173d0f
Distrotech · Jul 5, 2007 · 98d610b · 98d610b
1 parent addc7d4
commit 98d610b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Tim Waugh  <[email protected]>
+
+	* cupsppd.c (PPD_writeFd): Follow upstream behaviour for
+	PaperDimension and ImageableArea (see STR #1689).
+
 2006-05-15  Tim Waugh  <[email protected]>
 
 	* Makefile: Version 1.9.10.

diff --git a/cupsppd.c b/cupsppd.c
@@ -455,9 +455,11 @@ PPD_writeFd (PPD *self, PyObject *args)
       keyword = strndup (start, end-start);
       choice = ppdFindMarkedChoice (self->ppd, keyword);
 
-      // Treat PageRegion specially: if not marked, use PageSize
-      // option.
-      if (!choice && !strcmp (keyword, "PageRegion"))
+      // Treat PageRegion, PaperDimension and ImageableArea specially:
+      // if not marked, use PageSize option.
+      if (!choice && (!strcmp (keyword, "PageRegion") ||
+		      !strcmp (keyword, "PaperDimension") ||
+		      !strcmp (keyword, "ImageableArea")))
 	choice = ppdFindMarkedChoice (self->ppd, "PageSize");
 
       if (choice) {