diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
commit | bc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch) | |
tree | e796661f371a94a50edfdc693388bb911b253dfd /namedc | |
parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) |
Merge new upstream release
Diffstat (limited to 'namedc')
-rwxr-xr-x[-rw-r--r--] | namedc/Jamfile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | namedc/License.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | namedc/afiles | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | namedc/namedc.c | 11 | ||||
-rwxr-xr-x[-rw-r--r--] | namedc/namedc.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | namedc/txt2iccnc.c | 0 |
6 files changed, 8 insertions, 3 deletions
diff --git a/namedc/Jamfile b/namedc/Jamfile index 62d4c7e..62d4c7e 100644..100755 --- a/namedc/Jamfile +++ b/namedc/Jamfile diff --git a/namedc/License.txt b/namedc/License.txt index a871fcf..a871fcf 100644..100755 --- a/namedc/License.txt +++ b/namedc/License.txt diff --git a/namedc/afiles b/namedc/afiles index cd1bf61..cd1bf61 100644..100755 --- a/namedc/afiles +++ b/namedc/afiles diff --git a/namedc/namedc.c b/namedc/namedc.c index d1dece9..6dcfce8 100644..100755 --- a/namedc/namedc.c +++ b/namedc/namedc.c @@ -292,7 +292,7 @@ char *sfx(namedc *p, char *key) { return p->prefix; } -/* Read in a namedc from a cxf3 file */ +/* Read in a namedc from a cxf2 or cxf3 file */ /* Return nz on error */ static int read_cxf(namedc *p, const char *filename, int options) { FILE *fp; @@ -490,11 +490,16 @@ static int read_cxf(namedc *p, const char *filename, int options) { goto next; /* Skip this one */ } - /* Check the attribute value */ - if (strcmp(attr, "Standard") != 0) { +#ifdef NEVER + /* Check the attribute value (Should we ?) */ + /* Known values are: Standard, Color */ + /* May be Trial, Target, Substrate, Colorant, ... ? */ + if (strcmp(attr, "Standard") != 0 + && strcmp(attr, "Color") != 0) { a1logd(p->log, DEB6, "read_cxf: skipping node with ObjectType = '%s'\n",attr); goto next; /* Skip this one */ } +#endif } if ((attr = mxmlElementGetAttr(node, SampleNameKey)) == NULL) { diff --git a/namedc/namedc.h b/namedc/namedc.h index cc8917d..cc8917d 100644..100755 --- a/namedc/namedc.h +++ b/namedc/namedc.h diff --git a/namedc/txt2iccnc.c b/namedc/txt2iccnc.c index 3ea1bc9..3ea1bc9 100644..100755 --- a/namedc/txt2iccnc.c +++ b/namedc/txt2iccnc.c |