Changeset 6383


Ignore:
Timestamp:
Dec 14, 2010 4:12:12 PM (6 years ago)
Author:
pramsey
Message:

Strip out more instances of SERIALIZED_FORM

Location:
trunk/postgis
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/postgis/lwgeom_box2dfloat4.c

    r6204 r6383  
    9494
    9595        result = palloc(sizeof(BOX2DFLOAT4));
    96         if ( ! getbox2d_p(SERIALIZED_FORM(lwgeom), result) )
     96        if ( ! pglwgeom_getbox2d_p(lwgeom, result) )
    9797        {
    9898                PG_RETURN_NULL(); /* must be the empty geometry */
     
    417417                lwgeom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
    418418                /* empty geom would make getbox2d_p return NULL */
    419                 if ( ! getbox2d_p(SERIALIZED_FORM(lwgeom), &box) ) PG_RETURN_NULL();
     419                if ( ! pglwgeom_getbox2d_p(lwgeom, &box) ) PG_RETURN_NULL();
    420420                memcpy(result, &box, sizeof(BOX2DFLOAT4));
    421421                PG_RETURN_POINTER(result);
     
    432432
    433433        lwgeom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
    434         if ( ! getbox2d_p(SERIALIZED_FORM(lwgeom), &box) )
     434        if ( ! pglwgeom_getbox2d_p(lwgeom, &box) )
    435435        {
    436436                /* must be the empty geom */
     
    539539        POINT2D minp, maxp;
    540540
    541         minpoint = lwgeom_deserialize(SERIALIZED_FORM(min));
    542         maxpoint = lwgeom_deserialize(SERIALIZED_FORM(max));
     541        minpoint = pglwgeom_deserialize(min);
     542        maxpoint = pglwgeom_deserialize(max);
    543543
    544544        if ( minpoint->type != POINTTYPE || maxpoint->type != POINTTYPE )
  • trunk/postgis/lwgeom_box3d.c

    r6306 r6383  
    326326        BOX3D *result;
    327327
    328         result = compute_serialized_box3d(SERIALIZED_FORM(lwgeom));
     328        result = pglwgeom_compute_serialized_box3d(lwgeom);
    329329        if ( ! result ) PG_RETURN_NULL();
    330330
     
    394394        {
    395395                lwgeom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
    396                 box = compute_serialized_box3d(SERIALIZED_FORM(lwgeom));
     396                box = pglwgeom_compute_serialized_box3d(lwgeom);
    397397                if ( ! box )
    398398                {
     
    412412
    413413        lwgeom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
    414         box = compute_serialized_box3d(SERIALIZED_FORM(lwgeom));
     414        box = pglwgeom_compute_serialized_box3d(lwgeom);
    415415        if ( ! box ) /* must be the empty geom */
    416416        {
  • trunk/postgis/lwgeom_btree.c

    r6204 r6383  
    5454        POSTGIS_DEBUG(3, "lwgeom_lt passed getSRID test");
    5555
    56         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    57         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     56        pglwgeom_getbox2d_p(geom1, &box1);
     57        pglwgeom_getbox2d_p(geom2, &box2);
    5858
    5959        POSTGIS_DEBUG(3, "lwgeom_lt getbox2d_p passed");
     
    107107        }
    108108
    109         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    110         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     109        pglwgeom_getbox2d_p(geom1, &box1);
     110        pglwgeom_getbox2d_p(geom2, &box2);
    111111
    112112        if  ( ! FPeq(box1.xmin , box2.xmin) )
     
    189189        }
    190190
    191         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    192         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     191        pglwgeom_getbox2d_p(geom1, &box1);
     192        pglwgeom_getbox2d_p(geom2, &box2);
    193193
    194194        if  ( ! FPeq(box1.xmin , box2.xmin) )
     
    247247        }
    248248
    249         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    250         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     249        pglwgeom_getbox2d_p(geom1, &box1);
     250        pglwgeom_getbox2d_p(geom2, &box2);
    251251
    252252        if  ( ! FPeq(box1.xmin , box2.xmin) )
     
    321321        }
    322322
    323         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    324         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     323        pglwgeom_getbox2d_p(geom1, &box1);
     324        pglwgeom_getbox2d_p(geom2, &box2);
    325325
    326326        if  ( ! FPeq(box1.xmin , box2.xmin) )
     
    391391        }
    392392
    393         getbox2d_p(SERIALIZED_FORM(geom1), &box1);
    394         getbox2d_p(SERIALIZED_FORM(geom2), &box2);
     393        pglwgeom_getbox2d_p(geom1, &box1);
     394        pglwgeom_getbox2d_p(geom2, &box2);
    395395
    396396        if  ( ! FPeq(box1.xmin , box2.xmin) )
  • trunk/postgis/lwgeom_estimate.c

    r6204 r6383  
    855855                geom = (PG_LWGEOM *)PG_DETOAST_DATUM(datum);
    856856
    857                 if ( ! getbox2d_p(SERIALIZED_FORM(geom), &box) )
     857                if ( ! pglwgeom_getbox2d_p(geom, &box) )
    858858                {
    859859                        /* Skip empty geometry */
  • trunk/postgis/lwgeom_functions_basic.c

    r6363 r6383  
    17341734
    17351735        /* get geometry box  */
    1736         if ( ! compute_serialized_box3d_p(SERIALIZED_FORM(geom), &box3d) )
     1736        if ( ! pglwgeom_compute_serialized_box3d_p(geom, &box3d) )
    17371737        {
    17381738                /* must be an EMPTY geometry */
     
    18161816
    18171817        /* get bounding box  */
    1818         if ( ! compute_serialized_box3d_p(SERIALIZED_FORM(geom), &box) )
     1818        if ( ! pglwgeom_compute_serialized_box3d_p(geom, &box) )
    18191819        {
    18201820                /* must be the EMPTY geometry */
     
    25532553        /*bbox check */
    25542554
    2555         getbox2d_p( SERIALIZED_FORM(pg_geom1), &g1_bvol );
     2555        pglwgeom_getbox2d_p(pg_geom1, &g1_bvol );
    25562556
    25572557
  • trunk/postgis/lwgeom_geos.c

    r6322 r6383  
    10081008
    10091009        /* Copy input bbox if any */
    1010         if ( getbox2d_p(SERIALIZED_FORM(geom1), &bbox) )
     1010        if ( pglwgeom_getbox2d_p(geom1, &bbox) )
    10111011        {
    10121012                lwout->bbox = gbox_from_box2df(lwout->flags, &bbox);
     
    19271927         * Do the test IFF BOUNDING BOX AVAILABLE.
    19281928         */
    1929         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    1930                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     1929        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     1930                pglwgeom_getbox2d_p(geom2, &box2) )
    19311931        {
    19321932                if ( box2.xmax < box1.xmin ) PG_RETURN_BOOL(FALSE);
     
    20132013        ** Do the test IFF BOUNDING BOX AVAILABLE.
    20142014        */
    2015         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2016                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2015        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2016                pglwgeom_getbox2d_p(geom2, &box2) )
    20172017        {
    20182018                if ( ( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
     
    21612161        * Do the test IFF BOUNDING BOX AVAILABLE.
    21622162        */
    2163         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2164                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2163        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2164                pglwgeom_getbox2d_p(geom2, &box2) )
    21652165        {
    21662166                if (( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
     
    22562256         * Do the test IFF BOUNDING BOX AVAILABLE.
    22572257         */
    2258         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2259                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2258        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2259                pglwgeom_getbox2d_p(geom2, &box2) )
    22602260        {
    22612261                if (( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
     
    24132413         * Do the test IFF BOUNDING BOX AVAILABLE.
    24142414         */
    2415         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2416                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2415        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2416                pglwgeom_getbox2d_p(geom2, &box2) )
    24172417        {
    24182418                if ( ( box1.xmin < box2.xmin ) || ( box1.xmax > box2.xmax ) ||
     
    25582558         * Do the test IFF BOUNDING BOX AVAILABLE.
    25592559         */
    2560         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2561                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2560        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2561                pglwgeom_getbox2d_p(geom2, &box2) )
    25622562        {
    25632563                if ( ( box1.xmin < box2.xmin ) || ( box1.xmax > box2.xmax ) ||
     
    26962696         * Do the test IFF BOUNDING BOX AVAILABLE.
    26972697         */
    2698         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2699                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2698        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2699                pglwgeom_getbox2d_p(geom2, &box2) )
    27002700        {
    27012701                if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
     
    27822782         * Do the test IFF BOUNDING BOX AVAILABLE.
    27832783         */
    2784         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2785                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2784        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2785                pglwgeom_getbox2d_p(geom2, &box2) )
    27862786        {
    27872787                if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
     
    29512951         * Do the test IFF BOUNDING BOX AVAILABLE.
    29522952         */
    2953         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    2954                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     2953        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     2954                pglwgeom_getbox2d_p(geom2, &box2) )
    29552955        {
    29562956                if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
     
    30313031         * Do the test IFF BOUNDING BOX AVAILABLE.
    30323032         */
    3033         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    3034                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     3033        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     3034                pglwgeom_getbox2d_p(geom2, &box2) )
    30353035        {
    30363036                if ( ( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
     
    32463246         * Do the test IFF BOUNDING BOX AVAILABLE.
    32473247         */
    3248         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    3249                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     3248        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     3249                pglwgeom_getbox2d_p(geom2, &box2) )
    32503250        {
    32513251                if ( box2.xmax != box1.xmax ) PG_RETURN_BOOL(FALSE);
     
    37223722{
    37233723        GEOSGeometry *ret;
    3724         LWGEOM *lwgeom = lwgeom_deserialize(SERIALIZED_FORM(pglwgeom));
     3724        LWGEOM *lwgeom = pglwgeom_deserialize(pglwgeom);
    37253725        if ( ! lwgeom )
    37263726        {
  • trunk/postgis/lwgeom_geos_prepared.c

    r6204 r6383  
    488488        * Do the test IFF BOUNDING BOX AVAILABLE.
    489489        */
    490         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    491                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     490        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     491                pglwgeom_getbox2d_p(geom2, &box2) )
    492492        {
    493493                if (( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
     
    561561        * Do the test IFF BOUNDING BOX AVAILABLE.
    562562        */
    563         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    564                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     563        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     564                pglwgeom_getbox2d_p(geom2, &box2) )
    565565        {
    566566                if (( box2.xmin < box1.xmin ) || ( box2.xmax > box1.xmax ) ||
     
    633633        * Do the test IFF BOUNDING BOX AVAILABLE.
    634634        */
    635         if ( getbox2d_p(SERIALIZED_FORM(geom1), &box1) &&
    636                 getbox2d_p(SERIALIZED_FORM(geom2), &box2) )
     635        if ( pglwgeom_getbox2d_p(geom1, &box1) &&
     636                pglwgeom_getbox2d_p(geom2, &box2) )
    637637        {
    638638                if (( box2.xmax < box1.xmin ) || ( box2.xmin > box1.xmax ) ||
  • trunk/postgis/lwgeom_gist.c

    r6309 r6383  
    107107        }
    108108
    109         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     109        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    110110        {
    111111                PG_FREE_IF_COPY(lwgeom1, 0);
     
    150150        }
    151151
    152         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     152        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    153153        {
    154154                PG_FREE_IF_COPY(lwgeom1, 0);
     
    180180        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    181181
    182         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     182        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    183183        {
    184184                PG_FREE_IF_COPY(lwgeom1, 0);
     
    210210        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    211211
    212         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     212        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    213213        {
    214214                PG_FREE_IF_COPY(lwgeom1, 0);
     
    240240        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    241241
    242         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     242        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    243243        {
    244244                PG_FREE_IF_COPY(lwgeom1, 0);
     
    270270        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    271271
    272         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     272        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    273273        {
    274274                PG_FREE_IF_COPY(lwgeom1, 0);
     
    300300        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    301301
    302         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     302        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    303303        {
    304304                PG_FREE_IF_COPY(lwgeom1, 0);
     
    330330        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    331331
    332         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     332        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    333333        {
    334334                PG_FREE_IF_COPY(lwgeom1, 0);
     
    360360        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    361361
    362         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     362        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    363363        {
    364364                PG_FREE_IF_COPY(lwgeom1, 0);
     
    389389        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    390390
    391         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     391        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    392392        {
    393393                PG_FREE_IF_COPY(lwgeom1, 0);
     
    418418        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    419419
    420         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     420        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    421421        {
    422422                PG_FREE_IF_COPY(lwgeom1, 0);
     
    448448        error_if_srid_mismatch(pglwgeom_get_srid(lwgeom1), pglwgeom_get_srid(lwgeom2));
    449449
    450         if ( ! (getbox2d_p(SERIALIZED_FORM(lwgeom1), &box1) && getbox2d_p(SERIALIZED_FORM(lwgeom2), &box2)) )
     450        if ( ! (pglwgeom_getbox2d_p(lwgeom1, &box1) && pglwgeom_getbox2d_p(lwgeom2, &box2)) )
    451451        {
    452452                PG_FREE_IF_COPY(lwgeom1, 0);
     
    506506                        rr = (BOX2DFLOAT4*) palloc(sizeof(BOX2DFLOAT4));
    507507
    508                         if (    ! getbox2d_p(SERIALIZED_FORM(in), rr) ||
     508                        if (    ! pglwgeom_getbox2d_p(in, rr) ||
    509509                                ! finite(rr->xmin) ||
    510510                                ! finite(rr->ymin) ||
     
    563563        StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
    564564        bool result;
    565         uchar *serialized_lwgeom;
    566565        BOX2DFLOAT4  box;
    567566
     
    605604        ** retrieval function, which will calculate the box from scratch.
    606605        */
    607         serialized_lwgeom = SERIALIZED_FORM(query);
    608606        if ( pglwgeom_has_bbox(query) )
    609607        {
    610                 memcpy(&box, serialized_lwgeom + 1, sizeof(BOX2DFLOAT4));
     608                pglwgeom_getbox2d_p(query, &box);
    611609        }
    612610        else
    613611        {
    614612                query = (PG_LWGEOM*)PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
    615                 if ( ! getbox2d_p(SERIALIZED_FORM(query), &box) )
     613                if ( ! pglwgeom_getbox2d_p(query, &box) )
    616614                {
    617615                        PG_FREE_IF_COPY(query, 1);
  • trunk/postgis/lwgeom_ogc.c

    r6336 r6383  
    556556                lwerror("Argument to X() must be a point");
    557557
    558         point = lwgeom_getpoint(SERIALIZED_FORM(geom), 0);
     558        point = lwgeom_as_lwpoint(pglwgeom_deserialize(geom));
    559559
    560560        getPoint2d_p(point->point, 0, &p);
     
    581581                lwerror("Argument to Y() must be a point");
    582582
    583         point = lwgeom_getpoint(SERIALIZED_FORM(geom), 0);
     583        point = lwgeom_as_lwpoint(pglwgeom_deserialize(geom));
    584584
    585585        getPoint2d_p(point->point, 0, &p);
     
    607607                lwerror("Argument to Z() must be a point");
    608608
    609         point = lwgeom_getpoint(SERIALIZED_FORM(geom), 0);
     609        point = lwgeom_as_lwpoint(pglwgeom_deserialize(geom));
    610610
    611611        /* no Z in input */
     
    635635                lwerror("Argument to M() must be a point");
    636636
    637         point = lwgeom_getpoint(SERIALIZED_FORM(geom), 0);
     637        point = lwgeom_as_lwpoint(pglwgeom_deserialize(geom));
    638638
    639639        /* no M in input */
  • trunk/postgis/lwgeom_pg.c

    r6349 r6383  
    502502}
    503503
     504int pglwgeom_getbox2d_p(const PG_LWGEOM *geom, BOX2DFLOAT4 *box)
     505{
     506        return getbox2d_p(SERIALIZED_FORM(geom), box);
     507}
     508
     509BOX3D *pglwgeom_compute_serialized_box3d(const PG_LWGEOM *geom)
     510{
     511        return compute_serialized_box3d(SERIALIZED_FORM(geom));
     512}
     513
     514int pglwgeom_compute_serialized_box3d_p(const PG_LWGEOM *geom, BOX3D *box3d)
     515{
     516        return compute_serialized_box3d_p(SERIALIZED_FORM(geom), box3d);       
     517}
     518
    504519
    505520int
  • trunk/postgis/lwgeom_pg.h

    r6334 r6383  
    8585extern bool pglwgeom_has_m(const PG_LWGEOM *lwgeom);
    8686extern int pglwgeom_is_empty(const PG_LWGEOM *geom);
     87extern int pglwgeom_getbox2d_p(const PG_LWGEOM *geom, BOX2DFLOAT4 *box);
     88extern BOX3D *pglwgeom_compute_serialized_box3d(const PG_LWGEOM *geom);
     89extern int pglwgeom_compute_serialized_box3d_p(const PG_LWGEOM *geom, BOX3D *box3d);
    8790
    8891extern Oid getGeometryOID(void);
Note: See TracChangeset for help on using the changeset viewer.