[Proj] Patch

[Martin Vermeer]

Slight clean-up.

- Martin

-------------- next part --------------
Index: pj_transform.c
===================================================================
RCS file: /cvs/maptools/cvsroot/proj/src/pj_transform.c,v
retrieving revision 1.14
diff -u -p -r1.14 pj_transform.c
--- pj_transform.c	5 Nov 2004 06:05:11 -0000	1.14
+++ pj_transform.c	4 Dec 2005 13:07:47 -0000
@@ -465,9 +465,9 @@ int pj_geocentric_to_wgs84( PJ *defn, 
             if( x[io] == HUGE_VAL )
                 continue;
 
-            x[io] = x[io] + defn->datum_params[0];
-            y[io] = y[io] + defn->datum_params[1];
-            z[io] = z[io] + defn->datum_params[2];
+            x[io] = x[io] + Dx_BF;
+            y[io] = y[io] + Dy_BF;
+            z[io] = z[io] + Dz_BF;
         }
     }
     else if( defn->datum_type == PJD_7PARAM )
@@ -515,9 +515,9 @@ int pj_geocentric_from_wgs84( PJ *defn, 
             if( x[io] == HUGE_VAL )
                 continue;
             
-            x[io] = x[io] - defn->datum_params[0];
-            y[io] = y[io] - defn->datum_params[1];
-            z[io] = z[io] - defn->datum_params[2];
+            x[io] = x[io] - Dx_BF;
+            y[io] = y[io] - Dy_BF;
+            z[io] = z[io] - Dz_BF;
         }
     }
     else if( defn->datum_type == PJD_7PARAM )
@@ -593,13 +593,13 @@ int pj_datum_transform( PJ *srcdefn, PJ 
         CHECK_RETURN;
 
         src_a = SRS_WGS84_SEMIMAJOR;
-        src_es = 0.006694379990;
+        src_es = SRS_WGS84_ESQUARED;
     }
 
     if( dstdefn->datum_type == PJD_GRIDSHIFT )
     {
         dst_a = SRS_WGS84_SEMIMAJOR;
-        dst_es = 0.006694379990;
+        dst_es = SRS_WGS84_ESQUARED;
     }
         
 /* ==================================================================== */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.osgeo.org/pipermail/proj/attachments/20051204/16c245a1/attachment.sig>