Skip to content

ppd-cache.c: Map FastGray to bi-level when the printer supports it #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tillkamppeter merged 2 commits into from
Nov 14, 2026
Merged

ppd-cache.c: Map FastGray to bi-level when the printer supports it #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ccf09f
ppd-cache.c: Map FastGray to bi-level when the printer supports it
DSingh0304 Nov 13, 2026
802625a
test_ppd_cache: take the value counts from the arrays
DSingh0304 Nov 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ppd/ppd-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,10 @@ ppdConvertOptions(
// prefer it to don't break color/grayscale support for PPDs, either classic
// or the ones generated from IPP Get-Printer-Attributes response.
//
// FastGray is the 1-bit mode which ppdCreatePPDFromIPP2() generates for
// "bi-level", so map it back to "bi-level" if the printer supports it
// instead of turning it into "monochrome".
//

if ((keyword = cupsGetOption("ColorModel", num_options, options)) == NULL)
{
Expand All @@ -399,9 +403,12 @@ ppdConvertOptions(
// ColorModel is taken from PPD as its default option.
//

if (!strcmp(choice->choice, "Gray") ||
!strcmp(choice->choice, "FastGray") ||
!strcmp(choice->choice, "DeviceGray"))
if (!strcmp(choice->choice, "FastGray") &&
ippContainsString(print_color_mode_sup, "bi-level"))
keyword = "bi-level";
else if (!strcmp(choice->choice, "Gray") ||
!strcmp(choice->choice, "FastGray") ||
!strcmp(choice->choice, "DeviceGray"))
keyword = "monochrome";
else
keyword = "color";
Expand All @@ -420,8 +427,11 @@ ppdConvertOptions(
// ColorModel found in options...
//

if (!strcmp(keyword, "Gray") || !strcmp(keyword, "FastGray") ||
!strcmp(keyword, "DeviceGray"))
if (!strcmp(keyword, "FastGray") &&
ippContainsString(print_color_mode_sup, "bi-level"))
keyword = "bi-level";
else if (!strcmp(keyword, "Gray") || !strcmp(keyword, "FastGray") ||
!strcmp(keyword, "DeviceGray"))
keyword = "monochrome";
else
keyword = "color";
Expand Down
114 changes: 112 additions & 2 deletions ppd/test_ppd_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Licensed under Apache License v2.0. See the file "LICENSE" for more
// information.
//
// Tests covered (52 assertions across 10 groups):
// Tests covered (56 assertions across 11 groups):
//
// Group 1 (T01-T07) NULL-pc guard checks — every public function that
// accepts a ppd_cache_t* must return NULL/no-crash when
Expand Down Expand Up @@ -34,6 +34,8 @@
// Group 10 (T47-T52) ppdCacheGetSize()/ppdCacheGetSize2() — PPD name,
// PWG name, custom-size in points, custom-size in
// inches, bare-"Custom" (no ppd_size → NULL), miss.
// Group 11 (T53-T56) ppdConvertOptions() — ColorModel FastGray/Gray to
// print-color-mode, with and without bi-level support.
//
// Design: entirely hermetic — the PPD is loaded from a static string via
// tmpfile() + ppdOpen() so no external files are required at build or CI
Expand Down Expand Up @@ -73,6 +75,10 @@
// "StandardBin" → "standard-bin" (CamelCase, two words)
// "FaceUp" → "face-up" (CamelCase, two words)
//
// ColorModel Gray / FastGray (default FastGray):
// FastGray is the choice ppdCreatePPDFromIPP2() emits for "bi-level";
// used by the ppdConvertOptions() checks in Group 11.
//

static const char test_ppd_text[] =
"*PPD-Adobe: \"4.3\"\n"
Expand Down Expand Up @@ -142,7 +148,54 @@ static const char test_ppd_text[] =
"*DefaultOutputBin: StandardBin\n"
"*OutputBin StandardBin/Standard Bin: \"\"\n"
"*OutputBin FaceUp/Face Up: \"\"\n"
"*CloseUI: *OutputBin\n";
"*CloseUI: *OutputBin\n"
// Color models — exercises the ColorModel mapping in ppdConvertOptions()
"*OpenUI *ColorModel/Color Mode: PickOne\n"
"*OrderDependency: 50 AnySetup *ColorModel\n"
"*DefaultColorModel: FastGray\n"
"*ColorModel Gray/Grayscale: \"\"\n"
"*ColorModel FastGray/Text: \"\"\n"
"*CloseUI: *ColorModel\n";


//
// 'color_mode_for()' - Run ppdConvertOptions() and return the
// print-color-mode value it sends.
//

static const char * // O - print-color-mode or "(none)"
color_mode_for(
ppd_file_t *ppd, // I - PPD file
ppd_cache_t *pc, // I - PPD cache
ipp_attribute_t *supported, // I - print-color-mode-supported
const char *color_model) // I - ColorModel option or NULL
{
static char value[64]; // Returned value
ipp_t *request; // Print-Job request
ipp_attribute_t *attr; // print-color-mode attribute
int num_options = 0; // Number of options
cups_option_t *options = NULL; // Options


if (color_model)
num_options = cupsAddOption("ColorModel", color_model, num_options,
&options);

request = ippNewRequest(IPP_OP_PRINT_JOB);
ppdConvertOptions(request, ppd, pc, NULL, NULL, supported, "user",
"image/pwg-raster", 1, num_options, options);

if ((attr = ippFindAttribute(request, "print-color-mode",
IPP_TAG_KEYWORD)) != NULL)
snprintf(value, sizeof(value), "%s", ippGetString(attr, 0, NULL));
else
snprintf(value, sizeof(value), "(none)");

ippDelete(request);
cupsFreeOptions(num_options, options);

return (value);
}


//
Expand All @@ -161,6 +214,17 @@ main(void)
const char *val; // Return value from lookup functions
pwg_size_t *sz; // Return value from size-record lookups
int exact; // Exact-match flag for ppdCacheGetPageSize
ipp_t *attrs; // Printer attributes for Group 11
ipp_attribute_t *sup_bilevel, // print-color-mode-supported with bi-level
*sup_mono; // print-color-mode-supported without it
static const char * const bilevel_modes[] =
{ // Modes of a printer with 1-bit support
"bi-level", "monochrome", "color"
};
static const char * const mono_modes[] =
{ // Modes of a printer without 1-bit support
"monochrome"
};


// =========================================================================
Expand Down Expand Up @@ -557,6 +621,52 @@ main(void)
testEnd(sz == NULL);


// =========================================================================
// Group 11: ppdConvertOptions() ColorModel → print-color-mode (T53–T56)
//
// FastGray is the 1-bit mode, so it has to become "bi-level" when the
// printer supports it and "monochrome" otherwise (issue #91). Gray
// stays "monochrome". T56 uses the marked PPD default instead of an
// option.
// =========================================================================

attrs = ippNew();
sup_bilevel = ippAddStrings(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
"print-color-mode-supported",
(int)(sizeof(bilevel_modes) /
sizeof(bilevel_modes[0])),
NULL, bilevel_modes);
sup_mono = ippAddStrings(attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
"print-color-mode-supported",
(int)(sizeof(mono_modes) / sizeof(mono_modes[0])),
NULL, mono_modes);

// T53 — FastGray with bi-level supported.
testBegin("ppdConvertOptions(ColorModel=FastGray) sends \"bi-level\"");
val = color_mode_for(ppd, pc, sup_bilevel, "FastGray");
testEndMessage(!strcmp(val, "bi-level"), "got \"%s\"", val);

// T54 — FastGray without bi-level support falls back to monochrome.
testBegin("ppdConvertOptions(ColorModel=FastGray, no bi-level) sends "
"\"monochrome\"");
val = color_mode_for(ppd, pc, sup_mono, "FastGray");
testEndMessage(!strcmp(val, "monochrome"), "got \"%s\"", val);

// T55 — Gray is unchanged.
testBegin("ppdConvertOptions(ColorModel=Gray) sends \"monochrome\"");
val = color_mode_for(ppd, pc, sup_bilevel, "Gray");
testEndMessage(!strcmp(val, "monochrome"), "got \"%s\"", val);

// T56 — No ColorModel option, PPD default FastGray is marked.
testBegin("ppdConvertOptions(default ColorModel FastGray) sends "
"\"bi-level\"");
ppdMarkDefaults(ppd);
val = color_mode_for(ppd, pc, sup_bilevel, NULL);
testEndMessage(!strcmp(val, "bi-level"), "got \"%s\"", val);

ippDelete(attrs);


// =========================================================================
// Cleanup
// =========================================================================
Expand Down
Loading