Revision: 55528
http://sourceforge.net/p/brlcad/code/55528
Author: brlcad
Date: 2013-05-22 03:28:04 +0000 (Wed, 22 May 2013)
Log Message:
-----------
avoid shadowing time (openindiana)
Modified Paths:
--------------
brlcad/trunk/src/anim/anim_time.c
Modified: brlcad/trunk/src/anim/anim_time.c
===================================================================
--- brlcad/trunk/src/anim/anim_time.c 2013-05-22 03:20:26 UTC (rev 55527)
+++ brlcad/trunk/src/anim/anim_time.c 2013-05-22 03:28:04 UTC (rev 55528)
@@ -155,7 +155,7 @@
fastf_t temp0, temp1, temp2, start=0.0, v0, v1;
int i, j, num, plen;
- fastf_t time, dist, slope, a, b, c;
+ fastf_t timeval, dist, slope, a, b, c;
/* intentionally double for scan */
double end, *x, *y, *z;
@@ -203,7 +203,7 @@
plen++;
}
- time = end - start;
+ timeval = end - start;
dist = l[plen-1];
if (query) {
@@ -211,15 +211,15 @@
return 0;
}
- if (time < VDIVIDE_TOL) {
- fprintf(stderr, "anim_time: time too small. Only %f s.\n", time);
+ if (timeval < VDIVIDE_TOL) {
+ fprintf(stderr, "anim_time: time too small. Only %f s.\n", timeval);
return 10;
}
if (dist < VDIVIDE_TOL) {
fprintf(stderr, "anim_time: pathlength too small. Only %f\n", dist);
return 10;
}
- slope = dist/time;
+ slope = dist/timeval;
switch (v0_set) {
case TIME_ABSOLUTE:
@@ -263,8 +263,8 @@
return 1;
}
- a = ((v1+v0) - 2.0*slope)/(time*time);
- b = (3*slope - (v1+2.0*v0))/time;
+ a = ((v1+v0) - 2.0*slope)/(timeval*timeval);
+ b = (3*slope - (v1+2.0*v0))/timeval;
c = v0;
temp2 = 1.0/slope;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
