Merge new upstream release

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