diff -up argyllcms-0.70/scanin/scanin.c.BAD argyllcms-0.70/scanin/scanin.c --- argyllcms-0.70/scanin/scanin.c.BAD 2008-03-26 16:01:47.000000000 -0400 +++ argyllcms-0.70/scanin/scanin.c 2008-03-26 16:10:27.000000000 -0400 @@ -87,7 +87,7 @@ usage(void) { fprintf(stderr,"\n"); fprintf(stderr," -g Generate a chart reference (.cht) file\n"); fprintf(stderr," -o Output patch values in .val file\n"); - fprintf(stderr," -c Use scanner as colorimeter to\n"); + fprintf(stderr," -c Use an image as colorimeter to\n"); fprintf(stderr," convert printer .ti2 to .ti3\n"); fprintf(stderr," -ca Same as -c, but accumulates more values to .ti3\n"); fprintf(stderr," from subsequent pages\n"); @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) int tmean = 0; /* Return true mean, rather than robust mean */ int repl = 0; /* Replace .ti3 device values from raster file */ int outo = 0; /* Output the values read, rather than creating scanner .ti3 */ - int colm = 0; /* Use scan values as colorimter for print profile. > 1 == append */ + int colm = 0; /* Use image values as colorimeter for print profile. > 1 == append */ int flags = SI_GENERAL_ROT; /* Default allow all rotations */ TIFF *rh = NULL, *wh = NULL; @@ -318,7 +318,7 @@ int main(int argc, char *argv[]) /* Data file */ strcpy(datin_name,argv[fa]); } - if (repl != 0 || colm > 0) { /* Colorimter emulation or replacing .ti3 device data */ + if (repl != 0 || colm > 0) { /* Colorimeter emulation or replacing .ti3 device data */ strcpy(datin_name,argv[fa]); strcat(datin_name,".ti2"); strcpy(datout_name,argv[fa]); @@ -652,11 +652,11 @@ int main(int argc, char *argv[]) icg->del(icg); /* Clean up */ /* ---------------------------------------------------------- */ - } else if (colm > 0) { /* Using the scanner as a colorimeter */ + } else if (colm > 0) { /* Using an image as a colorimeter */ /* All this needs to track the code in spectro/printread.c */ cgats *icg; /* input .ti2 cgats structure */ cgats *ocg; /* input/output .ti3 cgats structure */ - icmFile *rd_fp; /* Scanner to CIE lookup */ + icmFile *rd_fp; /* Image to CIE lookup */ icc *rd_icco; icmLuBase *luo; time_t clk = time(0); @@ -870,7 +870,7 @@ int main(int argc, char *argv[]) } else error ("Input file keyword COLOR_REPS has unknown value"); - /* Setup scanner RGB to XYZ conversion */ + /* Setup RGB to XYZ conversion */ { int inn, outn; /* Chanels for input and output spaces */ icColorSpaceSignature ins, outs; /* Type of input and output spaces */ diff -up argyllcms-0.70/ttbd.txt.BAD argyllcms-0.70/ttbd.txt --- argyllcms-0.70/ttbd.txt.BAD 2008-03-26 16:17:18.000000000 -0400 +++ argyllcms-0.70/ttbd.txt 2008-03-26 16:17:39.000000000 -0400 @@ -325,7 +325,7 @@ Categories: patch variance is too high (probable faulty read). * Add spectral fix options to scanin code to allow compensation - for scanner and media errors when using a scanner as a colorimeter. + for media errors when using an image as a colorimeter. This means figuring out how it will work, as well as creating to tools to create the spectral fix data (or just add general tweak/abstract profile support ?). diff -up argyllcms-0.70/doc/Organisation.html.BAD argyllcms-0.70/doc/Organisation.html --- argyllcms-0.70/doc/Organisation.html.BAD 2008-03-26 16:16:28.000000000 -0400 +++ argyllcms-0.70/doc/Organisation.html 2008-03-26 16:16:42.000000000 -0400 @@ -150,7 +150,7 @@ and output the patch values using the CG is used to get the patch information from a scan of an IT8 calibration chart. -It also has a mode to use the scanner as a crude colorimeter, and +It also has a mode to use an image as a crude colorimeter, and convert a print test chart into approximate CIE values.

diff -up argyllcms-0.70/doc/scanin.html.BAD argyllcms-0.70/doc/scanin.html --- argyllcms-0.70/doc/scanin.html.BAD 2008-03-26 16:11:39.000000000 -0400 +++ argyllcms-0.70/doc/scanin.html 2008-03-26 16:11:42.000000000 -0400 @@ -70,7 +70,7 @@ Output patch values in .val file<  -c                   -Use scanner as colorimeter to
+Use an image as colorimeter to
                      convert printer .ti2 to .ti3
 scanin operates in.