92 |
|
|
93 |
|
if (wdb == NULL) /* no geometry section? */ |
94 |
|
return SDEnone; |
95 |
+ |
if ((geom = ezxml_child(wdb, "Name")) != NULL) { |
96 |
+ |
strncpy(sd->matn, ezxml_txt(geom), SDnameLn); |
97 |
+ |
sd->matn[SDnameLn-1] = '\0'; |
98 |
+ |
} |
99 |
+ |
if ((geom = ezxml_child(wdb, "Manufacturer")) != NULL) { |
100 |
+ |
strncpy(sd->makr, ezxml_txt(geom), SDnameLn); |
101 |
+ |
sd->makr[SDnameLn-1] = '\0'; |
102 |
+ |
} |
103 |
|
sd->dim[0] = sd->dim[1] = sd->dim[2] = .0; |
104 |
+ |
SDerrorDetail[0] = '\0'; |
105 |
|
if ((geom = ezxml_child(wdb, "Width")) != NULL) |
106 |
|
sd->dim[0] = atof(ezxml_txt(geom)) * |
107 |
|
to_meters(ezxml_attr(geom, "unit")); |
112 |
|
sd->dim[2] = atof(ezxml_txt(geom)) * |
113 |
|
to_meters(ezxml_attr(geom, "unit")); |
114 |
|
if ((sd->dim[0] < 0) | (sd->dim[1] < 0) | (sd->dim[2] < 0)) { |
115 |
< |
sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name); |
115 |
> |
if (!SDerrorDetail[0]) |
116 |
> |
sprintf(SDerrorDetail, "Negative dimension in \"%s\"", |
117 |
> |
sd->name); |
118 |
|
return SDEdata; |
119 |
|
} |
120 |
|
if ((geom = ezxml_child(wdb, "Geometry")) == NULL || |
132 |
|
return SDEsupport; |
133 |
|
} |
134 |
|
cfact = to_meters(ezxml_attr(geom, "unit")); |
135 |
+ |
if (cfact <= 0) |
136 |
+ |
return SDEformat; |
137 |
|
sd->mgf = (char *)malloc(strlen(mgfstr)+32); |
138 |
|
if (sd->mgf == NULL) { |
139 |
|
strcpy(SDerrorDetail, "Out of memory in SDloadGeometry"); |
177 |
|
} |
178 |
|
wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer"); |
179 |
|
if (wtl == NULL) { |
180 |
< |
sprintf(SDerrorDetail, "BSDF \"%s\": no optical layer'", |
180 |
> |
sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'", |
181 |
|
sd->name); |
182 |
|
ezxml_free(fl); |
183 |
|
return SDEformat; |