mirror of
https://git.osgeo.org/gitea/postgis/postgis
synced 2024-10-24 17:12:35 +00:00
Move floating points comparator macros from liblwgeom.h to liblwgeom_internal.h (not prefixed symbols) [RT-SIGTA]
git-svn-id: http://svn.osgeo.org/postgis/trunk@7714 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
parent
0acdc94202
commit
e8814f483c
|
@ -37,25 +37,6 @@
|
|||
* no special handling for memory management and error reporting.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Floating point comparitors.
|
||||
*/
|
||||
#define FP_TOLERANCE 1e-12
|
||||
#define FP_IS_ZERO(A) (fabs(A) <= FP_TOLERANCE)
|
||||
#define FP_MAX(A, B) (((A) > (B)) ? (A) : (B))
|
||||
#define FP_MIN(A, B) (((A) < (B)) ? (A) : (B))
|
||||
#define FP_EQUALS(A, B) (fabs((A)-(B)) <= FP_TOLERANCE)
|
||||
#define FP_NEQUALS(A, B) (fabs((A)-(B)) > FP_TOLERANCE)
|
||||
#define FP_LT(A, B) (((A) + FP_TOLERANCE) < (B))
|
||||
#define FP_LTEQ(A, B) (((A) - FP_TOLERANCE) <= (B))
|
||||
#define FP_GT(A, B) (((A) - FP_TOLERANCE) > (B))
|
||||
#define FP_GTEQ(A, B) (((A) + FP_TOLERANCE) >= (B))
|
||||
#define FP_CONTAINS_TOP(A, X, B) (FP_LT(A, X) && FP_LTEQ(X, B))
|
||||
#define FP_CONTAINS_BOTTOM(A, X, B) (FP_LTEQ(A, X) && FP_LT(X, B))
|
||||
#define FP_CONTAINS_INCL(A, X, B) (FP_LTEQ(A, X) && FP_LTEQ(X, B))
|
||||
#define FP_CONTAINS_EXCL(A, X, B) (FP_LT(A, X) && FP_LT(X, B))
|
||||
#define FP_CONTAINS(A, X, B) FP_CONTAINS_EXCL(A, X, B)
|
||||
|
||||
/**
|
||||
* Return types for functions with status returns.
|
||||
*/
|
||||
|
@ -100,7 +81,7 @@
|
|||
*/
|
||||
#define POINTTYPE 1
|
||||
#define LINETYPE 2
|
||||
#define POLYGONTYPE 3
|
||||
#define POLYGONTYPE 3
|
||||
#define MULTIPOINTTYPE 4
|
||||
#define MULTILINETYPE 5
|
||||
#define MULTIPOLYGONTYPE 6
|
||||
|
|
|
@ -29,6 +29,25 @@
|
|||
*/
|
||||
#define PI 3.1415926535897932384626433832795
|
||||
|
||||
/**
|
||||
* Floating point comparitors.
|
||||
*/
|
||||
#define FP_TOLERANCE 1e-12
|
||||
#define FP_IS_ZERO(A) (fabs(A) <= FP_TOLERANCE)
|
||||
#define FP_MAX(A, B) (((A) > (B)) ? (A) : (B))
|
||||
#define FP_MIN(A, B) (((A) < (B)) ? (A) : (B))
|
||||
#define FP_EQUALS(A, B) (fabs((A)-(B)) <= FP_TOLERANCE)
|
||||
#define FP_NEQUALS(A, B) (fabs((A)-(B)) > FP_TOLERANCE)
|
||||
#define FP_LT(A, B) (((A) + FP_TOLERANCE) < (B))
|
||||
#define FP_LTEQ(A, B) (((A) - FP_TOLERANCE) <= (B))
|
||||
#define FP_GT(A, B) (((A) - FP_TOLERANCE) > (B))
|
||||
#define FP_GTEQ(A, B) (((A) + FP_TOLERANCE) >= (B))
|
||||
#define FP_CONTAINS_TOP(A, X, B) (FP_LT(A, X) && FP_LTEQ(X, B))
|
||||
#define FP_CONTAINS_BOTTOM(A, X, B) (FP_LTEQ(A, X) && FP_LT(X, B))
|
||||
#define FP_CONTAINS_INCL(A, X, B) (FP_LTEQ(A, X) && FP_LTEQ(X, B))
|
||||
#define FP_CONTAINS_EXCL(A, X, B) (FP_LT(A, X) && FP_LT(X, B))
|
||||
#define FP_CONTAINS(A, X, B) FP_CONTAINS_EXCL(A, X, B)
|
||||
|
||||
|
||||
/**
|
||||
* Well-Known Text (WKT) Output Variant Types
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "../postgis_config.h"
|
||||
|
||||
#include "liblwgeom.h" /* For standard geometry types. */
|
||||
#include "liblwgeom_internal.h" /* For FP comparators. */
|
||||
#include "lwgeom_pg.h" /* For debugging macros. */
|
||||
#include "gserialized_gist.h"
|
||||
#include "geography.h" /* For utility functions. */
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include <errno.h>
|
||||
|
||||
#include "liblwgeom.h" /* For standard geometry types. */
|
||||
#include "liblwgeom_internal.h" /* For FP comparators. */
|
||||
#include "lwgeom_pg.h" /* For debugging macros. */
|
||||
#include "geography.h" /* For utility functions. */
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include "lwgeom_pg.h"
|
||||
#include "liblwgeom.h"
|
||||
#include "liblwgeom_internal.h" /* For FP comparators. */
|
||||
#include "lwgeom_rtree.h"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue