diff options
Diffstat (limited to 'src/main/escp2-papers.c')
| -rw-r--r-- | src/main/escp2-papers.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c index 6a71ac1..c32e51f 100644 --- a/src/main/escp2-papers.c +++ b/src/main/escp2-papers.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-papers.c,v 1.97 2006/04/13 12:10:04 rlk Exp $" + * "$Id: escp2-papers.c,v 1.99 2006/05/31 23:15:22 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -911,45 +911,45 @@ DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo); static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] = { - { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, .6, 1, .92, + { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92, ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj }, - { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, .6, 1, 1.0, + { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, - { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, .6, 1, 1.0, + { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, 1, 1, 1.0, ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj }, }; @@ -1011,47 +1011,47 @@ DECLARE_PAPER_ADJUSTMENTS(r800_photo); static const paper_adjustment_t r800_matte_adjustments[] = { - { "Plain", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Plain", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "PlainFast", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "PlainFast", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Postcard", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Postcard", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "GlossyFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Transparency", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Transparency", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Envelope", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Envelope", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "BackFilm", 0.83, .5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "BackFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Matte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Matte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "MatteHeavy", 0.92, 0.4, .4, .01, .5, .882, 1, .250, .6, 1, 1.0, + { "MatteHeavy", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Inkjet", 0.72, .3, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Inkjet", 0.72, .3, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Coated", 0.83, .4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Coated", 0.83, .4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Photo", 1.0, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Photo", 1.0, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyPhoto", 0.546, 1, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "GlossyPhoto", 0.546, 1, .5, .025, .999, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Semigloss", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "Semigloss", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "Luster", 0.546, .8, .5, .025, .5, .882, 1, .250, .6, 1, 0.92, + { "Luster", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, - { "ArchivalMatte", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "ArchivalMatte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "WaterColorRadiant", 0.92, 0.4, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "WaterColorRadiant", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "GlossyPaper", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "GlossyPaper", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Ilford", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Ilford", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "ColorLife", 0.83, 0.5, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "ColorLife", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, - { "Other", 0.72, .1, .5, .025, .5, .882, 1, .250, .6, 1, 1.0, + { "Other", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0, r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj }, }; |