Remove box2df_from_gbox and gbox_from_box2df

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

diff --git a/liblwgeom/g_box.c b/liblwgeom/g_box.c
index 93cd69290cbd81c75e751dd79bb850bca0dc7095..d3708c9680324a02d44db813e577af560e4c2caf 100644 (file)
--- a/liblwgeom/g_box.c
+++ b/liblwgeom/g_box.c
@@ -27,41 +27,6 @@ void gbox_init(GBOX *gbox)
        memset(gbox, 0, sizeof(GBOX));
 }
 
-/* TODO to be removed */
-GBOX* gbox_from_box2df(int flags, const BOX2DFLOAT4 *box)
-{
-       GBOX *g;
-       assert(box);
-       
-       g = gbox_new(flags);
-
-       g->xmin = next_float_down(box->xmin);
-       g->ymin = next_float_down(box->ymin);
-       g->xmax = next_float_up(box->xmax);
-       g->ymax = next_float_up(box->ymax);
-
-       /* CAUTION Inconsistent GBOX if Z or M Dim present ! */
-       g->zmin = g->zmax = NO_Z_VALUE;
-       g->mmin = g->mmax = NO_M_VALUE;
-
-       return g;
-}
-
-/* TODO to be removed */
-BOX2DFLOAT4* box2df_from_gbox(const GBOX *gbox)
-{
-       BOX2DFLOAT4 *b;
-       assert(gbox);
-       
-       b = lwalloc(sizeof(BOX2DFLOAT4));
-
-       b->xmin = next_float_down(gbox->xmin);
-       b->ymin = next_float_down(gbox->ymin);
-       b->xmax = next_float_up(gbox->xmax);
-       b->ymax = next_float_up(gbox->ymax);
-
-       return b;       
-}
 
 /* TODO to be removed */
 BOX3D* box3d_from_gbox(const GBOX *gbox)

diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in
index 0e8cf2a60ee7dac1b128b85cbe7d6e8c2b8aacd8..a1643976df2b3b051b2583731c36f9131dab89b9 100644 (file)
--- a/liblwgeom/liblwgeom.h.in
+++ b/liblwgeom/liblwgeom.h.in
@@ -654,9 +654,6 @@ extern void lwgeom_drop_srid(LWGEOM *lwgeom);
 */
 extern void lwgeom_add_bbox(LWGEOM *lwgeom);
 
-GBOX* gbox_from_box2df(int flags, const BOX2DFLOAT4 *box);
-BOX2DFLOAT4* box2df_from_gbox(const GBOX *gbox);
-
 /** 
 * Determine whether a LWGEOM can contain sub-geometries or not 
 */