Menu
▾
▴
[Gimp-print-devel] Retuning for the R300
|
From: Robert L K. <rl...@al...> - 2005-10-29 21:26:55
|
I'm going to check in this retuning for the R300. Please try it.
Index: src/main/escp2-channels.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/escp2-channels.c,v
retrieving revision 1.57
diff -u -r1.57 escp2-channels.c
--- src/main/escp2-channels.c 23 Oct 2005 19:43:14 -0000 1.57
+++ src/main/escp2-channels.c 29 Oct 2005 21:26:14 -0000
@@ -1937,8 +1937,8 @@
static const shade_set_t photo_gen3_shades = /* Stylus R300 and newer */
{
{ 1, { 1.0 }},
- { 2, { 1.0, 0.3 }},
- { 2, { 1.0, 0.3 }},
+ { 2, { 1.0, 0.35 }},
+ { 2, { 1.0, 0.35 }},
{ 1, { 1.0 }},
{ 1, { 1.0 }},
{ 1, { 1.0 }},
Index: src/main/escp2-papers.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/escp2-papers.c,v
retrieving revision 1.81
diff -u -r1.81 escp2-papers.c
--- src/main/escp2-papers.c 23 Oct 2005 19:43:14 -0000 1.81
+++ src/main/escp2-papers.c 29 Oct 2005 21:26:14 -0000
@@ -141,12 +141,12 @@
"<gutenprint>\n"
"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */ "0.60 0.61 0.64 0.68 0.73 0.78 0.82 0.85 " /* B */
-/* B */ "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 " /* M */
+/* C */ "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 " /* B */
+/* B */ "0.91 0.88 0.82 0.78 0.78 0.80 0.82 0.85 " /* M */
/* M */ "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 " /* R */
/* R */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* Y */
/* Y */ "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 " /* G */
-/* G */ "0.84 0.72 0.68 0.66 0.64 0.62 0.61 0.60 " /* C */
+/* G */ "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 " /* C */
"</sequence>\n"
"</curve>\n"
"</gutenprint>\n";
@@ -681,43 +681,43 @@
static const paper_adjustment_t photo3_adjustments[] =
{
- { "Plain", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Plain", 0.615, .35, 0.75, .15, .9, 1, .7, .8, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "PlainFast", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "PlainFast", 0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Postcard", 0.83, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Postcard", 0.692, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "GlossyFilm", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Transparency", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Envelope", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Envelope", 0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "BackFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "BackFilm", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Matte", 0.85, .35, 0.75, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Matte", 0.709, .5, 0.75, .3, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "MatteHeavy", 0.85, .35, .3, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "MatteHeavy", 0.709, .5, .3, .3, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Inkjet", 0.85, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+ { "Inkjet", 0.709, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Coated", 1.2, .35, .5, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Coated", 1.000, .5, 0.5, .3, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Photo", 1.00, .35, 0.5, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Photo", 0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyPhoto", 1.0, .25, 0.5, .3, .999, 1, .6, .83, .66, 1, 0.85,
+ { "GlossyPhoto", 0.833, .75, 0.5, .25, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Semigloss", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+ { "Semigloss", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Luster", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+ { "Luster", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyPaper", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "GlossyPaper", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Ilford", .85, .25, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "Ilford", 0.709, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "ColorLife", 1.00, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+ { "ColorLife", 0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Other", 0.738, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
+ { "Other", 0.615, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
};
Index: src/main/print-escp2-data.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-escp2-data.c,v
retrieving revision 1.180
diff -u -r1.180 print-escp2-data.c
--- src/main/print-escp2-data.c 23 Oct 2005 19:43:14 -0000 1.180
+++ src/main/print-escp2-data.c 29 Oct 2005 21:26:14 -0000
@@ -244,7 +244,7 @@
{ 2.6, 1.3, 0.65, 0.730, 0.7, 0.91, 0.455, 0.0, 0.0 };
static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0, 1.00, 0.815, 0.788, 0.821, 0.680, 0.340, 0.0 };
+{ 4.0, 2.0, 1.00, 0.679, 0.657, 0.684, 0.566, 0.283, 0.0 };
static const escp2_densities_t p1_5pl_densities =
{ 2.8, 1.4, 1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
|