Ignore PageSize, PageRegion, InputSlot, and MediaType when media is specified (Issue...

diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c
index 219136f6a93baf6446a08dc9d33ce8f5d17820fa..964e35eb5f065ddce94f0382f48f3e0f3538abbc 100644 (file)
--- a/cups/ppd-mark.c
+++ b/cups/ppd-mark.c
@@ -52,7 +52,6 @@ cupsMarkOptions(
   const char   *val,                   /* Pointer into value */
                *media,                 /* media option */
                *output_bin,            /* output-bin option */
-               *page_size,             /* PageSize option */
                *ppd_keyword,           /* PPD keyword */
                *print_color_mode,      /* print-color-mode option */
                *print_quality,         /* print-quality option */
@@ -78,7 +77,6 @@ cupsMarkOptions(
 
   media         = cupsGetOption("media", num_options, options);
   output_bin    = cupsGetOption("output-bin", num_options, options);
-  page_size     = cupsGetOption("PageSize", num_options, options);
   print_quality = cupsGetOption("print-quality", num_options, options);
   sides         = cupsGetOption("sides", num_options, options);
 
@@ -327,7 +325,7 @@ cupsMarkOptions(
     }
     else if (!_cups_strcasecmp(optptr->name, "mirror"))
       ppd_mark_option(ppd, "MirrorPrint", optptr->value);
-    else
+    else if (!media || (_cups_strcasecmp(optptr->name, (cache && cache->source_option) ? cache->source_option : "InputSlot") && _cups_strcasecmp(optptr->name, "MediaType") && _cups_strcasecmp(optptr->name, "PageRegion") && _cups_strcasecmp(optptr->name, "PageSize")))
       ppd_mark_option(ppd, optptr->name, optptr->value);
   }