summaryrefslogtreecommitdiff
path: root/xicc/icheck.c
diff options
context:
space:
mode:
Diffstat (limited to 'xicc/icheck.c')
-rw-r--r--xicc/icheck.c266
1 files changed, 33 insertions, 233 deletions
diff --git a/xicc/icheck.c b/xicc/icheck.c
index ed3c6e5..5f61d9a 100644
--- a/xicc/icheck.c
+++ b/xicc/icheck.c
@@ -12,6 +12,12 @@
* Please refer to License.txt file for details.
*/
+/*
+ Estimate PCS->device interpolation error by comparing
+ the interpolated PCS value in the cell to the PCS computed
+ from the corners of the cell.
+*/
+
/* TTBD:
*
*/
@@ -26,23 +32,19 @@
#include "copyright.h"
#include "aconfig.h"
#include "icc.h"
+#include "vrml.h"
void usage(void) {
fprintf(stderr,"Check PCS->Device Interpolation faults of ICC file, Version %s\n",ARGYLL_VERSION_STR);
fprintf(stderr,"Author: Graeme W. Gill, licensed under the AGPL Version 3\n");
fprintf(stderr,"usage: icheck [-v] [-w] infile\n");
fprintf(stderr," -v verbose\n");
- fprintf(stderr," -w create VRML visualisation\n");
- fprintf(stderr," -x Use VRML axies\n");
+ fprintf(stderr," -a Show all interpolation errors, not just worst\n");
+ fprintf(stderr," -w create %s visualisation\n",vrml_format());
+ fprintf(stderr," -x Use %s axies\n",vrml_format());
exit(1);
}
-FILE *start_vrml(char *name, int doaxes);
-void start_line_set(FILE *wrl);
-void add_vertex(FILE *wrl, double pp[3]);
-void make_lines(FILE *wrl, int ppset);
-void end_vrml(FILE *wrl);
-
int
main(
int argc,
@@ -50,6 +52,7 @@ main(
) {
int fa,nfa; /* argument we're looking at */
int verb = 0;
+ int doall = 0;
int dovrml = 0;
int doaxes = 0;
char in_name[100];
@@ -65,7 +68,7 @@ main(
icColorSpaceSignature ins, outs; /* Type of input and output spaces */
int inn; /* Number of input chanels */
icmLuAlgType alg;
- FILE *wrl = NULL;
+ vrml *wrl = NULL;
error_program = argv[0];
@@ -93,7 +96,7 @@ main(
if (argv[fa][1] == 'v' || argv[fa][1] == 'V') {
verb = 1;
}
- /* VRML */
+ /* VRML/X3D */
else if (argv[fa][1] == 'w' || argv[fa][1] == 'W') {
dovrml = 1;
}
@@ -101,6 +104,9 @@ main(
else if (argv[fa][1] == 'x' || argv[fa][1] == 'X') {
doaxes = 1;
}
+ else if (argv[fa][1] == 'a') {
+ doall = 1;
+ }
else if (argv[fa][1] == '?')
usage();
else
@@ -116,7 +122,7 @@ main(
strcpy(out_name, in_name);
if ((xl = strrchr(out_name, '.')) == NULL) /* Figure where extention is */
xl = out_name + strlen(out_name);
- strcpy(xl,".wrl");
+ xl[0] = '\000'; /* Remove extension */
/* Open up the file for reading */
if ((rd_fp = new_icmFileStd_name(in_name,"r")) == NULL)
@@ -158,8 +164,10 @@ main(
gres = lluob->lut->clutPoints;
if (dovrml) {
- wrl = start_vrml(out_name, doaxes);
- start_line_set(wrl);
+ wrl = new_vrml(out_name, doaxes, vrml_lab);
+ if (wrl == NULL)
+ error("new_vrml failed for '%s%s'",out_name,vrml_ext());
+ wrl->start_line_set(wrl, 0);
}
{
@@ -188,9 +196,9 @@ main(
/* For each corner of the PCS grid based at the current point, */
/* average the PCS and Device values */
m = 0;
- for (cc[2] = 0; cc[2] < 2; cc[2]++, m++) {
+ for (cc[2] = 0; cc[2] < 2; cc[2]++) {
for (cc[1] = 0; cc[1] < 2; cc[1]++) {
- for (cc[0] = 0; cc[0] < 2; cc[0]++) {
+ for (cc[0] = 0; cc[0] < 2; cc[0]++, m++) {
double dev[MAX_CHAN];
pcs[m][0] = (co[0] + cc[0])/(gres - 1.0);
@@ -231,7 +239,7 @@ main(
for (k = 0; k < inn; k++)
adev[k] /= 8.0;
- /* Compute worst case distance of PCS corners to average PCS */
+ /* Compute worst case distance of PCS corners to PCS of average dev */
wpcsd = 0.0;
for (m = 0; m < 8; m++) {
double ss;
@@ -243,7 +251,10 @@ main(
if (ss > wpcsd)
wpcsd = ss;
}
- wpcsd *= 0.75; /* Set threshold at 75% of most distant corner */
+ wpcsd *= 0.15; /* Set threshold at 75% of most distant corner */
+
+//printf("~1 wpcsd = %f\n",wpcsd);
+
/* Set a worst case */
if (wpcsd < 1.0)
wpcsd = 1.0;
@@ -277,14 +288,14 @@ main(
if (ier > merr)
merr = ier;
- if (ier > wpcsd) {
+ if (doall || ier > wpcsd) {
tcount++;
printf("ier = %f, Dev = %f %f %f %f\n",
ier, adev[0], adev[1], adev[2], adev[3]);
if (dovrml) {
- add_vertex(wrl, apcs);
- add_vertex(wrl, check);
+ wrl->add_vertex(wrl, 0, apcs);
+ wrl->add_vertex(wrl, 0, check);
}
}
@@ -299,8 +310,8 @@ main(
}
if (dovrml) {
- make_lines(wrl, 2);
- end_vrml(wrl);
+ wrl->make_lines(wrl, 0, 2);
+ wrl->del(wrl);
}
aerr /= ccount;
@@ -319,214 +330,3 @@ main(
return 0;
}
-/* ------------------------------------------------ */
-/* Some simple functions to do basix VRML work */
-
-#define GAMUT_LCENT 50.0
-static int npoints = 0;
-static int paloc = 0;
-static struct { double pp[3]; } *pary;
-
-static void Lab2RGB(double *out, double *in);
-
-FILE *start_vrml(char *name, int doaxes) {
- FILE *wrl;
- struct {
- double x, y, z;
- double wx, wy, wz;
- double r, g, b;
- } axes[5] = {
- { 0, 0, 50-GAMUT_LCENT, 2, 2, 100, .7, .7, .7 }, /* L axis */
- { 50, 0, 0-GAMUT_LCENT, 100, 2, 2, 1, 0, 0 }, /* +a (red) axis */
- { 0, -50, 0-GAMUT_LCENT, 2, 100, 2, 0, 0, 1 }, /* -b (blue) axis */
- { -50, 0, 0-GAMUT_LCENT, 100, 2, 2, 0, 1, 0 }, /* -a (green) axis */
- { 0, 50, 0-GAMUT_LCENT, 2, 100, 2, 1, 1, 0 }, /* +b (yellow) axis */
- };
- int i;
-
- if ((wrl = fopen(name,"w")) == NULL)
- error("Error opening VRML file '%s'\n",name);
-
- npoints = 0;
-
- fprintf(wrl,"#VRML V2.0 utf8\n");
- fprintf(wrl,"\n");
- fprintf(wrl,"# Created by the Argyll CMS\n");
- fprintf(wrl,"Transform {\n");
- fprintf(wrl,"children [\n");
- fprintf(wrl," NavigationInfo {\n");
- fprintf(wrl," type \"EXAMINE\" # It's an object we examine\n");
- fprintf(wrl," } # We'll add our own light\n");
- fprintf(wrl,"\n");
- fprintf(wrl," DirectionalLight {\n");
- fprintf(wrl," direction 0 0 -1 # Light illuminating the scene\n");
- fprintf(wrl," direction 0 -1 0 # Light illuminating the scene\n");
- fprintf(wrl," }\n");
- fprintf(wrl,"\n");
- fprintf(wrl," Viewpoint {\n");
- fprintf(wrl," position 0 0 340 # Position we view from\n");
- fprintf(wrl," }\n");
- fprintf(wrl,"\n");
- if (doaxes != 0) {
- fprintf(wrl,"# Lab axes as boxes:\n");
- for (i = 0; i < 5; i++) {
- fprintf(wrl,"Transform { translation %f %f %f\n", axes[i].x, axes[i].y, axes[i].z);
- fprintf(wrl,"\tchildren [\n");
- fprintf(wrl,"\t\tShape{\n");
- fprintf(wrl,"\t\t\tgeometry Box { size %f %f %f }\n",
- axes[i].wx, axes[i].wy, axes[i].wz);
- fprintf(wrl,"\t\t\tappearance Appearance { material Material ");
- fprintf(wrl,"{ diffuseColor %f %f %f} }\n", axes[i].r, axes[i].g, axes[i].b);
- fprintf(wrl,"\t\t}\n");
- fprintf(wrl,"\t]\n");
- fprintf(wrl,"}\n");
- }
- fprintf(wrl,"\n");
- }
-
- return wrl;
-}
-
-void
-start_line_set(FILE *wrl) {
-
- fprintf(wrl,"\n");
- fprintf(wrl,"Shape {\n");
- fprintf(wrl," geometry IndexedLineSet { \n");
- fprintf(wrl," coord Coordinate { \n");
- fprintf(wrl," point [\n");
-}
-
-void add_vertex(FILE *wrl, double pp[3]) {
-
- fprintf(wrl,"%f %f %f,\n",pp[1], pp[2], pp[0]-GAMUT_LCENT);
-
- if (paloc < (npoints+1)) {
- paloc = (paloc + 10) * 2;
- if (pary == NULL)
- pary = malloc(paloc * 3 * sizeof(double));
- else
- pary = realloc(pary, paloc * 3 * sizeof(double));
-
- if (pary == NULL)
- error ("Malloc failed");
- }
- pary[npoints].pp[0] = pp[0];
- pary[npoints].pp[1] = pp[1];
- pary[npoints].pp[2] = pp[2];
- npoints++;
-}
-
-
-void make_lines(FILE *wrl, int ppset) {
- int i, j;
-
- fprintf(wrl," ]\n");
- fprintf(wrl," }\n");
- fprintf(wrl," coordIndex [\n");
-
- for (i = 0; i < npoints;) {
- for (j = 0; j < ppset; j++, i++) {
- fprintf(wrl,"%d, ", i);
- }
- fprintf(wrl,"-1,\n");
- }
- fprintf(wrl," ]\n");
-
- /* Color */
- fprintf(wrl," colorPerVertex TRUE\n");
- fprintf(wrl," color Color {\n");
- fprintf(wrl," color [ # RGB colors of each vertex\n");
-
- for (i = 0; i < npoints; i++) {
- double rgb[3], Lab[3];
- Lab[0] = pary[i].pp[0];
- Lab[1] = pary[i].pp[1];
- Lab[2] = pary[i].pp[2];
- Lab2RGB(rgb, Lab);
- fprintf(wrl," %f %f %f,\n", rgb[0], rgb[1], rgb[2]);
- }
- fprintf(wrl," ] \n");
- fprintf(wrl," }\n");
- /* End color */
-
- fprintf(wrl," }\n");
- fprintf(wrl,"} # end shape\n");
-
-}
-
-void end_vrml(FILE *wrl) {
-
- fprintf(wrl,"\n");
- fprintf(wrl," ] # end of children for world\n");
- fprintf(wrl,"}\n");
-
- if (fclose(wrl) != 0)
- error("Error closing VRML file\n");
-}
-
-
-/* Convert a gamut Lab value to an RGB value for display purposes */
-static void
-Lab2RGB(double *out, double *in) {
- double L = in[0], a = in[1], b = in[2];
- double x,y,z,fx,fy,fz;
- double R, G, B;
-
- /* Scale so that black is visible */
- L = L * (100 - 40.0)/100.0 + 40.0;
-
- /* First convert to XYZ using D50 white point */
- if (L > 8.0) {
- fy = (L + 16.0)/116.0;
- y = pow(fy,3.0);
- } else {
- y = L/903.2963058;
- fy = 7.787036979 * y + 16.0/116.0;
- }
-
- fx = a/500.0 + fy;
- if (fx > 24.0/116.0)
- x = pow(fx,3.0);
- else
- x = (fx - 16.0/116.0)/7.787036979;
-
- fz = fy - b/200.0;
- if (fz > 24.0/116.0)
- z = pow(fz,3.0);
- else
- z = (fz - 16.0/116.0)/7.787036979;
-
- x *= 0.9642; /* Multiply by white point, D50 */
- y *= 1.0;
- z *= 0.8249;
-
- /* Now convert to sRGB values */
- R = x * 3.2410 + y * -1.5374 + z * -0.4986;
- G = x * -0.9692 + y * 1.8760 + z * 0.0416;
- B = x * 0.0556 + y * -0.2040 + z * 1.0570;
-
- if (R < 0.0)
- R = 0.0;
- else if (R > 1.0)
- R = 1.0;
-
- if (G < 0.0)
- G = 0.0;
- else if (G > 1.0)
- G = 1.0;
-
- if (B < 0.0)
- B = 0.0;
- else if (B > 1.0)
- B = 1.0;
-
- R = pow(R, 1.0/2.2);
- G = pow(G, 1.0/2.2);
- B = pow(B, 1.0/2.2);
-
- out[0] = R;
- out[1] = G;
- out[2] = B;
-}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:19:41 +0000