Remove some camelCase function signatures from liblwgeom

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

diff --git a/ChangeLog b/ChangeLog
index a7680a5051c4a40ab6748a63aabdc73976357a62..0142a0eae5f345d4b95e2ba018c3b1cea27d2615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index 7b742d441c8856dfd058dbbe8dce1cae3e69602d..5812ffbd5ea0ce2be5aa85038ec4535e0c9ed431 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -475,10 +475,10 @@ extern void lwgeom_changed(LWGEOM *lwgeom);
  * 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);
 

diff --git a/liblwgeom/lwalgorithm.c b/liblwgeom/lwalgorithm.c
index 96a76f5ab57ccb14e8bf95936965b94f90bad78e..bf14b14627da5f2bc6799371f195de1ec820e873 100644 (file)
--- a/liblwgeom/lwalgorithm.c
+++ b/liblwgeom/lwalgorithm.c
@@ -447,8 +447,8 @@ LWCOLLECTION *lwmline_clip_to_ordinate_range(LWMLINE *mline, int ordinate, doubl
                                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 @@ LWCOLLECTION *lwline_clip_to_ordinate_range(LWLINE *line, int ordinate, double f
                                        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 @@ LWCOLLECTION *lwline_clip_to_ordinate_range(LWLINE *line, int ordinate, double f
                        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;
        }

diff --git a/liblwgeom/lwcollection.c b/liblwgeom/lwcollection.c
index 0ab9dfe7d01f93b90e612cae513da1fe8e1d9bce..b3e0efe2c09837ca3b1dcfcdf3757db5abe758a5 100644 (file)
--- a/liblwgeom/lwcollection.c
+++ b/liblwgeom/lwcollection.c
@@ -293,16 +293,16 @@ lwcollection_add(const LWCOLLECTION *to, uint32 where, const LWGEOM *what)
        {
                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 @@ TODO: pramsey
 */
 
 
+
 void lwcollection_free(LWCOLLECTION *col) 
 {
        int i;

diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 81932dd2dd49cce58ab2ecd6051fc963ab6ee6b4..61e25da6f7942fa6bba47bda04e7525f8e72c50b 100644 (file)
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -745,7 +745,7 @@ lwgeom_changed(LWGEOM *lwgeom)
 }
 
 void
-lwgeom_dropBBOX(LWGEOM *lwgeom)
+lwgeom_drop_bbox(LWGEOM *lwgeom)
 {
        if ( lwgeom->bbox ) lwfree(lwgeom->bbox);
        lwgeom->bbox = NULL;
@@ -758,7 +758,7 @@ lwgeom_dropBBOX(LWGEOM *lwgeom)
  * else compute it.
  */
 void
-lwgeom_addBBOX(LWGEOM *lwgeom)
+lwgeom_add_bbox(LWGEOM *lwgeom)
 {
        if ( lwgeom->bbox ) return;
        lwgeom->bbox = lwgeom_compute_box2d(lwgeom);

diff --git a/liblwgeom/lwpoint.c b/liblwgeom/lwpoint.c
index 891d8068881b113f32d90eedf39d1f94f78f4ad1..c2cd2644b418508dc0cb374905d531fdab981c12 100644 (file)
--- a/liblwgeom/lwpoint.c
+++ b/liblwgeom/lwpoint.c
@@ -372,9 +372,9 @@ lwpoint_add(const LWPOINT *to, uint32 where, const LWGEOM *what)
        }
        /* 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;

diff --git a/postgis/lwgeom_dump.c b/postgis/lwgeom_dump.c
index 56bf61c920d153d4a150169daafc04fee6f09932..9fcef83a3dff21bb267da503cf609b8819e578ea 100644 (file)
--- a/postgis/lwgeom_dump.c
+++ b/postgis/lwgeom_dump.c
@@ -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);
 

diff --git a/postgis/lwgeom_functions_analytic.c b/postgis/lwgeom_functions_analytic.c
index 7beec43da0fd7b4938193189d1c1191dae0104f8..1163f6bf8b84dc5b46eed5944b5e88616df7dcaf 100644 (file)
--- a/postgis/lwgeom_functions_analytic.c
+++ b/postgis/lwgeom_functions_analytic.c
@@ -313,7 +313,7 @@ Datum LWGEOM_simplify2d(PG_FUNCTION_ARGS)
        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 @@ Datum LWGEOM_snaptogrid(PG_FUNCTION_ARGS)
        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 @@ Datum LWGEOM_snaptogrid_pointoff(PG_FUNCTION_ARGS)
        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
        /*

diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index 6892cb51731a21ea1a9bc14276de22d2be67daff..96a643fde299567ff8415b545124cec546828ef9 100644 (file)
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -1682,7 +1682,7 @@ Datum LWGEOM_longitude_shift(PG_FUNCTION_ARGS)
        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 @@ Datum LWGEOM_collect(PG_FUNCTION_ARGS)
        }
 
        /* 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 @@ Datum LWGEOM_collect_garray(PG_FUNCTION_ARGS)
 
 
                lwgeom_dropSRID(lwgeoms[i]);
-               lwgeom_dropBBOX(lwgeoms[i]);
+               lwgeom_drop_bbox(lwgeoms[i]);
 
                /* Output type not initialized */
                if ( ! outtype )
@@ -3292,7 +3292,7 @@ Datum LWGEOM_affine(PG_FUNCTION_ARGS)
 
        /* COMPUTE_BBOX TAINTING */
        tmp = pglwgeom_deserialize(geom);
-       lwgeom_dropBBOX(tmp);
+       lwgeom_drop_bbox(tmp);
        tmp->bbox = lwgeom_compute_box2d(tmp);
        ret = pglwgeom_serialize(tmp);
 

diff --git a/postgis/lwgeom_geos.c b/postgis/lwgeom_geos.c
index 7dd9402cd437e2be19eabc69826c2ae3ee54f3da..c906b63c86c7a04ea3cffa1161bbc3029d971afb 100644 (file)
--- a/postgis/lwgeom_geos.c
+++ b/postgis/lwgeom_geos.c
@@ -2602,7 +2602,7 @@ GEOS2POSTGIS(GEOSGeom geom, char want3d)
 
        if ( is_worth_caching_lwgeom_bbox(lwgeom) )
        {
-               lwgeom_addBBOX(lwgeom);
+               lwgeom_add_bbox(lwgeom);
        }
 
        result = pglwgeom_serialize(lwgeom);

diff --git a/postgis/lwgeom_ogc.c b/postgis/lwgeom_ogc.c
index ce2d2525984087c0de91ca71340c6238cf4914f9..2fd9ce9ae5bcca5daaec9a772fd909eee4914e9d 100644 (file)
--- a/postgis/lwgeom_ogc.c
+++ b/postgis/lwgeom_ogc.c
@@ -296,7 +296,7 @@ Datum LWGEOM_geometryn_collection(PG_FUNCTION_ARGS)
        subgeom->SRID = coll->SRID;
 
        /* COMPUTE_BBOX==TAINTING */
-       if ( coll->bbox ) lwgeom_addBBOX(subgeom);
+       if ( coll->bbox ) lwgeom_add_bbox(subgeom);
 
        result = pglwgeom_serialize(subgeom);
 

diff --git a/postgis/lwgeom_pg.c b/postgis/lwgeom_pg.c
index d85fd4ba0fc0b9278abd065a8d4a7a5c799bb8e3..ef48698155eb556626b51c3d631bf02bf17da771 100644 (file)
--- a/postgis/lwgeom_pg.c
+++ b/postgis/lwgeom_pg.c
@@ -150,7 +150,7 @@ pglwgeom_serialize(LWGEOM *in)
 #if POSTGIS_AUTOCACHE_BBOX
        if ( ! in->bbox && is_worth_caching_lwgeom_bbox(in) )
        {
-               lwgeom_addBBOX(in);
+               lwgeom_add_bbox(in);
        }
 #endif
 

diff --git a/postgis/lwgeom_transform.c b/postgis/lwgeom_transform.c
index ae671e4f18ff88025d4d8573358447d580ab0e12..9ecdbc6922685e45df4992f104c956605a4b54c4 100644 (file)
--- a/postgis/lwgeom_transform.c
+++ b/postgis/lwgeom_transform.c
@@ -857,7 +857,7 @@ Datum transform(PG_FUNCTION_ARGS)
        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 @@ Datum transform_geom(PG_FUNCTION_ARGS)
        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);