[postgis-commits] svn - r3511 - in trunk: liblwgeom lwgeom
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Fri Jan 9 11:17:04 PST 2009
Author: pramsey
Date: 2009-01-09 11:17:03 -0800 (Fri, 09 Jan 2009)
New Revision: 3511
Modified:
trunk/liblwgeom/liblwgeom.h
trunk/liblwgeom/lwgeom_api.c
trunk/lwgeom/lwgeom_functions_basic.c
trunk/lwgeom/lwgeom_geojson.c
trunk/lwgeom/lwgeom_gml.c
trunk/lwgeom/lwgeom_kml.c
trunk/lwgeom/lwgeom_ogc.c
trunk/lwgeom/lwgeom_spheroid.c
trunk/lwgeom/lwgeom_transform.c
Log:
Rename lwfree_inspected to lwinspected_release, per it's "shallow free" behavior.
Modified: trunk/liblwgeom/liblwgeom.h
===================================================================
--- trunk/liblwgeom/liblwgeom.h 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/liblwgeom/liblwgeom.h 2009-01-09 19:17:03 UTC (rev 3511)
@@ -805,8 +805,7 @@
of the sub-geoms */
} LWGEOM_INSPECTED;
-extern int lwgeom_size_inspected(const LWGEOM_INSPECTED *inspected,
- int geom_number);
+extern int lwgeom_size_inspected(const LWGEOM_INSPECTED *inspected, int geom_number);
/*
* note - for a simple type (ie. point), this will have
@@ -975,7 +974,7 @@
extern void lwcollection_free(LWCOLLECTION *col);
extern void lwgeom_free(LWGEOM *geom);
-extern void lwfree_inspected(LWGEOM_INSPECTED *inspected); /* TODO: make this deep free... */
+extern void lwinspected_release(LWGEOM_INSPECTED *inspected); /* TODO: make this deep free... */
/*
* The *_release family of functions frees the LWGEOM structures
Modified: trunk/liblwgeom/lwgeom_api.c
===================================================================
--- trunk/liblwgeom/lwgeom_api.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/liblwgeom/lwgeom_api.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -1216,7 +1216,7 @@
LWGEOM_INSPECTED *inspected = lwgeom_inspect(serialized_form);
result = lwgeom_getsubgeometry_inspected(inspected, geom_number);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return result;
}
@@ -1250,7 +1250,7 @@
LWGEOM_INSPECTED *inspected = lwgeom_inspect(serialized_form);
result = lwgeom_getsubtype_inspected(inspected, geom_number);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return result;
}
@@ -1755,7 +1755,7 @@
****************************************************************/
void
-lwfree_inspected(LWGEOM_INSPECTED *inspected)
+lwinspected_release(LWGEOM_INSPECTED *inspected)
{
if ( inspected->ngeometries )
lwfree(inspected->sub_geoms);
@@ -1865,7 +1865,7 @@
lwnotice("end multi*");
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
}
void
Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_functions_basic.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -288,7 +288,7 @@
}
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return nrings;
}
@@ -356,7 +356,7 @@
POSTGIS_DEBUGF(3, " LWGEOM_area_polygon found a poly (%f)", area);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_FLOAT8(area);
@@ -389,7 +389,7 @@
POSTGIS_DEBUGF(3, " LWGEOM_length2d found a line (%f)", dist);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_FLOAT8(dist);
@@ -418,7 +418,7 @@
dist += lwgeom_pointarray_length(line->points);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_FLOAT8(dist);
@@ -447,7 +447,7 @@
ret += lwgeom_polygon_perimeter(poly);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_FLOAT8(ret);
@@ -476,7 +476,7 @@
ret += lwgeom_polygon_perimeter2d(poly);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_FLOAT8(ret);
@@ -701,7 +701,7 @@
LWDEBUGF(3, "lwgeom_force2d_recursive: added elem %d size: %d (tot: %d)",
i, size, totsize);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
LWDEBUG(3, "lwgeom_force2d_recursive returning");
@@ -889,7 +889,7 @@
LWDEBUGF(3, " elem %d size: %d (tot: %d)", i, size, totsize);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
*retsize = totsize;
}
@@ -1111,7 +1111,7 @@
LWDEBUGF(3, "lwgeom_force3dm_recursive: added elem %d size: %d (tot: %d)",
i, size, totsize);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
LWDEBUG(3, "lwgeom_force3dm_recursive returning");
@@ -1297,7 +1297,7 @@
LWDEBUGF(3, " elem %d size: %d (tot: %d)", i, size, totsize);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
*retsize = totsize;
}
@@ -3258,7 +3258,7 @@
xoff, yoff, zoff);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
}
/*affine transform geometry */
Modified: trunk/lwgeom/lwgeom_geojson.c
===================================================================
--- trunk/lwgeom/lwgeom_geojson.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_geojson.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -658,7 +658,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
size += asgeojson_inspected_size(subinsp, bbox, precision);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
size += sizeof(",") * i;
size += sizeof("]}");
@@ -685,7 +685,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
ptr += asgeojson_inspected_buf(subinsp, ptr, bbox, precision);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
ptr += sprintf(ptr, "]}");
Modified: trunk/lwgeom/lwgeom_gml.c
===================================================================
--- trunk/lwgeom/lwgeom_gml.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_gml.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -341,7 +341,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
size += asgml2_inspected_size(subinsp, 0);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
@@ -406,7 +406,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
ptr += asgml2_inspected_buf(subinsp, 0, ptr);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
@@ -698,7 +698,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
size += asgml3_inspected_size(subinsp, 0);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
@@ -763,7 +763,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
ptr += asgml3_inspected_buf(subinsp, 0, ptr);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
Modified: trunk/lwgeom/lwgeom_kml.c
===================================================================
--- trunk/lwgeom/lwgeom_kml.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_kml.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -301,7 +301,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
size += askml2_inspected_size(subinsp);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
@@ -351,7 +351,7 @@
subgeom = lwgeom_getsubgeometry_inspected(insp, i);
subinsp = lwgeom_inspect(subgeom);
ptr += askml2_inspected_buf(subinsp, ptr);
- lwfree_inspected(subinsp);
+ lwinspected_release(subinsp);
}
}
Modified: trunk/lwgeom/lwgeom_ogc.c
===================================================================
--- trunk/lwgeom/lwgeom_ogc.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_ogc.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -207,12 +207,12 @@
npoints = lwgeom_numpoints_linestring_recursive(subgeom);
if ( npoints == -1 ) continue;
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return npoints;
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return -1;
}
@@ -354,7 +354,7 @@
{
subgeom = lwgeom_getsubgeometry_inspected(inspected, i);
if ( subgeom == NULL ) {
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return -2;
}
@@ -362,13 +362,13 @@
}
if ( dims == 2 ) { /* nothing can be higher */
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return 2;
}
if ( dims > ret ) ret = dims;
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return ret;
}
@@ -493,7 +493,7 @@
if ( tmp == NULL ) {
PG_FREE_IF_COPY(geom, 0);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_RETURN_NULL();
}
@@ -516,11 +516,11 @@
else
{
PG_FREE_IF_COPY(geom, 0);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_RETURN_NULL();
}
PG_FREE_IF_COPY(geom, 0);
- if(inspected != NULL) lwfree_inspected(inspected);
+ if(inspected != NULL) lwinspected_release(inspected);
lwgeom_release((LWGEOM *)tmp);
PG_RETURN_INT32(result);
@@ -654,7 +654,7 @@
}
if ( tmp == NULL ) {
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_NULL();
}
@@ -663,12 +663,12 @@
curve = (LWCURVE *)tmp;
if(wanted_index > curve->points->npoints)
{
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
lwgeom_release(tmp);
PG_RETURN_NULL();
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
pts = pointArray_construct(getPoint_internal(
curve->points,
@@ -682,12 +682,12 @@
/* Ok, now we have a line. Let's see if it has enough points. */
if ( wanted_index > line->points->npoints )
{
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
lwgeom_release(tmp);
PG_RETURN_NULL();
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
/* Construct a point array */
pts = pointArray_construct(getPoint_internal(line->points,
@@ -696,7 +696,7 @@
}
else
{
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
lwgeom_release(tmp);
PG_RETURN_NULL();
@@ -925,7 +925,7 @@
line = lwgeom_getline_inspected(inspected, i);
if ( line ) break;
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
if ( line == NULL ) {
PG_FREE_IF_COPY(geom, 0);
@@ -1254,7 +1254,7 @@
!line_is_closed((LWLINE *)sub))
{
lwgeom_release(sub);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_BOOL(FALSE);
}
@@ -1262,7 +1262,7 @@
!curve_is_closed((LWCURVE *)sub))
{
lwgeom_release(sub);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_BOOL(FALSE);
}
@@ -1270,14 +1270,14 @@
!compound_is_closed((LWCOMPOUND *)sub))
{
lwgeom_release(sub);
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_FREE_IF_COPY(geom, 0);
PG_RETURN_BOOL(FALSE);
}
lwgeom_release(sub);
linesfound++;
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
if ( ! linesfound ) {
PG_FREE_IF_COPY(geom, 0);
Modified: trunk/lwgeom/lwgeom_spheroid.c
===================================================================
--- trunk/lwgeom/lwgeom_spheroid.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_spheroid.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -402,7 +402,7 @@
dist);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_RETURN_FLOAT8(dist);
}
@@ -440,7 +440,7 @@
dist);
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
PG_RETURN_FLOAT8(dist);
}
Modified: trunk/lwgeom/lwgeom_transform.c
===================================================================
--- trunk/lwgeom/lwgeom_transform.c 2009-01-09 17:41:23 UTC (rev 3510)
+++ trunk/lwgeom/lwgeom_transform.c 2009-01-09 19:17:03 UTC (rev 3511)
@@ -727,20 +727,20 @@
{
if (!lwgeom_transform_recursive(subgeom, inpj, outpj))
{
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return 0;
}
continue;
}
else
{
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
lwerror("lwgeom_getsubgeometry_inspected returned NULL");
return 0;
}
}
- lwfree_inspected(inspected);
+ lwinspected_release(inspected);
return 1;
}
More information about the postgis-commits
mailing list