Skip to content

Commit

Permalink
Content optimize "presets" -> Content optimize "mappings"
Browse files Browse the repository at this point in the history 
Renamed the fields in _ppd_cache_s and updated the comments.
  • Loading branch information
@tillkamppeter
tillkamppeter committed Sep 25, 2023
1 parent 97e4485 commit adb8deb
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 47 deletions.
78 changes: 39 additions & 39 deletions cups/ppd-cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ _ppdCacheCreateWithFile(
/* Print color mode for preset */
_pwg_print_quality_t print_quality; /* Print quality for preset */
_pwg_print_content_optimize_t print_content_optimize;
/* Content optimize for preset */
/* Content optimize for mapping */


DEBUG_printf("_ppdCacheCreateWithFile(filename=\"%s\")", filename);
Expand Down Expand Up @@ -910,10 +910,10 @@ _ppdCacheCreateWithFile(
cupsParseOptions(valueptr, 0,
pc->presets[print_color_mode] + print_quality);
}
else if (!_cups_strcasecmp(line, "OptimizePreset"))
else if (!_cups_strcasecmp(line, "OptimizeMapping"))
{
/*
* Preset print_content_optimize name=value ...
* OptimizeMapping print_content_optimize name=value ...
*/

print_content_optimize = (_pwg_print_content_optimize_t)strtol(value, &valueptr, 10);
Expand All @@ -922,15 +922,15 @@ _ppdCacheCreateWithFile(
print_content_optimize >= _PWG_PRINT_CONTENT_OPTIMIZE_MAX ||
valueptr == value || !*valueptr)
{
DEBUG_printf(("ppdCacheCreateWithFile: Bad Optimize Preset on line %d.",
DEBUG_printf(("ppdCacheCreateWithFile: Bad optimize mapping on line %d.",
linenum));
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad PPD cache file."), 1);
goto create_error;
}

pc->num_optimize_presets[print_content_optimize] =
pc->num_optimize_mappings[print_content_optimize] =
cupsParseOptions(valueptr, 0,
pc->optimize_presets + print_content_optimize);
pc->optimize_mappings + print_content_optimize);
}
else if (!_cups_strcasecmp(line, "SidesOption"))
pc->sides_option = strdup(value);
Expand Down Expand Up @@ -1508,7 +1508,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
if ((ppd_attr = ppdFindAttr(ppd, "APPrinterPreset", NULL)) != NULL)
{
/*
* "Classic" Mac OS approach
* "Classic" approach
*/

/*
Expand Down Expand Up @@ -2232,12 +2232,12 @@ _ppdCacheAssignPresets(ppd_file_t *ppd,
pc->num_presets[k][l], &(pc->presets[k][l]));
for (k = 0; k < 5; k ++)
if (cupsGetOption(option->choices[0].choice + 4,
pc->num_optimize_presets[k],
pc->optimize_presets[k]))
pc->num_optimize_presets[k] =
pc->num_optimize_mappings[k],
pc->optimize_mappings[k]))
pc->num_optimize_mappings[k] =
cupsAddOption(o, option->choices[0].choice,
pc->num_optimize_presets[k],
&(pc->optimize_presets[k]));
pc->num_optimize_mappings[k],
&(pc->optimize_mappings[k]));
continue;
}

Expand Down Expand Up @@ -2902,29 +2902,29 @@ _ppdCacheAssignPresets(ppd_file_t *ppd,
}

/*
* Find the best choice for each field of the content optimize presets
* Find the best choice for each field of the content optimize mappings
*/

/* Find best choice for each task */
/* optimize_presets[1]: Photo */
/* optimize_mappings[1]: Photo */
if (properties->for_photo > best_photo)
{
best_photo = properties->for_photo;
best_photo_ch = k;
}
/* optimize_presets[2]: Graphics */
/* optimize_mappings[2]: Graphics */
if (properties->for_graphics > best_graphics)
{
best_graphics = properties->for_graphics;
best_graphics_ch = k;
}
/* optimize_presets[3]: Text */
/* optimize_mappings[3]: Text */
if (properties->for_text > best_text)
{
best_text = properties->for_text;
best_text_ch = k;
}
/* optimize_presets[4]: Text and Graphics */
/* optimize_mappings[4]: Text and Graphics */
if (properties->for_tg > best_tg)
{
best_tg = properties->for_tg;
Expand Down Expand Up @@ -3020,41 +3020,41 @@ _ppdCacheAssignPresets(ppd_file_t *ppd,
if (sets_optimization)
{

/* optimize_presets[1]: Photo */
/* optimize_mappings[1]: Photo */
if (best_photo_ch >= 0)
pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO] =
pc->num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO] =
cupsAddOption
(o, option->choices[best_photo_ch].choice,
pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO],
&(pc->optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO]));
pc->num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO],
&(pc->optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO]));

/* optimize_presets[2]: Graphics */
/* optimize_mappings[2]: Graphics */
if (best_graphics_ch >= 0)
pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS] =
pc->num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS] =
cupsAddOption
(o, option->choices[best_graphics_ch].choice,
pc->num_optimize_presets
pc->num_optimize_mappings
[_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS],
&(pc->optimize_presets
&(pc->optimize_mappings
[_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS]));

/* optimize_presets[1]: Text */
/* optimize_mappings[1]: Text */
if (best_text_ch >= 0)
pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT] =
pc->num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT] =
cupsAddOption
(o, option->choices[best_text_ch].choice,
pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT],
&(pc->optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT]));
pc->num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT],
&(pc->optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT]));

/* optimize_presets[1]: Text and Graphics */
/* optimize_mappings[1]: Text and Graphics */
if (best_tg_ch >= 0)
pc->num_optimize_presets
pc->num_optimize_mappings
[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS] =
cupsAddOption
(o, option->choices[best_tg_ch].choice,
pc->num_optimize_presets
pc->num_optimize_mappings
[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS],
&(pc->optimize_presets
&(pc->optimize_mappings
[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS]));

}
Expand Down Expand Up @@ -3159,8 +3159,8 @@ _ppdCacheDestroy(_ppd_cache_t *pc) /* I - PPD cache and mapping data */
cupsFreeOptions(pc->num_presets[i][j], pc->presets[i][j]);

for (i = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO; i < _PWG_PRINT_CONTENT_OPTIMIZE_MAX; i ++)
if (pc->num_optimize_presets[i])
cupsFreeOptions(pc->num_optimize_presets[i], pc->optimize_presets[i]);
if (pc->num_optimize_mappings[i])
cupsFreeOptions(pc->num_optimize_mappings[i], pc->optimize_mappings[i]);

free(pc);
}
Expand Down Expand Up @@ -4045,14 +4045,14 @@ _ppdCacheWriteFile(
}

/*
* Optimization Presets...
* Optimization Mappings...
*/

for (i = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO; i < _PWG_PRINT_CONTENT_OPTIMIZE_MAX; i ++)
if (pc->num_optimize_presets[i])
if (pc->num_optimize_mappings[i])
{
cupsFilePrintf(fp, "OptimizePreset %d", i);
for (k = pc->num_optimize_presets[i], option = pc->optimize_presets[i];
cupsFilePrintf(fp, "OptimizeMapping %d", i);
for (k = pc->num_optimize_mappings[i], option = pc->optimize_mappings[i];
k > 0;
k --, option ++)
cupsFilePrintf(fp, " %s=%s", option->name, option->value);
Expand Down
4 changes: 2 additions & 2 deletions cups/ppd-private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/
/* Number of print-color-mode/print-quality options */
cups_option_t *presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
/* print-color-mode/print-quality options */
int num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
int num_optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
/* Number of print-content-optimize
options */
cups_option_t *optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
cups_option_t *optimize_mappings[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
/* print-content-optimize options */
char *sides_option, /* PPD option for sides */
*sides_1sided, /* Choice for one-sided */
Expand Down
12 changes: 6 additions & 6 deletions scheduler/job.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3760,7 +3760,7 @@ get_options(cupsd_job_t *job, /* I - Job */
ippFindAttribute(job->attrs, "print-content-optimize", IPP_TAG_ZERO))
{
/*
* Map print-content-optimize to a preset...
* Map print-content-optimize...
*/

if ((attr = ippFindAttribute(job->attrs, "print-content-optimize",
Expand Down Expand Up @@ -3795,25 +3795,25 @@ get_options(cupsd_job_t *job, /* I - Job */
(print_content_optimize == _PWG_PRINT_CONTENT_OPTIMIZE_TEXT ?
"text" :
"text and graphics")))));
if (pc->num_optimize_presets[print_content_optimize] > 0)
if (pc->num_optimize_mappings[print_content_optimize] > 0)
{
/*
* Copy the preset options as long as the corresponding names are not
* Copy the mapped options as long as the corresponding names are not
* already defined in the IPP request and also if it does not change
* the print quality preset (as long as we do not print in high quality)
* ...
*/

for (i = pc->num_optimize_presets[print_content_optimize],
preset = pc->optimize_presets[print_content_optimize];
for (i = pc->num_optimize_mappings[print_content_optimize],
preset = pc->optimize_mappings[print_content_optimize];
i > 0;
i --, preset ++)
{
if (!ippFindAttribute(job->attrs, preset->name, IPP_TAG_ZERO) &&
(print_quality == _PWG_PRINT_QUALITY_HIGH ||
cupsGetOption(preset->name, num_pwgppds, pwgppds) == NULL))
{
cupsdLogJob(job, CUPSD_LOG_DEBUG, "Adding content optimization preset option %s=%s", preset->name, preset->value);
cupsdLogJob(job, CUPSD_LOG_DEBUG, "Adding content optimization mapping option %s=%s", preset->name, preset->value);

num_pwgppds = cupsAddOption(preset->name, preset->value, num_pwgppds, &pwgppds);
}
Expand Down

0 comments on commit adb8deb

Please sign in to comment.