From a0442ed58dee48a521ea053083ea967894507898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 11 Jul 2018 22:19:56 +0200 Subject: New upstream version 2.0.1+repack --- profile/colverify.c | 2 +- profile/mppcheck.c | 2 +- profile/mppprof.c | 8 ++++---- profile/printcal.c | 2 +- profile/profcheck.c | 4 ++-- profile/profin.c | 3 ++- profile/profout.c | 3 ++- 7 files changed, 13 insertions(+), 11 deletions(-) (limited to 'profile') diff --git a/profile/colverify.c b/profile/colverify.c index d7100a3..de99c15 100755 --- a/profile/colverify.c +++ b/profile/colverify.c @@ -759,7 +759,7 @@ int main(int argc, char *argv[]) if (l_observ == icxOT_none) l_observ = icxOT_CIE_1931_2; - if ((sp2cie = new_xsp2cie(l_illum, l_illum == icxIT_none ? NULL : &cust_illum, + if ((sp2cie = new_xsp2cie(l_illum, 0.0, l_illum == icxIT_none ? NULL : &cust_illum, l_observ, custObserver, icSigXYZData, icxClamp)) == NULL) error("Creation of spectral conversion object failed"); diff --git a/profile/mppcheck.c b/profile/mppcheck.c index 6615a84..07ecc16 100755 --- a/profile/mppcheck.c +++ b/profile/mppcheck.c @@ -502,7 +502,7 @@ int main(int argc, char *argv[]) xsp2cie *sc; xspect sp; - if ((sc = new_xsp2cie(icxIT_D50, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) + if ((sc = new_xsp2cie(icxIT_D50, 0.0, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) error("Failed to create xsp2cie object"); /* Set standard D50 viewer & illum. */ diff --git a/profile/mppprof.c b/profile/mppprof.c index 41fe2fc..ace8c97 100755 --- a/profile/mppprof.c +++ b/profile/mppprof.c @@ -693,13 +693,13 @@ make_output_mpp( xspect sp; if (isDisplay) { - if ((sc = new_xsp2cie(icxIT_none, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) + if ((sc = new_xsp2cie(icxIT_none, 0.0, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) error("Failed to create xsp2cie object"); p->set_ilob(p, icxIT_none, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, 0); } else { /* Set standard D50 viewer & illum. */ - if ((sc = new_xsp2cie(icxIT_D50, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) + if ((sc = new_xsp2cie(icxIT_D50, 0.0, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) error("Failed to create xsp2cie object"); p->set_ilob(p, icxIT_D50, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, 0); @@ -865,13 +865,13 @@ make_output_mpp( if (isDisplay) { /* Set emissive viewer. */ - if ((sc = new_xsp2cie(icxIT_none, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) + if ((sc = new_xsp2cie(icxIT_none, 0.0, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) error("Failed to create xsp2cie object"); /* (mpp will ignore illuminant for display anyway ??) */ p2->set_ilob(p2, icxIT_none, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, 0); } else { /* Set standard D50 viewer & illum. */ - if ((sc = new_xsp2cie(icxIT_D50, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) + if ((sc = new_xsp2cie(icxIT_D50, 0.0, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, icxClamp)) == NULL) error("Failed to create xsp2cie object"); p2->set_ilob(p2, icxIT_D50, NULL, icxOT_CIE_1931_2, NULL, icSigLabData, 0); } diff --git a/profile/printcal.c b/profile/printcal.c index 9bbcb41..cee9ed9 100755 --- a/profile/printcal.c +++ b/profile/printcal.c @@ -1105,7 +1105,7 @@ int main(int argc, char *argv[]) { } /* Create a spectral conversion object to XYZ */ - if ((sp2cie = new_xsp2cie(illum, &cust_illum, observ, NULL, icSigXYZData, icxClamp)) == NULL) + if ((sp2cie = new_xsp2cie(illum, 0.0, &cust_illum, observ, NULL, icSigXYZData, icxClamp)) == NULL) error("Creation of spectral conversion object failed"); /* To add FWA comp. would have to locate/create spectral white here, */ diff --git a/profile/profcheck.c b/profile/profcheck.c index 62d39bd..ae00dc0 100755 --- a/profile/profcheck.c +++ b/profile/profcheck.c @@ -781,7 +781,7 @@ int main(int argc, char *argv[]) } /* Create a spectral conversion object */ - if ((sp2cie = new_xsp2cie(illum, illum == icxIT_none ? NULL : &cust_illum, + if ((sp2cie = new_xsp2cie(illum, 0.0, illum == icxIT_none ? NULL : &cust_illum, obType, custObserver, icSigLabData, icxClamp)) == NULL) error("Creation of spectral conversion object failed"); @@ -945,7 +945,7 @@ int main(int argc, char *argv[]) /* Open up the file for reading */ if ((rd_fp = new_icmFileStd_name(iccname,"r")) == NULL) - error("Write: Can't open file '%s'",iccname); + error("Read: Can't open file '%s'",iccname); if ((rd_icco = new_icc()) == NULL) error("Read: Creation of ICC object failed"); diff --git a/profile/profin.c b/profile/profin.c index 92317bb..d20b47a 100755 --- a/profile/profin.c +++ b/profile/profin.c @@ -37,6 +37,7 @@ #define verbo stdout #include +#include "aconfig.h" #include "counters.h" #include "numlib.h" #include "icc.h" @@ -786,7 +787,7 @@ make_input_icc( illum = icxIT_none; cust_illum = NULL; } - if ((sp2cie = new_xsp2cie(illum, cust_illum, obType, custObserver, + if ((sp2cie = new_xsp2cie(illum, 0.0, cust_illum, obType, custObserver, wantLab ? icSigLabData : icSigXYZData, icxClamp)) == NULL) error("Creation of spectral conversion object failed"); diff --git a/profile/profout.c b/profile/profout.c index 47726f1..fe6be0a 100755 --- a/profile/profout.c +++ b/profile/profout.c @@ -89,6 +89,7 @@ #define FILTER_MAX_RAD 0.1 /* [0.1] Filtering maximum radius in grid */ #include +#include "aconfig.h" #include "numlib.h" #include "icc.h" #include "cgats.h" @@ -1798,7 +1799,7 @@ make_output_icc( } /* Create a spectral conversion object */ - if ((sp2cie = new_xsp2cie(illum, cust_illum, obType, custObserver, + if ((sp2cie = new_xsp2cie(illum, 0.0, cust_illum, obType, custObserver, wantLab ? icSigLabData : icSigXYZData, icxClamp)) == NULL) error("Creation of spectral conversion object failed"); -- cgit v1.2.3