Use pwgMediaForSize when looking up PPD sizes (Issue #5633)

apple · Dec 2, 2019 · 9240cd7 · 9240cd7
1 parent e90a53a
commit 9240cd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,8 @@ Changes in CUPS v2.3.1
 
 - Documentation updates (Issue #5661, #5674, #5682)
 - Fixed a crash bug in the web interface (Issue #5621)
+- The PPD cache code now looks up page sizes using their dimensions
+  (Issue #5633)
 - PPD files containing "custom" option keywords did not work (Issue #5639)
 - Added a workaround for the scheduler's systemd support (Issue #5640)
 - On Windows, TLS certificates generated on February 29 would likely fail

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
@@ -1075,7 +1075,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
       * Convert the PPD size name to the corresponding PWG keyword name.
       */
 
-      if ((pwg_media = pwgMediaForPPD(ppd_size->name)) != NULL)
+      if ((pwg_media = pwgMediaForSize(PWG_FROM_POINTS(ppd_size->width), PWG_FROM_POINTS(ppd_size->length))) != NULL)
       {
        /*
 	* Standard name, do we have conflicts?