--- ray/src/util/wrapBSDF.c 2015/03/04 17:42:54 2.12
+++ ray/src/util/wrapBSDF.c 2015/05/29 07:16:49 2.15
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.12 2015/03/04 17:42:54 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.15 2015/05/29 07:16:49 greg Exp $";
#endif
/*
* Wrap BSDF data in valid WINDOW XML file
@@ -445,32 +445,30 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
break;
case DSxbar31:
puts("\t\tCIE-X");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tASTM E308 1931 X.dsp");
break;
case DSzbar31:
puts("\t\tCIE-Z");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tASTM E308 1931 Z.dsp");
break;
case DSuprime:
- puts("\t\tCIE-Z");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
- puts("\t\tASTM E308 1931 u.dsp");
+ puts("\t\tCIE-u");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
break;
case DSvprime:
- puts("\t\tCIE-Z");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
- puts("\t\tASTM E308 1931 v.dsp");
+ puts("\t\tCIE-v");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
break;
case DSsolar:
puts("\t\tSolar");
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
puts("\t\tNone");
break;
case DSnir:
puts("\t\tNIR");
- puts("\t\tSourceSpectrum>PLACE_HOLDER");
+ puts("\t\tPLACE_HOLDER");
puts("\t\tPLACE_HOLDER");
break;
default:
@@ -481,7 +479,7 @@ writeBSDFblock(const char *caller, struct s_dfile *df)
spectr_file[df->spectrum]);
if (cp != NULL)
*cp = '.';
- puts("\t\tSourceSpectrum>CIE Illuminant D65 1nm.ssp");
+ puts("\t\tCIE Illuminant D65 1nm.ssp");
printf("\t\t%s\n",
spectr_file[df->spectrum]);
break;
@@ -587,6 +585,7 @@ writeBSDF(const char *caller, ezxml_t fl)
free(xml);
return 0;
}
+ puts("");
fflush(stdout); /* write previous XML info. */
if (write(fileno(stdout), xml, ei) != ei) {
free(xml);