diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2014-11-28 00:29:37 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2014-11-28 00:29:37 +0400 |
| commit | d0d6284cab70af148269d95744f615454cac24bb (patch) | |
| tree | a4c6151171a4ba0d3473f02e5b7ccb99eda2d365 /sql/gcalc_slicescan.cc | |
| parent | 7b55b67de5fdfe91283357fe6c7ccc3f9e355925 (diff) | |
| download | mariadb-git-d0d6284cab70af148269d95744f615454cac24bb.tar.gz | |
MDEV-4045 Missing OGC Spatial functions.
Missing GIS functions added:
IsRing()
PointOnSurface
PointOnSurface
Relate
Distance
Intersection
ConvexHull
Other old OpenGis standard inconsistencies fixed.
Diffstat (limited to 'sql/gcalc_slicescan.cc')
| -rw-r--r-- | sql/gcalc_slicescan.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index 251869cad03..ed533abdaf4 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -1961,7 +1961,7 @@ double Gcalc_scan_iterator::get_h() const state.pi->calc_xy(&x, &next_y); } else - next_y= state.pi->y; + next_y= state.pi->next ? state.pi->get_next()->y : 0.0; return next_y - cur_y; } @@ -1974,7 +1974,7 @@ double Gcalc_scan_iterator::get_sp_x(const point *sp) const dy= sp->next_pi->y - sp->pi->y; if (fabs(dy) < 1e-12) return sp->pi->x; - return (sp->next_pi->x - sp->pi->x) * dy; + return sp->pi->x + (sp->next_pi->x - sp->pi->x) * dy; } |