[cig-commits] r4947 - in long/3D/Gale/trunk/src/Underworld: . plugins/EulerDeform

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:54:46 -0700 (Wed, 11 Oct 2006)
New Revision: 4947

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
Log:
 r607 at earth:  boo | 2006-10-11 13:52:13 -0700
  r569 at earth (orig r346):  KathleenHumble | 2006-10-05 20:03:17 -0700
  adding in an extra cast to the first arg of calls to the function:
  
  _HexaEL_FindTriBarycenter()
  with arg 1 of type Coord* being cast to (const Coord*)
  
  This is to remove some of the warnings in the make when calling this function.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:606
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:345
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:607
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:346

Modified: long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2006-10-11 20:54:44 UTC (rev 4946)
+++ long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c	2006-10-11 20:54:46 UTC (rev 4947)
@@ -421,7 +421,7 @@
 	modCrds[3][0] = crds[3][0]; modCrds[3][1] = crds[3][2]; modCrds[3][2] = 0.0;
 	modPnt[0] = pnt[0]; modPnt[1] = pnt[2]; modPnt[2] = 0.0;
 
-	if( _HexaEL_FindTriBarycenter( modCrds, modPnt, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) ) {
+	if( _HexaEL_FindTriBarycenter((const Coord*)modCrds, modPnt, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) ) {
 		*val = bc[0]*crds[inds[0]][1] + bc[1]*crds[inds[1]][1] + bc[2]*crds[inds[2]][1];
 		return True;
 	}
@@ -475,7 +475,7 @@
 	modCrds[3][0] = crds[3][0]; modCrds[3][1] = crds[3][1]; modCrds[3][2] = 0.0;
 	modPnt[0] = pnt[0]; modPnt[1] = pnt[1]; modPnt[2] = 0.0;
 
-	if( _HexaEL_FindTriBarycenter( modCrds, modPnt, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) ) {
+	if( _HexaEL_FindTriBarycenter( (const Coord*)modCrds, modPnt, bc, inds, INCLUSIVE_UPPER_BOUNDARY, NULL, 0 ) ) {
 		*val = bc[0]*crds[inds[0]][1] + bc[1]*crds[inds[1]][1] + bc[2]*crds[inds[2]][1];
 		return True;
 	}