Skip to content

Commit 644fe7b

Browse files
committed
Increase all tolerances to 1e-9
1 parent e7ee465 commit 644fe7b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

genlib/p2dpoly.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ enum {
3636
};
3737

3838
class Point2f;
39-
bool approxeq(const Point2f& p1, const Point2f& p2, double tolerance = 0.0);
39+
bool approxeq(const Point2f& p1, const Point2f& p2, double tolerance = 1e-9);
4040
class QtRegion;
41-
bool intersect_region(const QtRegion& a, const QtRegion& b, double tolerance = 0.0);
42-
bool overlap_x(const QtRegion& a, const QtRegion& b, double tolerance = 0.0);
43-
bool overlap_y(const QtRegion& a, const QtRegion& b, double tolerance = 0.0);
41+
bool intersect_region(const QtRegion& a, const QtRegion& b, double tolerance = 1e-9);
42+
bool overlap_x(const QtRegion& a, const QtRegion& b, double tolerance = 1e-9);
43+
bool overlap_y(const QtRegion& a, const QtRegion& b, double tolerance = 1e-9);
4444
class Line;
45-
bool intersect_line(const Line& a, const Line& b, double tolerance = 0.0);
46-
bool intersect_line_no_touch(const Line& a, const Line& b, double tolerance = 0.0);
47-
int intersect_line_distinguish(const Line& a, const Line& b, double tolerance = 0.0);
48-
int intersect_line_b(const Line& a, const Line& b, double tolerance = 0.0);
49-
Point2f intersection_point(const Line& a, const Line& b, double tolerance = 0.0);
45+
bool intersect_line(const Line& a, const Line& b, double tolerance = 1e-9);
46+
bool intersect_line_no_touch(const Line& a, const Line& b, double tolerance = 1e-9);
47+
int intersect_line_distinguish(const Line& a, const Line& b, double tolerance = 1e-9);
48+
int intersect_line_b(const Line& a, const Line& b, double tolerance = 1e-9);
49+
Point2f intersection_point(const Line& a, const Line& b, double tolerance = 1e-9);
5050

5151
// NaN on Intel:
5252
// Quick mod - TV
@@ -100,7 +100,7 @@ class Point2f
100100
friend Point2f pointfromangle(double angle);
101101
// a couple of useful tests
102102
bool intriangle(const Point2f& p1, const Point2f& p2, const Point2f& p3);
103-
bool insegment(const Point2f& key, const Point2f& p2, const Point2f& p3, double tolerance = 0.0);
103+
bool insegment(const Point2f& key, const Point2f& p2, const Point2f& p3, double tolerance = 1e-9);
104104
// for OS transformation (note: accurate only to 5 metres according to OS)
105105
Point2f longlat2os(const Point2f& p);
106106
public:

salalib/shapemap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ class ShapeMap : public PixelBase
334334
bool pointInPoly(const Point2f& p, int shaperef) const;
335335
// retrieve lists of polys point intersects:
336336
void pointInPolyList(const Point2f& p, pvecint& shapeindexlist) const;
337-
void lineInPolyList(const Line& li, pvecint& shapeindexlist, int lineref = -1, double tolerance = 0.0) const;
338-
void polyInPolyList(int polyref, pvecint& shapeindexlist, double tolerance = 0.0) const;
337+
void lineInPolyList(const Line& li, pvecint& shapeindexlist, int lineref = -1, double tolerance = 1e-9) const;
338+
void polyInPolyList(int polyref, pvecint& shapeindexlist, double tolerance = 1e-9) const;
339339
void shapeInPolyList(const SalaShape& shape, pvecint& shapeindexlist);
340340
// helper to make actual test of point in shape:
341341
int testPointInPoly(const Point2f& p, const ShapeRef& shape) const;

salalib/spacepix.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ class SpacePixel : public PixelBase
153153
virtual bool findNextLine(bool&) const;
154154
virtual const Line& getNextLine() const;
155155
//
156-
bool intersect(const Line& l, double tolerance = 0.0);
157-
bool intersect_exclude(const Line& l, double tolerance = 0.0);
156+
bool intersect(const Line& l, double tolerance = 1e-9);
157+
bool intersect_exclude(const Line& l, double tolerance = 1e-9);
158158
//
159159
// Point2f getFirstCrossingPoint(const Line& l, int fromend, pvecint& ignorelist = pvecint());
160160
void cutLine(Line& l, short dir);

0 commit comments

Comments
 (0)