1
1
Fork 0

Move BOX3D signatures to private header

master
Sandro Santilli 2016-09-08 12:27:13 +02:00
parent fb59a587eb
commit 6e9615b875
2 changed files with 23 additions and 24 deletions

View File

@ -257,15 +257,6 @@ typedef struct {
double afac, bfac, cfac, dfac, efac, ffac, gfac, hfac, ifac, xoff, yoff, zoff;
} RTAFFINE;
/******************************************************************/
typedef struct
{
double xmin, ymin, zmin;
double xmax, ymax, zmax;
int32_t srid;
}
BOX3D;
/******************************************************************
* RTGBOX structure.
@ -1053,20 +1044,6 @@ RTCOLLECTION* rtcollection_extract(const RTCTX *ctx, RTCOLLECTION *col, int type
*/
extern void rtgeom_set_srid(const RTCTX *ctx, RTGEOM *geom, int srid);
/*------------------------------------------------------
* other stuff
*
* handle the double-to-float conversion. The results of this
* will usually be a slightly bigger box because of the difference
* between float8 and float4 representations.
*/
extern BOX3D* box3d_from_gbox(const RTCTX *ctx, const RTGBOX *gbox);
extern RTGBOX* box3d_to_gbox(const RTCTX *ctx, const BOX3D *b3d);
void expand_box3d(BOX3D *box, double d);
/****************************************************************
* MEMORY MANAGEMENT
****************************************************************/
@ -1118,7 +1095,6 @@ extern void rtgeom_release(const RTCTX *ctx, RTGEOM *rtgeom);
* Utility
****************************************************************/
extern void printBOX3D(const RTCTX *ctx, BOX3D *b);
extern void printPA(const RTCTX *ctx, RTPOINTARRAY *pa);
extern void printRTPOINT(const RTCTX *ctx, RTPOINT *point);
extern void printRTLINE(const RTCTX *ctx, RTLINE *line);

View File

@ -175,6 +175,14 @@ struct RTCTX_T {
void * debug_logger_arg;
};
typedef struct
{
double xmin, ymin, zmin;
double xmax, ymax, zmax;
int32_t srid;
}
BOX3D;
/*
* Internal prototypes
*/
@ -514,4 +522,19 @@ int gbox_contains_point2d(const RTCTX *ctx, const RTGBOX *g, const RTPOINT2D *p)
int rtpoly_contains_point(const RTCTX *ctx, const RTPOLY *poly, const RTPOINT2D *pt);
double distance2d_pt_seg(const RTCTX *ctx, const RTPOINT2D *p, const RTPOINT2D *A, const RTPOINT2D *B);
/*------------------------------------------------------
* other stuff
*
* handle the double-to-float conversion. The results of this
* will usually be a slightly bigger box because of the difference
* between float8 and float4 representations.
*/
extern BOX3D* box3d_from_gbox(const RTCTX *ctx, const RTGBOX *gbox);
extern RTGBOX* box3d_to_gbox(const RTCTX *ctx, const BOX3D *b3d);
void expand_box3d(BOX3D *box, double d);
extern void printBOX3D(const RTCTX *ctx, BOX3D *b);
#endif /* _LIBRTGEOM_INTERNAL_H */