[cig-commits] r3945 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/src

[walter at geodynamics.org]

Author: walter
Date: 2006-07-06 02:06:30 -0700 (Thu, 06 Jul 2006)
New Revision: 3945

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
Log:
 r2473 at earth:  boo | 2006-07-06 02:02:43 -0700
  r2462 at earth (orig r3666):  PatrickSunter | 2006-07-03 23:01:36 -0700
  Renaming the "findMinMax" function in Delaunay.c to Delaunay_FindMinMax() -
  to avoid a name collision with the "findMinMax" in SPModel's RegularTriangulator.c .
  
  This is why we have a class naming convention ;)
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2472
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3665
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2473
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3666

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c	2006-07-06 09:06:27 UTC (rev 3944)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c	2006-07-06 09:06:30 UTC (rev 3945)
@@ -247,7 +247,7 @@
 }
 
 #define PI 3.1415926535897932384626
-void findMinMax( Site *sites, int count, float *minX, float *minY, float *maxX, float *maxY )
+void Delaunay_FindMinMax( Site *sites, int count, float *minX, float *minY, float *maxX, float *maxY )
 {
 	int i = 0;
 	
@@ -282,7 +282,7 @@
 	
 	centreX = 0; centreY = 0; 
 	
-	findMinMax( self->sites, self->numSites, &minX, &minY, &maxX, &maxY );
+	Delaunay_FindMinMax( self->sites, self->numSites, &minX, &minY, &maxX, &maxY );
 
 	radius = (sqrt((maxX - minX) * (maxX - minX) + (maxY - minY) * (maxY - minY)));