diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-26 13:22:56 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-26 13:22:56 +0000 |
| commit | f228370c3fc53617b151789cc000be5d73d24eec (patch) | |
| tree | 7426459c395461d5d2f5755282b42aec6a2917fa /cups/pwg-media.c | |
| parent | 88f9aafc49f9c4feb55d1d10daa0e494c22946fc (diff) | |
| download | cups-f228370c3fc53617b151789cc000be5d73d24eec.tar.gz | |
Merge changes from CUPS 1.5b2-r9811.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3289 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/pwg-media.c')
| -rw-r--r-- | cups/pwg-media.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 267e718a7..5c7ca2397 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -103,8 +103,8 @@ static _pwg_media_t const cups_pwg_media[] = _PWG_MEDIA_IN("na_eur-edp_12x14in", NULL, NULL, 12, 14), _PWG_MEDIA_IN("na_arch-b_12x18in", "arch-b", "ARCHB", 12, 18), _PWG_MEDIA_IN("na_12x19_12x19in", NULL, "12x19", 12, 19), - _PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, "SuperB", 12, 19.17), - _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", NULL, 13, 19), + _PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, NULL, 12, 19.17), + _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", "SuperB", 13, 19), _PWG_MEDIA_IN("na_c_17x22in", "c", "AnsiC", 17, 22), _PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24), _PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34), @@ -226,6 +226,9 @@ static _pwg_media_t const cups_pwg_media[] = _PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, NULL, 275, 395), _PWG_MEDIA_MM("prc_10_324x458mm", NULL, "EnvPRC10", 324, 458), + /* Other English Standard Sheet Media Sizes */ + _PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5), + /* Other Metric Standard Sheet Media Sizes */ _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150), _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230), |