From: Sandro Santilli <strk@keybit.net>
Date: Fri, 12 Aug 2011 17:55:40 +0000 (+0000)
Subject: Rename make_project to lwproj_from_string, ready to be moved to liblwgeom [RT-SIGTA]
X-Git-Tag: 2.0.0alpha1~1108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23bb1c43b2c0821c33651efb9a2ebd04e37dd914;p=postgis

Rename make_project to lwproj_from_string, ready to be moved to liblwgeom [RT-SIGTA]

git-svn-id: http://svn.osgeo.org/postgis/trunk@7739 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/liblwgeom/lwgeom_transform.c b/liblwgeom/lwgeom_transform.c
index 661d6076b..d81c5b83e 100644
--- a/liblwgeom/lwgeom_transform.c
+++ b/liblwgeom/lwgeom_transform.c
@@ -1,9 +1,9 @@
 /**********************************************************************
- * $Id:$
  *
  * PostGIS - Spatial Types for PostgreSQL
  * http://postgis.refractions.net
- * Copyright 2001-2003 Refractions Research Inc.
+ *
+ * Copyright (C) 2001-2003 Refractions Research Inc.
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU General Public Licence. See the COPYING file.
diff --git a/libpgcommon/lwgeom_transform.c b/libpgcommon/lwgeom_transform.c
index 9a9f05fda..97cefc43d 100644
--- a/libpgcommon/lwgeom_transform.c
+++ b/libpgcommon/lwgeom_transform.c
@@ -1,9 +1,9 @@
 /**********************************************************************
- * $Id: lwgeom_transform.c -1M 2011-08-11 09:54:25Z (local) $
  *
  * PostGIS - Spatial Types for PostgreSQL
  * http://postgis.refractions.net
- * Copyright 2001-2003 Refractions Research Inc.
+ *
+ * Copyright (C) 2001-2003 Refractions Research Inc.
  *
  * This is free software; you can redistribute and/or modify it under
  * the terms of the GNU General Public Licence. See the COPYING file.
@@ -36,7 +36,7 @@ Datum postgis_proj_version(PG_FUNCTION_ARGS);
 #include "utils/hsearch.h"
 #include "lwgeom_transform.h"
 
-projPJ make_project(char *str1);
+projPJ lwproj_from_string(char *str1);
 int pj_transform_nodatum(projPJ srcdefn, projPJ dstdefn, long point_count, int point_offset, double *x, double *y, double *z );
 
 
@@ -488,7 +488,7 @@ AddToPROJ4SRSCache(PROJ4PortalCache *PROJ4Cache, int srid, int other_srid)
 		elog(ERROR, "GetProj4String returned NULL for SRID (%d)", srid);
 	}
 
-	projection = make_project(proj_str);
+	projection = lwproj_from_string(proj_str);
 
 	pj_errno_ref = pj_get_errno_ref();
 	if ( (projection == NULL) || (*pj_errno_ref))
@@ -629,7 +629,7 @@ void SetPROJ4LibPath(void)
 
 /** given a string, make a PJ object */
 projPJ
-make_project(char *str1)
+lwproj_from_string(char *str1)
 {
 	int t;
 	char *params[1024];  /* one for each parameter */
@@ -859,7 +859,7 @@ Datum transform_geom(PG_FUNCTION_ARGS)
 	output_proj4 = text2cstring(output_proj4_text);
 
 	/* make input and output projection objects */
-	input_pj = make_project(input_proj4);
+	input_pj = lwproj_from_string(input_proj4);
 
 	pj_errno_ref = pj_get_errno_ref();
 	if ( (input_pj == NULL) || (*pj_errno_ref))
@@ -874,7 +874,7 @@ Datum transform_geom(PG_FUNCTION_ARGS)
 	}
 	pfree(input_proj4);
 
-	output_pj = make_project(output_proj4);
+	output_pj = lwproj_from_string(output_proj4);
 
 	pj_errno_ref = pj_get_errno_ref();
 	if ((output_pj == NULL)|| (*pj_errno_ref))
diff --git a/libpgcommon/lwgeom_transform.h b/libpgcommon/lwgeom_transform.h
index c988dfdaf..5a27392d5 100644
--- a/libpgcommon/lwgeom_transform.h
+++ b/libpgcommon/lwgeom_transform.h
@@ -15,7 +15,7 @@
 #include "lwgeom_pg.h"
 #include "proj_api.h"
 
-projPJ make_project(char *str1);
+projPJ lwproj_from_string(char *str1);
 char* GetProj4StringSPI(int srid);
 
 /**
diff --git a/postgis/lwgeom_in_gml.c b/postgis/lwgeom_in_gml.c
index 201c9fdea..2560384d6 100644
--- a/postgis/lwgeom_in_gml.c
+++ b/postgis/lwgeom_in_gml.c
@@ -324,8 +324,8 @@ static POINTARRAY* gml_reproject_pa(POINTARRAY *pa, int srid_in, int srid_out)
 	text_in = GetProj4StringSPI(srid_in);
 	text_out = GetProj4StringSPI(srid_out);
 
-	in_pj = make_project(text_in);
-	out_pj = make_project(text_out);
+	in_pj = lwproj_from_string(text_in);
+	out_pj = lwproj_from_string(text_out);
 
 	lwfree(text_in);
 	lwfree(text_out);