[postgis-commits] svn - r3510 - in trunk: liblwgeom liblwgeom/cunit
liblwgeom/examples loader lwgeom
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Fri Jan 9 09:41:23 PST 2009
Author: pramsey
Date: 2009-01-09 09:41:23 -0800 (Fri, 09 Jan 2009)
New Revision: 3510
Modified:
trunk/liblwgeom/cunit/cu_algorithm.c
trunk/liblwgeom/examples/unparser.c
trunk/liblwgeom/liblwgeom.h
trunk/liblwgeom/lwcollection.c
trunk/liblwgeom/lwgeom.c
trunk/liblwgeom/lwgeom_api.c
trunk/liblwgeom/lwline.c
trunk/liblwgeom/lwmline.c
trunk/liblwgeom/lwmpoint.c
trunk/liblwgeom/lwmpoly.c
trunk/liblwgeom/lwpoint.c
trunk/liblwgeom/lwpoly.c
trunk/liblwgeom/ptarray.c
trunk/loader/shp2pgsql.c
trunk/lwgeom/lwgeom_functions_analytic.c
trunk/lwgeom/lwgeom_kml.c
Log:
Rename lwfree_* to *_free.
Modified: trunk/liblwgeom/cunit/cu_algorithm.c
===================================================================
--- trunk/liblwgeom/cunit/cu_algorithm.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/cunit/cu_algorithm.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -98,9 +98,9 @@
if ( p2 ) lwfree(p2);
if ( q1 ) lwfree(q1);
if ( q2 ) lwfree(q2);
- if ( l21 ) lwfree_line(l21);
- if ( l22 ) lwfree_line(l22);
- if ( l51 ) lwfree_line(l51);
+ if ( l21 ) lwline_free(l21);
+ if ( l22 ) lwline_free(l22);
+ if ( l51 ) lwline_free(l51);
return 0;
}
@@ -350,52 +350,52 @@
/* Two crossings at segment midpoints */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, -1 1.5, 1 3, 1 4, 1 5)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* One crossing at interior vertex */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, -1 1, -1 2, -1 3)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* Two crossings at interior vertices */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, -1 1, 0 3, 1 3)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* Two crossings, one at the first vertex on at interior vertex */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 0, 0 0, -1 1, 0 3, 1 3)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* Two crossings, one at the first vertex on the next interior vertex */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 0, 0 0, -1 1, 0 1, 1 2)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* Two crossings, one at the last vertex on the next interior vertex */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 4, 0 4, -1 3, 0 3, 1 3)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* Three crossings, two at midpoints, one at vertex */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(0.5 1, -1 0.5, 1 2, -1 2, -1 3)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* One mid-point co-linear crossing */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1.5, 0 2.5, -1 3, -1 4)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* One on-vertices co-linear crossing */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, 0 2, -1 4, -1 4)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
- lwfree_line(l52);
+ lwline_free(l52);
/* No crossing, but end on a co-linearity. */
l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 1 2, 1 3, 0 3, 0 4)", PARSER_CHECK_NONE);
CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_NO_CROSS );
- lwfree_line(l52);
+ lwline_free(l52);
}
@@ -475,7 +475,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1.5,0 2,0 2.5))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip off the top. */
c = lwline_clip_to_ordinate_range(l51, 1, 3.5, 5.5);
@@ -483,7 +483,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 3.5,0 4))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip off the bottom. */
c = lwline_clip_to_ordinate_range(l51, 1, -1.5, 2.5);
@@ -491,7 +491,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2,0 2.5))" );
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Range holds entire object. */
c = lwline_clip_to_ordinate_range(l51, 1, -1.5, 5.5);
@@ -499,7 +499,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2,0 3,0 4))" );
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip on vertices. */
c = lwline_clip_to_ordinate_range(l51, 1, 1.0, 2.0);
@@ -507,7 +507,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1,0 2))" );
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip on vertices off the bottom. */
c = lwline_clip_to_ordinate_range(l51, 1, -1.0, 2.0);
@@ -515,7 +515,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2))" );
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip on top. */
c = lwline_clip_to_ordinate_range(l51, 1, -1.0, 0.0);
@@ -523,7 +523,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "GEOMETRYCOLLECTION(POINT(0 0))" );
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
}
@@ -546,9 +546,9 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1.5,0 2,0 2.5))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
- lwfree_mline(mline);
+ lwmline_free(mline);
/*
** Set up the input line. Two-member case.
@@ -561,9 +561,9 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((1 3.5,1 4),(0 3.5,0 4))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
- lwfree_mline(mline);
+ lwmline_free(mline);
/*
** Set up staggered input line to create multi-type output.
@@ -576,9 +576,9 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "GEOMETRYCOLLECTION(POINT(1 0),LINESTRING(0 0,0 1,0 2,0 2.5))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
- lwfree_mline(mline);
+ lwmline_free(mline);
/*
** Set up input line from MAC
@@ -591,7 +591,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((3 3 3 3,3.5 3.5 3.5 3.5),(3.5 3.5 3.5 4.5,3 3 3 5))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip from 2 to 3.5 */
c = lwline_clip_to_ordinate_range(line, 2, 2.0, 3.5);
@@ -599,7 +599,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((2 2 2 2,3 3 3 3,3.5 3.5 3.5 3.5),(3.5 3.5 3.5 4.5,3 3 3 5,2 2 2 6))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip from 3 to 4 */
c = lwline_clip_to_ordinate_range(line, 2, 3.0, 4.0);
@@ -607,7 +607,7 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((3 3 3 3,4 4 4 4,3 3 3 5))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
/* Clip from 2 to 3 */
c = lwline_clip_to_ordinate_range(line, 2, 2.0, 3.0);
@@ -615,10 +615,10 @@
//printf("c = %s\n", ewkt);
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((2 2 2 2,3 3 3 3),(3 3 3 5,2 2 2 6))");
lwfree(ewkt);
- lwfree_collection(c);
+ lwcollection_free(c);
- lwfree_line(line);
+ lwline_free(line);
}
@@ -653,7 +653,7 @@
CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0.5 0.5 0.5,1 1 1,1.5 1.5 1.5))" );
lwfree(ewkt);
- lwfree_collection(c);
- lwfree_line(line);
+ lwcollection_free(c);
+ lwline_free(line);
}
Modified: trunk/liblwgeom/examples/unparser.c
===================================================================
--- trunk/liblwgeom/examples/unparser.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/examples/unparser.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -79,7 +79,7 @@
/* Free all of the allocated items */
lwfree(lwg_unparser_result.wkoutput);
lwfree(serialized_lwgeom);
- lwfree_point(testpoint);
+ lwpoint_free(testpoint);
lwfree(dpa);
@@ -115,7 +115,7 @@
/* Free all of the allocated items */
lwfree(lwg_unparser_result.wkoutput);
lwfree(serialized_lwgeom);
- lwfree_line(testline);
+ lwline_free(testline);
lwfree(dpa);
@@ -191,6 +191,6 @@
/* Free all of the allocated items */
lwfree(lwg_unparser_result.wkoutput);
lwfree(serialized_lwgeom);
- lwfree_polygon(testpoly);
+ lwpoly_free(testpoly);
}
Modified: trunk/liblwgeom/liblwgeom.h
===================================================================
--- trunk/liblwgeom/liblwgeom.h 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/liblwgeom.h 2009-01-09 17:41:23 UTC (rev 3510)
@@ -965,15 +965,15 @@
* constructed yourself.
*/
-extern void lwfree_point(LWPOINT *pt);
-extern void lwfree_line(LWLINE *line);
-extern void lwfree_polygon(LWPOLY *poly);
-extern void lwfree_pointarray(POINTARRAY *pa);
-extern void lwfree_mpoint(LWMPOINT *mpt);
-extern void lwfree_mline(LWMLINE *mline);
-extern void lwfree_mpolygon(LWMPOLY *mpoly);
-extern void lwfree_collection(LWCOLLECTION *col);
-extern void lwfree_geom(LWGEOM *geom);
+extern void ptarray_free(POINTARRAY *pa);
+extern void lwpoint_free(LWPOINT *pt);
+extern void lwline_free(LWLINE *line);
+extern void lwpoly_free(LWPOLY *poly);
+extern void lwmpoint_free(LWMPOINT *mpt);
+extern void lwmline_free(LWMLINE *mline);
+extern void lwmpoly_free(LWMPOLY *mpoly);
+extern void lwcollection_free(LWCOLLECTION *col);
+extern void lwgeom_free(LWGEOM *geom);
extern void lwfree_inspected(LWGEOM_INSPECTED *inspected); /* TODO: make this deep free... */
@@ -985,14 +985,14 @@
* constructed yourself, or you will leak lots of memory.
*/
-extern void lwgeom_release(LWGEOM *lwgeom);
+extern void lwpoint_release(LWPOINT *lwpoint);
+extern void lwline_release(LWLINE *lwline);
extern void lwpoly_release(LWPOLY *lwpoly);
-extern void lwline_release(LWLINE *lwline);
-extern void lwpoint_release(LWPOINT *lwpoint);
+extern void lwmpoint_release(LWMPOINT *lwpoint);
+extern void lwmline_release(LWMLINE *lwline);
extern void lwmpoly_release(LWMPOLY *lwpoly);
-extern void lwmline_release(LWMLINE *lwline);
-extern void lwmpoint_release(LWMPOINT *lwpoint);
extern void lwcollection_release(LWCOLLECTION *lwcollection);
+extern void lwgeom_release(LWGEOM *lwgeom);
/****************************************************************
Modified: trunk/liblwgeom/lwcollection.c
===================================================================
--- trunk/liblwgeom/lwcollection.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwcollection.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -443,7 +443,7 @@
*/
-void lwfree_collection(LWCOLLECTION *col)
+void lwcollection_free(LWCOLLECTION *col)
{
int i;
if( col->bbox )
@@ -456,25 +456,25 @@
switch( TYPE_GETTYPE(col->geoms[i]->type) )
{
case POINTTYPE:
- lwfree_point((LWPOINT*)col->geoms[i]);
+ lwpoint_free((LWPOINT*)col->geoms[i]);
break;
case LINETYPE:
- lwfree_line((LWLINE*)col->geoms[i]);
+ lwline_free((LWLINE*)col->geoms[i]);
break;
case POLYGONTYPE:
- lwfree_polygon((LWPOLY*)col->geoms[i]);
+ lwpoly_free((LWPOLY*)col->geoms[i]);
break;
case MULTIPOINTTYPE:
- lwfree_mpoint((LWMPOINT*)col->geoms[i]);
+ lwmpoint_free((LWMPOINT*)col->geoms[i]);
break;
case MULTILINETYPE:
- lwfree_mline((LWMLINE*)col->geoms[i]);
+ lwmline_free((LWMLINE*)col->geoms[i]);
break;
case MULTIPOLYGONTYPE:
- lwfree_mpolygon((LWMPOLY*)col->geoms[i]);
+ lwmpoly_free((LWMPOLY*)col->geoms[i]);
break;
case COLLECTIONTYPE:
- lwfree_collection((LWCOLLECTION*)col->geoms[i]);
+ lwcollection_free((LWCOLLECTION*)col->geoms[i]);
break;
}
}
Modified: trunk/liblwgeom/lwgeom.c
===================================================================
--- trunk/liblwgeom/lwgeom.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwgeom.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -827,30 +827,30 @@
}
}
-void lwfree_geom(LWGEOM *lwgeom) {
+void lwgeom_free(LWGEOM *lwgeom) {
switch(TYPE_GETTYPE(lwgeom->type))
{
case POINTTYPE:
- lwfree_point((LWPOINT *)lwgeom);
+ lwpoint_free((LWPOINT *)lwgeom);
break;
case LINETYPE:
- lwfree_line((LWLINE *)lwgeom);
+ lwline_free((LWLINE *)lwgeom);
break;
case POLYGONTYPE:
- lwfree_polygon((LWPOLY *)lwgeom);
+ lwpoly_free((LWPOLY *)lwgeom);
break;
case MULTIPOINTTYPE:
- lwfree_mpoint((LWMPOINT *)lwgeom);
+ lwmpoint_free((LWMPOINT *)lwgeom);
break;
case MULTILINETYPE:
- lwfree_mline((LWMLINE *)lwgeom);
+ lwmline_free((LWMLINE *)lwgeom);
break;
case MULTIPOLYGONTYPE:
- lwfree_mpolygon((LWMPOLY *)lwgeom);
+ lwmpoly_free((LWMPOLY *)lwgeom);
break;
case COLLECTIONTYPE:
- lwfree_collection((LWCOLLECTION *)lwgeom);
+ lwcollection_free((LWCOLLECTION *)lwgeom);
break;
}
return;
Modified: trunk/liblwgeom/lwgeom_api.c
===================================================================
--- trunk/liblwgeom/lwgeom_api.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwgeom_api.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -1664,7 +1664,7 @@
LWDEBUG(3, "compute_serialized_box3d: bbox found");
- lwfree_point(pt);
+ lwpoint_free(pt);
return result;
}
@@ -1672,7 +1672,7 @@
{
LWLINE *line = lwline_deserialize(srl);
result = lwline_compute_box3d(line);
- lwfree_line(line);
+ lwline_free(line);
return result;
}
@@ -1687,7 +1687,7 @@
{
LWPOLY *poly = lwpoly_deserialize(srl);
result = lwpoly_compute_box3d(poly);
- lwfree_polygon(poly);
+ lwpoly_free(poly);
return result;
}
Modified: trunk/liblwgeom/lwline.c
===================================================================
--- trunk/liblwgeom/lwline.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwline.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -241,12 +241,12 @@
return size;
}
-void lwfree_line (LWLINE *line)
+void lwline_free (LWLINE *line)
{
if ( line->bbox )
lwfree(line->bbox);
- lwfree_pointarray(line->points);
+ ptarray_free(line->points);
lwfree(line);
}
Modified: trunk/liblwgeom/lwmline.c
===================================================================
--- trunk/liblwgeom/lwmline.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwmline.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -115,7 +115,7 @@
}
-void lwfree_mline(LWMLINE *mline)
+void lwmline_free(LWMLINE *mline)
{
int i;
if( mline->bbox )
@@ -125,7 +125,7 @@
for ( i = 0; i < mline->ngeoms; i++ )
{
if( mline->geoms[i] ) {
- lwfree_line(mline->geoms[i]);
+ lwline_free(mline->geoms[i]);
}
}
if( mline->geoms )
Modified: trunk/liblwgeom/lwmpoint.c
===================================================================
--- trunk/liblwgeom/lwmpoint.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwmpoint.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -115,7 +115,7 @@
}
-void lwfree_mpoint(LWMPOINT *mpt)
+void lwmpoint_free(LWMPOINT *mpt)
{
int i;
if( mpt->bbox )
@@ -125,7 +125,7 @@
for ( i = 0; i < mpt->ngeoms; i++ )
{
if( mpt->geoms[i] ) {
- lwfree_point(mpt->geoms[i]);
+ lwpoint_free(mpt->geoms[i]);
}
}
if( mpt->geoms )
Modified: trunk/liblwgeom/lwmpoly.c
===================================================================
--- trunk/liblwgeom/lwmpoly.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwmpoly.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -118,7 +118,7 @@
}
-void lwfree_mpolygon(LWMPOLY *mpoly)
+void lwmpoly_free(LWMPOLY *mpoly)
{
int i;
if( mpoly->bbox )
@@ -128,7 +128,7 @@
for ( i = 0; i < mpoly->ngeoms; i++ )
{
if( mpoly->geoms[i] ) {
- lwfree_polygon(mpoly->geoms[i]);
+ lwpoly_free(mpoly->geoms[i]);
}
}
if( mpoly->geoms )
Modified: trunk/liblwgeom/lwpoint.c
===================================================================
--- trunk/liblwgeom/lwpoint.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwpoint.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -300,10 +300,10 @@
return result;
}
-void lwfree_point(LWPOINT *pt)
+void lwpoint_free(LWPOINT *pt)
{
if(pt->point)
- lwfree_pointarray(pt->point);
+ ptarray_free(pt->point);
lwfree(pt);
}
Modified: trunk/liblwgeom/lwpoly.c
===================================================================
--- trunk/liblwgeom/lwpoly.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/lwpoly.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -354,7 +354,7 @@
return size;
}
-void lwfree_polygon (LWPOLY *poly)
+void lwpoly_free (LWPOLY *poly)
{
int t;
@@ -364,7 +364,7 @@
for (t=0;t<poly->nrings;t++)
{
if( poly->rings[t] )
- lwfree_pointarray(poly->rings[t]);
+ ptarray_free(poly->rings[t]);
}
if ( poly->rings )
Modified: trunk/liblwgeom/ptarray.c
===================================================================
--- trunk/liblwgeom/ptarray.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/liblwgeom/ptarray.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -37,7 +37,7 @@
}
-void lwfree_pointarray(POINTARRAY *pa)
+void ptarray_free(POINTARRAY *pa)
{
/* TODO
* Turn this on after retrofitting all calls to lwfree_ in /lwgeom
Modified: trunk/loader/shp2pgsql.c
===================================================================
--- trunk/loader/shp2pgsql.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/loader/shp2pgsql.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -899,7 +899,7 @@
for (u = 0; u < obj->nParts; u++)
{
- lwfree_line(lwgeom_as_lwline(lwmultilinestrings[u]));
+ lwline_free(lwgeom_as_lwline(lwmultilinestrings[u]));
lwfree(dpas[u]);
}
@@ -1193,7 +1193,7 @@
/* Cycle through each polygon, freeing everything we need... */
for (u = 0; u < polygon_total; u++)
- lwfree_polygon(lwgeom_as_lwpoly(lwpolygons[u]));
+ lwpoly_free(lwgeom_as_lwpoly(lwpolygons[u]));
/* Free the pointer arrays */
lwfree(pas);
@@ -1284,7 +1284,7 @@
for (u = 0; u < obj->nVertices; u++)
{
- lwfree_point(lwgeom_as_lwpoint(lwmultipoints[u]));
+ lwpoint_free(lwgeom_as_lwpoint(lwmultipoints[u]));
lwfree(dpas[u]);
}
Modified: trunk/lwgeom/lwgeom_functions_analytic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_analytic.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/lwgeom/lwgeom_functions_analytic.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -381,7 +381,7 @@
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
/* We shouldn't need this, the memory context is getting freed on the next line.
- lwfree_point(point); */
+ lwpoint_free(point); */
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
@@ -417,7 +417,7 @@
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
/* We shouldn't need this, the memory context is getting freed on the next line
- lwfree_point(point); */
+ lwpoint_free(point); */
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
tlength += slength;
@@ -433,7 +433,7 @@
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
/* We shouldn't need this, the memory context is getting freed on the next line
- lwfree_point(point); */
+ lwpoint_free(point); */
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
/***********************************************************************
@@ -1031,7 +1031,7 @@
{
geom_out = lwmline_clip_to_ordinate_range((LWMLINE*)line_in, ordinate, from, to);
}
- lwfree_geom(line_in);
+ lwgeom_free(line_in);
if( ! geom_out ) {
elog(ERROR,"The lwline_clip_to_ordinate_range returned null.");
Modified: trunk/lwgeom/lwgeom_kml.c
===================================================================
--- trunk/lwgeom/lwgeom_kml.c 2009-01-09 14:15:30 UTC (rev 3509)
+++ trunk/lwgeom/lwgeom_kml.c 2009-01-09 17:41:23 UTC (rev 3510)
@@ -284,17 +284,17 @@
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
size += askml2_point_size(point);
- lwfree_point(point);
+ lwpoint_free(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
size += askml2_line_size(line);
- lwfree_line(line);
+ lwline_free(line);
}
else if ((poly=lwgeom_getpoly_inspected(insp, i)))
{
size += askml2_poly_size(poly);
- lwfree_polygon(poly);
+ lwpoly_free(poly);
}
else
{
@@ -334,17 +334,17 @@
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
ptr += askml2_point_buf(point, ptr);
- lwfree_point(point);
+ lwpoint_free(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
ptr += askml2_line_buf(line, ptr);
- lwfree_line(line);
+ lwline_free(line);
}
else if ((poly=lwgeom_getpoly_inspected(insp, i)))
{
ptr += askml2_poly_buf(poly, ptr);
- lwfree_polygon(poly);
+ lwpoly_free(poly);
}
else
{
More information about the postgis-commits
mailing list