Revision: 52830
http://brlcad.svn.sourceforge.net/brlcad/?rev=52830&view=rev
Author: brlcad
Date: 2012-10-05 04:44:32 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
scan into doubles
Modified Paths:
--------------
brlcad/trunk/src/conv/iges/getcurve.c
brlcad/trunk/src/conv/iges/spline.c
Modified: brlcad/trunk/src/conv/iges/getcurve.c
===================================================================
--- brlcad/trunk/src/conv/iges/getcurve.c 2012-10-04 22:01:20 UTC (rev
52829)
+++ brlcad/trunk/src/conv/iges/getcurve.c 2012-10-05 04:44:32 UTC (rev
52830)
@@ -265,7 +265,7 @@
struct spline *splroot;
struct segment *seg, *seg1;
vect_t tmp;
- fastf_t a;
+ double a;
Readrec(dir[curve]->param);
Readint(&type, "");
Modified: brlcad/trunk/src/conv/iges/spline.c
===================================================================
--- brlcad/trunk/src/conv/iges/spline.c 2012-10-04 22:01:20 UTC (rev 52829)
+++ brlcad/trunk/src/conv/iges/spline.c 2012-10-05 04:44:32 UTC (rev 52830)
@@ -41,7 +41,8 @@
int count = 0;
int point_size;
fastf_t min_knot;
- fastf_t max_wt;
+ double max_wt;
+ double scan;
/* Acquiring Data */
@@ -93,7 +94,8 @@
/* U knot vector */
min_knot = 0.0;
for (i = 0; i <= n1+2*m1; i++) {
- Readdbl(&(*b_patch)->u.knots[i], "");
+ Readdbl(&scan, "");
+ (*b_patch)->u.knots[i] = scan; /* double to fastf_t */
if ((*b_patch)->u.knots[i] < min_knot)
min_knot = (*b_patch)->u.knots[i];
}
@@ -107,7 +109,8 @@
min_knot = 0.0;
/* V knot vector */
for (i = 0; i <= n2+2*m2; i++) {
- Readdbl(&(*b_patch)->v.knots[i], "");
+ Readdbl(&scan, "");
+ (*b_patch)->v.knots[i] = scan; /* double to fastf_t */
if ((*b_patch)->v.knots[i] < min_knot)
min_knot = (*b_patch)->v.knots[i];
}
@@ -124,7 +127,8 @@
for (i = 0; i <= k2; i++) {
for (j = 0; j <= k1; j++) {
if (point_size == 4) {
- Readdbl(&(*b_patch)->ctl_points[count*4 + 3], "");
+ Readdbl(&scan, "");
+ (*b_patch)->ctl_points[count*4 + 3] = scan; /* double to
fastf_t */
if ((*b_patch)->ctl_points[count*4 + 3] > max_wt)
max_wt = (*b_patch)->ctl_points[count*4 + 3];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
