mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Spatial code cleanup

Browse source
This commit is contained in:
unknown 2002-08-22 12:21:58 +05:00
parent 08a32ab1b1
commit d1a7eea83e
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sql/spatial.cc
View file

@ -285,7 +285,7 @@ int GLineString::get_mbr(MBR *mbr) const
return 1;
for (; n_points>0; --n_points)
{
mbr->add_xy((double *)data, (double *)(data + 8));
mbr->add_xy(data, data + 8);
data += 8+8;
}
@ -551,7 +551,7 @@ int GPolygon::get_mbr(MBR *mbr) const
return 1;
for (; n_points>0; --n_points)
{
mbr->add_xy((double *)data, (double *)(data + 8));
mbr->add_xy(data, data + 8);
data += 8+8;
}
}
@ -838,8 +838,7 @@ int GMultiPoint::get_mbr(MBR *mbr) const
return 1;
for (; n_points>0; --n_points)
{
mbr->add_xy((double *)(data + WKB_HEADER_SIZE),
(double *)(data + 8 + WKB_HEADER_SIZE));
mbr->add_xy(data + WKB_HEADER_SIZE, data + 8 + WKB_HEADER_SIZE);
data += (8+8+WKB_HEADER_SIZE);
}
return 0;
@ -963,7 +962,7 @@ int GMultiLineString::get_mbr(MBR *mbr) const
for (; n_points>0; --n_points)
{
mbr->add_xy((double *)data, (double *)(data + 8));
mbr->add_xy(data, data + 8);
data += 8+8;
}
}
@ -1156,7 +1155,7 @@ int GMultiPolygon::get_mbr(MBR *mbr) const
for (; n_points>0; --n_points)
{
mbr->add_xy((double *)data, (double *)(data + 8));
mbr->add_xy(data, data + 8);
data += 8+8;
}
}

2
sql/spatial.h
View file

@ -71,7 +71,7 @@ struct MBR
}
}
void add_xy(double *px, double *py)
void add_xy(const char *px, const char *py)
{ /* Not using "else" for proper one point MBR calculation */
double x, y;
float8get(x, px);