Revision: 54128
http://brlcad.svn.sourceforge.net/brlcad/?rev=54128&view=rev
Author: carlmoore
Date: 2013-01-03 17:35:25 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
remove trailing blanks/tabs
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/brep/brep.cpp
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-01-02 21:52:25 UTC
(rev 54127)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-01-03 17:35:25 UTC
(rev 54128)
@@ -51,7 +51,7 @@
/* undefine "min" and "max" macros, if they exist, to prevent
* name conflicts with functions "std::min" and "std::max".
- */
+ */
#ifdef max
#undef max
#endif
@@ -910,9 +910,9 @@
double x = (B2*C1 - B1*C2)/det;
double y = (A1*C2 - A2*C1)/det;
- if ((x >= std::min<double>(x1, x2)) && (x <= std::max<double>(x1, x2))
&&
- (x >= std::min<double>(x3, x4)) && (x <= std::max<double>(x3, x4))
&&
- (y >= std::min<double>(y1, y2)) && (y <= std::max<double>(y1, y2))
&&
+ if ((x >= std::min<double>(x1, x2)) && (x <= std::max<double>(x1, x2))
&&
+ (x >= std::min<double>(x3, x4)) && (x <= std::max<double>(x3, x4))
&&
+ (y >= std::min<double>(y1, y2)) && (y <= std::max<double>(y1, y2))
&&
(y >= std::min<double>(y3, y4)) && (y <= std::max<double>(y3, y4)))
{
return true;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
