Skip to content

Commit d707cbc

Browse files
committed
Fix testppd unit test (wrong fullbleed media size) and also fix the
custom size support in cupsMarkOptions.
1 parent b8e942e commit d707cbc

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

cups/ppd-mark.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ cupsMarkOptions(
129129
* Mark it...
130130
*/
131131

132-
if (!_cups_strncasecmp(s, "Custom.", 7) || ppdPageSize(ppd, s))
132+
if (!_cups_strncasecmp(s, "Custom.", 7) && ppdPageSize(ppd, s))
133133
ppd_mark_option(ppd, "PageSize", s);
134134
else if ((ppd_keyword = _ppdCacheGetPageSize(cache, NULL, s, NULL)) != NULL)
135135
ppd_mark_option(ppd, "PageSize", ppd_keyword);

cups/testppd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@ main(int argc, /* I - Number of command-line arguments */
605605
else
606606
puts("PASS");
607607

608-
fputs("cupsMarkOptions(media=oe_letter-fullbleed_8.5x11in): ", stdout);
609-
num_options = cupsAddOption("media", "oe_letter-fullbleed_8.5x11in", 0,
608+
fputs("cupsMarkOptions(media=oe_letter.fullbleed_8.5x11in): ", stdout);
609+
num_options = cupsAddOption("media", "oe_letter.fullbleed_8.5x11in", 0,
610610
&options);
611611
cupsMarkOptions(ppd, num_options, options);
612612
cupsFreeOptions(num_options, options);

0 commit comments

Comments
 (0)