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 b13d0c5492c1a445dfdfc626b6abedd13c9eee12..b44a5238872d0c2c8c8893fff50f63d536e8b560 100644 (file)
--- 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 8836d384a14d6fe591a43daead05da1aad2a1896..13839e0169d71dc6ba5f69b1da7feda016f55d36 100644 (file)
--- 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);