roll projCtx through various other low level functions

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1856 4e78687f-474d-0410-85f9-8d5e500ac6b2

1 files changed, 27 insertions, 27 deletions

diff --git a/src/pj_utils.c b/src/pj_utils.c
index 89f5bda2..15adcd93 100644
--- a/src/pj_utils.c
+++ b/src/pj_utils.c
@@ -77,31 +77,31 @@ PJ *pj_latlong_from_proj( PJ *pj_in )
     pj_errno = 0;
     strcpy( defn, "+proj=latlong" );
 
-    if( pj_param(pj_in->params, "tdatum").i )
+    if( pj_param(pj_in->ctx, pj_in->params, "tdatum").i )
     {
         got_datum = TRUE;
         sprintf( defn+strlen(defn), " +datum=%s", 
-                 pj_param(pj_in->params,"sdatum").s );
+                 pj_param(pj_in->ctx, pj_in->params,"sdatum").s );
     }
-    else if( pj_param(pj_in->params, "tellps").i )
+    else if( pj_param(pj_in->ctx, pj_in->params, "tellps").i )
     {
         sprintf( defn+strlen(defn), " +ellps=%s", 
-                 pj_param(pj_in->params,"sellps").s );
+                 pj_param(pj_in->ctx, pj_in->params,"sellps").s );
     }
-    else if( pj_param(pj_in->params, "ta").i )
+    else if( pj_param(pj_in->ctx,pj_in->params, "ta").i )
     {
         sprintf( defn+strlen(defn), " +a=%s", 
-                 pj_param(pj_in->params,"sa").s );
+                 pj_param(pj_in->ctx,pj_in->params,"sa").s );
             
-        if( pj_param(pj_in->params, "tb").i )
+        if( pj_param(pj_in->ctx,pj_in->params, "tb").i )
             sprintf( defn+strlen(defn), " +b=%s", 
-                     pj_param(pj_in->params,"sb").s );
-        else if( pj_param(pj_in->params, "tes").i )
+                     pj_param(pj_in->ctx,pj_in->params,"sb").s );
+        else if( pj_param(pj_in->ctx,pj_in->params, "tes").i )
             sprintf( defn+strlen(defn), " +es=%s", 
-                     pj_param(pj_in->params,"ses").s );
-        else if( pj_param(pj_in->params, "tf").i )
+                     pj_param(pj_in->ctx,pj_in->params,"ses").s );
+        else if( pj_param(pj_in->ctx,pj_in->params, "tf").i )
             sprintf( defn+strlen(defn), " +f=%s", 
-                     pj_param(pj_in->params,"sf").s );
+                     pj_param(pj_in->ctx,pj_in->params,"sf").s );
         else
             sprintf( defn+strlen(defn), " +es=%.16g", 
                      pj_in->es );
@@ -115,41 +115,41 @@ PJ *pj_latlong_from_proj( PJ *pj_in )
 
     if( !got_datum )
     {
-        if( pj_param(pj_in->params, "ttowgs84").i )
+        if( pj_param(pj_in->ctx,pj_in->params, "ttowgs84").i )
             sprintf( defn+strlen(defn), " +towgs84=%s", 
-                     pj_param(pj_in->params,"stowgs84").s );
+                     pj_param(pj_in->ctx,pj_in->params,"stowgs84").s );
 
-        if( pj_param(pj_in->params, "tnadgrids").i )
+        if( pj_param(pj_in->ctx,pj_in->params, "tnadgrids").i )
             sprintf( defn+strlen(defn), " +nadgrids=%s", 
-                     pj_param(pj_in->params,"snadgrids").s );
+                     pj_param(pj_in->ctx,pj_in->params,"snadgrids").s );
     }
 
     /* copy over some other information related to ellipsoid */
-    if( pj_param(pj_in->params, "tR").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR").i )
         sprintf( defn+strlen(defn), " +R=%s", 
-                 pj_param(pj_in->params,"sR").s );
+                 pj_param(pj_in->ctx,pj_in->params,"sR").s );
 
-    if( pj_param(pj_in->params, "tR_A").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR_A").i )
         sprintf( defn+strlen(defn), " +R_A" );
 
-    if( pj_param(pj_in->params, "tR_V").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR_V").i )
         sprintf( defn+strlen(defn), " +R_V" );
 
-    if( pj_param(pj_in->params, "tR_a").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR_a").i )
         sprintf( defn+strlen(defn), " +R_a" );
 
-    if( pj_param(pj_in->params, "tR_lat_a").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR_lat_a").i )
         sprintf( defn+strlen(defn), " +R_lat_a=%s", 
-                 pj_param(pj_in->params,"sR_lat_a").s );
+                 pj_param(pj_in->ctx,pj_in->params,"sR_lat_a").s );
 
-    if( pj_param(pj_in->params, "tR_lat_g").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tR_lat_g").i )
         sprintf( defn+strlen(defn), " +R_lat_g=%s", 
-                 pj_param(pj_in->params,"sR_lat_g").s );
+                 pj_param(pj_in->ctx,pj_in->params,"sR_lat_g").s );
 
     /* copy over prime meridian */
-    if( pj_param(pj_in->params, "tpm").i )
+    if( pj_param(pj_in->ctx,pj_in->params, "tpm").i )
         sprintf( defn+strlen(defn), " +pm=%s", 
-                 pj_param(pj_in->params,"spm").s );
+                 pj_param(pj_in->ctx,pj_in->params,"spm").s );
 
     return pj_init_plus_ctx( pj_in->ctx, defn );
 }