Skip to content

ppd-cache.c: Use PPD size name from CUPS if size is standardized #30

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

Closed
zdohnal wants to merge 1 commit into from
Closed

ppd-cache.c: Use PPD size name from CUPS if size is standardized #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions ppd/ppd-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,9 +1236,10 @@ ppdCacheCreateWithPPD(ppd_file_t *ppd) // I - PPD file
pwg_size_t *pwg_size; // Current PWG size
char pwg_keyword[3 + PPD_MAX_NAME + 1 + 12 + 1 + 12 + 3],
// PWG keyword string
ppd_name[PPD_MAX_NAME];
pwgied_ppd_name[PPD_MAX_NAME];
// Normalized PPD name
const char *pwg_name; // Standard PWG media name
const char *pwg_name, // Standard PWG media name
*ppd_name; //Standard Adobe PPD name
pwg_media_t *pwg_media; // PWG media data
ppd_pwg_print_color_mode_t pwg_print_color_mode;
// print-color-mode index
Expand Down Expand Up @@ -1336,6 +1337,7 @@ ppdCacheCreateWithPPD(ppd_file_t *ppd) // I - PPD file
// Standard name and no conflicts, use it!
//

ppd_name = pwg_media->ppd;
pwg_name = pwg_media->pwg;
new_known_pwg = 1;
}
Expand All @@ -1347,11 +1349,12 @@ ppdCacheCreateWithPPD(ppd_file_t *ppd) // I - PPD file
// pp_lowerppd_WIDTHxHEIGHTuu
//

ppd_name = ppd_size->name;
pwg_name = pwg_keyword;
new_known_pwg = 0;

ppdPwgUnppdizeName(ppd_size->name, ppd_name, sizeof(ppd_name), "_.");
pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), NULL, ppd_name,
ppdPwgUnppdizeName(ppd_size->name, pwgied_ppd_name, sizeof(pwgied_ppd_name), "_.");
pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), NULL, pwgied_ppd_name,
PWG_FROM_POINTS(ppd_size->width),
PWG_FROM_POINTS(ppd_size->length), NULL);
}
Expand Down Expand Up @@ -1425,7 +1428,7 @@ ppdCacheCreateWithPPD(ppd_file_t *ppd) // I - PPD file
// Save this size...
//

new_size->map.ppd = strdup(ppd_size->name);
new_size->map.ppd = strdup(ppd_name);
new_size->map.pwg = strdup(pwg_name);
new_size->width = new_width;
new_size->length = new_length;
Expand Down