diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-10-14 16:10:55 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-10-14 16:10:55 +0500 |
| commit | 8432284d4fe276db8fe99f434b98e3631e707146 (patch) | |
| tree | 1d3e04875c1216df898f3fb575475091c6cb0bc6 /sql/item_geofunc.cc | |
| parent | bf2deb5ed30b03e9cada6162d8aa837115dce4cc (diff) | |
| download | mariadb-git-8432284d4fe276db8fe99f434b98e3631e707146.tar.gz | |
GIS code.
Forward calculations introduced.
per-file comments:
sql/gcalc_slicescan.cc
sql/gcalc_slicescan.h
sql/gcalc_tools.cc
sql/gcalc_tools.h
sql/item_geofunc.cc
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index dd6914e5d66..c62978f37e2 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1445,7 +1445,7 @@ longlong Item_func_issimple::val_int() Gcalc_operation_transporter trn(&func, &collector); Geometry *g; int result= 1; - const Gcalc_scan_iterator::point *ev; + const Gcalc_scan_iterator::event_point *ev; DBUG_ENTER("Item_func_issimple::val_int"); DBUG_ASSERT(fixed == 1); @@ -1669,7 +1669,7 @@ double Item_func_distance::val_real() bool above_cur_point, cur_point_edge; const Gcalc_scan_iterator::point *evpos; const Gcalc_heap::Info *cur_point, *dist_point; - const Gcalc_scan_iterator::point *ev; + const Gcalc_scan_iterator::event_point *ev; double t, distance, cur_distance; double x1, x2, y1, y2; double ex, ey, vx, vy, e_sqrlen; |