Revision: 41858
http://brlcad.svn.sourceforge.net/brlcad/?rev=41858&view=rev
Author: starseeker
Date: 2010-12-30 18:38:06 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Switch use of EQUAL to NEAR_EQUAL and remove unused SAMEPT define
Modified Paths:
--------------
brlcad/branches/cmake/src/conv/iges/getcurve.c
brlcad/branches/cmake/src/conv/iges/iges_struct.h
Modified: brlcad/branches/cmake/src/conv/iges/getcurve.c
===================================================================
--- brlcad/branches/cmake/src/conv/iges/getcurve.c 2010-12-30 18:22:43 UTC
(rev 41857)
+++ brlcad/branches/cmake/src/conv/iges/getcurve.c 2010-12-30 18:38:06 UTC
(rev 41858)
@@ -729,9 +729,9 @@
ptr = ptr->next;
ptr->next = tmp_ptr;
ptr->next->prev = ptr;
- if (EQUAL(ptr->pt[X], tmp_ptr->pt[X]) &&
- EQUAL(ptr->pt[Y], tmp_ptr->pt[Y]) &&
- EQUAL(ptr->pt[Z], tmp_ptr->pt[Z])) {
+ if (NEAR_EQUAL(ptr->pt[X], tmp_ptr->pt[X], TOL) &&
+ NEAR_EQUAL(ptr->pt[Y], tmp_ptr->pt[Y], TOL) &&
+ NEAR_EQUAL(ptr->pt[Z], tmp_ptr->pt[Z], TOL)) {
ptr->next = ptr->next->next;
if (ptr->next != NULL)
ptr->next->prev = ptr;
Modified: brlcad/branches/cmake/src/conv/iges/iges_struct.h
===================================================================
--- brlcad/branches/cmake/src/conv/iges/iges_struct.h 2010-12-30 18:22:43 UTC
(rev 41857)
+++ brlcad/branches/cmake/src/conv/iges/iges_struct.h 2010-12-30 18:38:06 UTC
(rev 41858)
@@ -39,10 +39,6 @@
#define NAMESIZE 16 /* from db.h */
#define TOL 0.0005
-#define EQUAL( a, b ) ((brlabs( (a)-(b) ) < TOL) ? 1 : 0 )
-#define SAMEPT( pt1, pt2 ) (EQUAL( pt1[X], pt2[X] ) && \
- EQUAL( pt1[Y], pt2[Y] ) && \
- EQUAL( pt1[Z], pt2[Z] ) )
#define Union 1
#define Intersect 2
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
