Revision: 56371
http://sourceforge.net/p/brlcad/code/56371
Author: phoenixyjll
Date: 2013-07-31 03:25:04 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Eliminate compiler warnings.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/intersect.cpp
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-07-31 03:20:10 UTC (rev
56370)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-07-31 03:25:04 UTC (rev
56371)
@@ -2501,10 +2501,10 @@
double V2 = i%2 ?
(x_event[k].m_a[0]+x_event[k].m_a[1])*0.5 : b_knots[j]+test_distance;
bool in1, in2;
ON_ClassArray<ON_PX_EVENT> px_event1, px_event2;
- in1 = ON_Intersect(surf1->PointAt(U1, V1), *surf2,
px_event1, 1e-5, 0, 0, tree);
- if (in1) in1 &= surf1->NormalAt(U1,
V1).IsParallelTo(surf2->NormalAt(px_event1[0].m_b[0], px_event1[0].m_b[1]));
- in2 = ON_Intersect(surf1->PointAt(U2, V2), *surf2,
px_event2, 1e-5, 0, 0, tree);
- if (in2) in2 &= surf1->NormalAt(U2,
V2).IsParallelTo(surf2->NormalAt(px_event2[0].m_b[0], px_event2[0].m_b[1]));
+ in1 = ON_Intersect(surf1->PointAt(U1, V1), *surf2,
px_event1, 1e-5, 0, 0, tree)
+ && surf1->NormalAt(U1,
V1).IsParallelTo(surf2->NormalAt(px_event1[0].m_b[0], px_event1[0].m_b[1]));
+ in2 = ON_Intersect(surf1->PointAt(U2, V2), *surf2,
px_event2, 1e-5, 0, 0, tree)
+ && surf1->NormalAt(U2,
V2).IsParallelTo(surf2->NormalAt(px_event2[0].m_b[0], px_event2[0].m_b[1]));
if ((in1 && !in2) || (!in1 && in2))
isvalid = true;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
