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

diff --git a/CHANGES.md b/CHANGES.md
index 805a2a1be36ef36e89102f587733252e28c0011c..463570d726c4c4d7f2a723322fa479c5f2f79f58 100644 (file)
--- 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
index 5b7c76e850d871a39aeb9c16d48a958ca647d0a9..5965e382bb80b2108b7c9ebbf56451daa4af53fb 100644 (file)
--- 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?