From: Michael R Sweet <msweet@msweet.org>
Date: Wed, 7 May 2025 15:36:30 +0000 (-0400)
Subject: Fix testppd unit test (wrong fullbleed media size) and also fix the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d707cbcd59de29025f235282038bc033eb024b60;p=thirdparty%2Fcups.git

Fix testppd unit test (wrong fullbleed media size) and also fix the
custom size support in cupsMarkOptions.
---

diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c
index b13d0c5492..b44a523887 100644
--- a/cups/ppd-mark.c
+++ b/cups/ppd-mark.c
@@ -129,7 +129,7 @@ cupsMarkOptions(
       * Mark it...
       */
 
-      if (!_cups_strncasecmp(s, "Custom.", 7) || ppdPageSize(ppd, s))
+      if (!_cups_strncasecmp(s, "Custom.", 7) && ppdPageSize(ppd, s))
 	ppd_mark_option(ppd, "PageSize", s);
       else if ((ppd_keyword = _ppdCacheGetPageSize(cache, NULL, s, NULL)) != NULL)
 	ppd_mark_option(ppd, "PageSize", ppd_keyword);
diff --git a/cups/testppd.c b/cups/testppd.c
index 8836d384a1..13839e0169 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -605,8 +605,8 @@ main(int  argc,				/* I - Number of command-line arguments */
     else
       puts("PASS");
 
-    fputs("cupsMarkOptions(media=oe_letter-fullbleed_8.5x11in): ", stdout);
-    num_options = cupsAddOption("media", "oe_letter-fullbleed_8.5x11in", 0,
+    fputs("cupsMarkOptions(media=oe_letter.fullbleed_8.5x11in): ", stdout);
+    num_options = cupsAddOption("media", "oe_letter.fullbleed_8.5x11in", 0,
                                 &options);
     cupsMarkOptions(ppd, num_options, options);
     cupsFreeOptions(num_options, options);