From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- namedc/Jamfile | 0 namedc/License.txt | 0 namedc/afiles | 0 namedc/namedc.c | 11 ++++++++--- namedc/namedc.h | 0 namedc/txt2iccnc.c | 0 6 files changed, 8 insertions(+), 3 deletions(-) mode change 100644 => 100755 namedc/Jamfile mode change 100644 => 100755 namedc/License.txt mode change 100644 => 100755 namedc/afiles mode change 100644 => 100755 namedc/namedc.c mode change 100644 => 100755 namedc/namedc.h mode change 100644 => 100755 namedc/txt2iccnc.c (limited to 'namedc') diff --git a/namedc/Jamfile b/namedc/Jamfile old mode 100644 new mode 100755 diff --git a/namedc/License.txt b/namedc/License.txt old mode 100644 new mode 100755 diff --git a/namedc/afiles b/namedc/afiles old mode 100644 new mode 100755 diff --git a/namedc/namedc.c b/namedc/namedc.c old mode 100644 new mode 100755 index d1dece9..6dcfce8 --- 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 old mode 100644 new mode 100755 diff --git a/namedc/txt2iccnc.c b/namedc/txt2iccnc.c old mode 100644 new mode 100755 -- cgit v1.2.3