database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#38959 archive_gis fails due to rounding difference

Browse Source 
Multi_polygon::centroid() has an error in the implementation
      
per-file messages:
  sql/spatial.cc
Bug#38959      archive_gis fails due to rounding difference
        multi_polygon::centroid() implementation fixed
This commit is contained in:
Alexey Botchkov
2010-02-17 14:19:17 +04:00
parent 4f1c72f313
commit b0cdcdcbb9
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/spatial.cc
View File

@ -1612,9 +1612,8 @@ int Gis_multi_polygon::area(double *ar, const char **end_of_data) const
int Gis_multi_polygon::centroid(String *result) const int Gis_multi_polygon::centroid(String *result) const
{ {
uint32 n_polygons; uint32 n_polygons;
bool first_loop= 1;
Gis_polygon p; Gis_polygon p;
double UNINIT_VAR(res_area), UNINIT_VAR(res_cx), UNINIT_VAR(res_cy); double res_area= 0.0, res_cx= 0.0, res_cy= 0.0;
double cur_area, cur_cx, cur_cy; double cur_area, cur_cx, cur_cy;
const char *data= m_data; const char *data= m_data;
@ -1631,20 +1630,13 @@ int Gis_multi_polygon::centroid(String *result) const
p.centroid_xy(&cur_cx, &cur_cy)) p.centroid_xy(&cur_cx, &cur_cy))
return 1; return 1;
if (!first_loop) res_area+= cur_area;
{ res_cx+= cur_area * cur_cx;
double sum_area= res_area + cur_area; res_cy+= cur_area * cur_cy;
res_cx= (res_area * res_cx + cur_area * cur_cx) / sum_area;
res_cy= (res_area * res_cy + cur_area * cur_cy) / sum_area;
}
else
{
first_loop= 0;
res_area= cur_area;
res_cx= cur_cx;
res_cy= cur_cy;
}
} }
res_cx/= res_area;
res_cy/= res_area;
return create_point(result, res_cx, res_cy); return create_point(result, res_cx, res_cy);
} }