[postgis-commits] svn - r3812 - in trunk: . liblwgeom postgis
postgis-commits at postgis.refractions.net
postgis-commits at postgis.refractions.net
Mon Mar 9 07:36:16 PDT 2009
Author: pramsey
Date: 2009-03-09 07:36:15 -0700 (Mon, 09 Mar 2009)
New Revision: 3812
Modified:
trunk/ChangeLog
trunk/liblwgeom/liblwgeom.h
trunk/liblwgeom/lwalgorithm.c
trunk/liblwgeom/lwcollection.c
trunk/liblwgeom/lwgeom.c
trunk/liblwgeom/lwpoint.c
trunk/postgis/lwgeom_dump.c
trunk/postgis/lwgeom_functions_analytic.c
trunk/postgis/lwgeom_functions_basic.c
trunk/postgis/lwgeom_geos.c
trunk/postgis/lwgeom_ogc.c
trunk/postgis/lwgeom_pg.c
trunk/postgis/lwgeom_transform.c
Log:
Remove some camelCase function signatures from liblwgeom
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/ChangeLog 2009-03-09 14:36:15 UTC (rev 3812)
@@ -6624,7 +6624,7 @@
2004-12-14 11:41 strk
- * lwgeom/lwgeom.c: Fixed a bug in lwgeom_dropBBOX()
+ * lwgeom/lwgeom.c: Fixed a bug in lwgeom_drop_bbox()
2004-12-14 11:02 strk
@@ -7356,7 +7356,7 @@
2004-10-11 09:32 strk
* lwgeom/liblwgeom.h, lwgeom/lwcollection.c, lwgeom/lwgeom.c: Added
- lwgeom_addBBOX() and lwcollection_construct_empty()
+ lwgeom_add_bbox() and lwcollection_construct_empty()
2004-10-11 07:15 strk
Modified: trunk/liblwgeom/liblwgeom.h
===================================================================
--- trunk/liblwgeom/liblwgeom.h 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/liblwgeom/liblwgeom.h 2009-03-09 14:36:15 UTC (rev 3812)
@@ -475,10 +475,10 @@
* with the HASBBOX flag and has a bbox, it
* will be released.
*/
-extern void lwgeom_dropBBOX(LWGEOM *lwgeom);
+extern void lwgeom_drop_bbox(LWGEOM *lwgeom);
/* Compute a bbox if not already computed */
-extern void lwgeom_addBBOX(LWGEOM *lwgeom);
+extern void lwgeom_add_bbox(LWGEOM *lwgeom);
extern void lwgeom_dropSRID(LWGEOM *lwgeom);
Modified: trunk/liblwgeom/lwalgorithm.c
===================================================================
--- trunk/liblwgeom/lwalgorithm.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/liblwgeom/lwalgorithm.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -447,8 +447,8 @@
lwfree(col);
}
}
- lwgeom_dropBBOX((LWGEOM*)lwgeom_out);
- lwgeom_addBBOX((LWGEOM*)lwgeom_out);
+ lwgeom_drop_bbox((LWGEOM*)lwgeom_out);
+ lwgeom_add_bbox((LWGEOM*)lwgeom_out);
if ( ! homogeneous )
{
lwgeom_out->type = lwgeom_makeType(hasz, hasm, hassrid, COLLECTIONTYPE);
@@ -677,8 +677,8 @@
lwgeom_out->geoms = lwalloc(sizeof(LWGEOM*) * lwgeom_out->ngeoms);
}
lwgeom_out->geoms[lwgeom_out->ngeoms - 1] = oline;
- lwgeom_dropBBOX((LWGEOM*)lwgeom_out);
- lwgeom_addBBOX((LWGEOM*)lwgeom_out);
+ lwgeom_drop_bbox((LWGEOM*)lwgeom_out);
+ lwgeom_add_bbox((LWGEOM*)lwgeom_out);
if ( dp ) lwfree(dp);
dp = NULL;
if ( pa_out ) pa_out = NULL;
@@ -718,8 +718,8 @@
lwgeom_out->geoms = lwalloc(sizeof(LWGEOM*) * lwgeom_out->ngeoms);
}
lwgeom_out->geoms[lwgeom_out->ngeoms - 1] = oline;
- lwgeom_dropBBOX((LWGEOM*)lwgeom_out);
- lwgeom_addBBOX((LWGEOM*)lwgeom_out);
+ lwgeom_drop_bbox((LWGEOM*)lwgeom_out);
+ lwgeom_add_bbox((LWGEOM*)lwgeom_out);
if ( dp ) lwfree(dp);
dp = NULL;
}
Modified: trunk/liblwgeom/lwcollection.c
===================================================================
--- trunk/liblwgeom/lwcollection.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/liblwgeom/lwcollection.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -293,16 +293,16 @@
{
geoms[i] = lwgeom_clone(to->geoms[i]);
lwgeom_dropSRID(geoms[i]);
- lwgeom_dropBBOX(geoms[i]);
+ lwgeom_drop_bbox(geoms[i]);
}
geoms[where] = lwgeom_clone(what);
lwgeom_dropSRID(geoms[where]);
- lwgeom_dropBBOX(geoms[where]);
+ lwgeom_drop_bbox(geoms[where]);
for (i=where; i<to->ngeoms; i++)
{
geoms[i+1] = lwgeom_clone(to->geoms[i]);
lwgeom_dropSRID(geoms[i+1]);
- lwgeom_dropBBOX(geoms[i+1]);
+ lwgeom_drop_bbox(geoms[i+1]);
}
col = lwcollection_construct(COLLECTIONTYPE,
@@ -443,6 +443,7 @@
*/
+
void lwcollection_free(LWCOLLECTION *col)
{
int i;
Modified: trunk/liblwgeom/lwgeom.c
===================================================================
--- trunk/liblwgeom/lwgeom.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/liblwgeom/lwgeom.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -745,7 +745,7 @@
}
void
-lwgeom_dropBBOX(LWGEOM *lwgeom)
+lwgeom_drop_bbox(LWGEOM *lwgeom)
{
if ( lwgeom->bbox ) lwfree(lwgeom->bbox);
lwgeom->bbox = NULL;
@@ -758,7 +758,7 @@
* else compute it.
*/
void
-lwgeom_addBBOX(LWGEOM *lwgeom)
+lwgeom_add_bbox(LWGEOM *lwgeom)
{
if ( lwgeom->bbox ) return;
lwgeom->bbox = lwgeom_compute_box2d(lwgeom);
Modified: trunk/liblwgeom/lwpoint.c
===================================================================
--- trunk/liblwgeom/lwpoint.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/liblwgeom/lwpoint.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -372,9 +372,9 @@
}
/* reset SRID and wantbbox flag from component types */
lwgeom_dropSRID(geoms[0]);
- lwgeom_dropBBOX(geoms[0]);
+ lwgeom_drop_bbox(geoms[0]);
lwgeom_dropSRID(geoms[1]);
- lwgeom_dropBBOX(geoms[1]);
+ lwgeom_drop_bbox(geoms[1]);
/* Find appropriate geom type */
if ( TYPE_GETTYPE(what->type) == POINTTYPE ) newtype = MULTIPOINTTYPE;
Modified: trunk/postgis/lwgeom_dump.c
===================================================================
--- trunk/postgis/lwgeom_dump.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_dump.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -29,8 +29,6 @@
#include "lwgeom_pg.h"
#include "profile.h"
-int lwgeom_contains_subgeoms(int type);
-
Datum LWGEOM_dump(PG_FUNCTION_ARGS);
Datum LWGEOM_dump_rings(PG_FUNCTION_ARGS);
Modified: trunk/postgis/lwgeom_functions_analytic.c
===================================================================
--- trunk/postgis/lwgeom_functions_analytic.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_functions_analytic.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -313,7 +313,7 @@
if ( ! out ) PG_RETURN_NULL();
/* COMPUTE_BBOX TAINTING */
- if ( in->bbox ) lwgeom_addBBOX(out);
+ if ( in->bbox ) lwgeom_add_bbox(out);
result = pglwgeom_serialize(out);
@@ -804,7 +804,7 @@
if ( out_lwgeom == NULL ) PG_RETURN_NULL();
/* COMPUTE_BBOX TAINTING */
- if ( in_lwgeom->bbox ) lwgeom_addBBOX(out_lwgeom);
+ if ( in_lwgeom->bbox ) lwgeom_add_bbox(out_lwgeom);
#if 0
/*
@@ -906,7 +906,7 @@
if ( out_lwgeom == NULL ) PG_RETURN_NULL();
/* COMPUTE_BBOX TAINTING */
- if ( in_lwgeom->bbox ) lwgeom_addBBOX(out_lwgeom);
+ if ( in_lwgeom->bbox ) lwgeom_add_bbox(out_lwgeom);
#if 0
/*
Modified: trunk/postgis/lwgeom_functions_basic.c
===================================================================
--- trunk/postgis/lwgeom_functions_basic.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_functions_basic.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -1682,7 +1682,7 @@
lwgeom = pglwgeom_deserialize(geom);
/* Drop bbox, will be recomputed */
- lwgeom_dropBBOX(lwgeom);
+ lwgeom_drop_bbox(lwgeom);
/* Modify geometry */
lwgeom_longitude_shift(lwgeom);
@@ -1802,9 +1802,9 @@
}
/* Drop input geometries bbox and SRID */
- lwgeom_dropBBOX(lwgeoms[0]);
+ lwgeom_drop_bbox(lwgeoms[0]);
lwgeom_dropSRID(lwgeoms[0]);
- lwgeom_dropBBOX(lwgeoms[1]);
+ lwgeom_drop_bbox(lwgeoms[1]);
lwgeom_dropSRID(lwgeoms[1]);
outlwg = (LWGEOM *)lwcollection_construct(
@@ -2059,7 +2059,7 @@
lwgeom_dropSRID(lwgeoms[i]);
- lwgeom_dropBBOX(lwgeoms[i]);
+ lwgeom_drop_bbox(lwgeoms[i]);
/* Output type not initialized */
if ( ! outtype )
@@ -3292,7 +3292,7 @@
/* COMPUTE_BBOX TAINTING */
tmp = pglwgeom_deserialize(geom);
- lwgeom_dropBBOX(tmp);
+ lwgeom_drop_bbox(tmp);
tmp->bbox = lwgeom_compute_box2d(tmp);
ret = pglwgeom_serialize(tmp);
Modified: trunk/postgis/lwgeom_geos.c
===================================================================
--- trunk/postgis/lwgeom_geos.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_geos.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -2602,7 +2602,7 @@
if ( is_worth_caching_lwgeom_bbox(lwgeom) )
{
- lwgeom_addBBOX(lwgeom);
+ lwgeom_add_bbox(lwgeom);
}
result = pglwgeom_serialize(lwgeom);
Modified: trunk/postgis/lwgeom_ogc.c
===================================================================
--- trunk/postgis/lwgeom_ogc.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_ogc.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -296,7 +296,7 @@
subgeom->SRID = coll->SRID;
/* COMPUTE_BBOX==TAINTING */
- if ( coll->bbox ) lwgeom_addBBOX(subgeom);
+ if ( coll->bbox ) lwgeom_add_bbox(subgeom);
result = pglwgeom_serialize(subgeom);
Modified: trunk/postgis/lwgeom_pg.c
===================================================================
--- trunk/postgis/lwgeom_pg.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_pg.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -150,7 +150,7 @@
#if POSTGIS_AUTOCACHE_BBOX
if ( ! in->bbox && is_worth_caching_lwgeom_bbox(in) )
{
- lwgeom_addBBOX(in);
+ lwgeom_add_bbox(in);
}
#endif
Modified: trunk/postgis/lwgeom_transform.c
===================================================================
--- trunk/postgis/lwgeom_transform.c 2009-03-08 22:33:31 UTC (rev 3811)
+++ trunk/postgis/lwgeom_transform.c 2009-03-09 14:36:15 UTC (rev 3812)
@@ -857,7 +857,7 @@
if ( TYPE_HASBBOX(geom->type) )
{
lwgeom = lwgeom_deserialize(srl);
- lwgeom_dropBBOX(lwgeom);
+ lwgeom_drop_bbox(lwgeom);
lwgeom->bbox = lwgeom_compute_box2d(lwgeom);
lwgeom->SRID = result_srid;
result = pglwgeom_serialize(lwgeom);
@@ -973,7 +973,7 @@
if ( TYPE_HASBBOX(geom->type) )
{
lwgeom = lwgeom_deserialize(srl);
- lwgeom_dropBBOX(lwgeom);
+ lwgeom_drop_bbox(lwgeom);
lwgeom->bbox = lwgeom_compute_box2d(lwgeom);
lwgeom->SRID = result_srid;
result = pglwgeom_serialize(lwgeom);
More information about the postgis-commits
mailing list