Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixes Undefined Behavior in tile header from ODR-violation

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-02-26 13:25:16 +01:00 committed by Patrick Niklaus
parent afae896d05
commit 3feba9a581
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/engine/plugins/tile.hpp
View File

@ -69,7 +69,7 @@ inline void lonlat2merc(double &x, double &y)
const constexpr double tile_size_ = 256.0; const constexpr double tile_size_ = 256.0;
// //
void from_pixels(double shift, double &x, double &y) inline void from_pixels(double shift, double &x, double &y)
{ {
double b = shift / 2.0; double b = shift / 2.0;
x = (x - b) / (shift / 360.0); x = (x - b) / (shift / 360.0);
@ -78,7 +78,8 @@ void from_pixels(double shift, double &x, double &y)
} }
// Converts a WMS tile coordinate (z,x,y) into a mercator bounding box // Converts a WMS tile coordinate (z,x,y) into a mercator bounding box
void xyz2mercator(int x, int y, int z, double &minx, double &miny, double &maxx, double &maxy) inline void
xyz2mercator(int x, int y, int z, double &minx, double &miny, double &maxx, double &maxy)
{ {
minx = x * tile_size_; minx = x * tile_size_;
miny = (y + 1.0) * tile_size_; miny = (y + 1.0) * tile_size_;
@ -92,7 +93,7 @@ void xyz2mercator(int x, int y, int z, double &minx, double &miny, double &maxx,
} }
// Converts a WMS tile coordinate (z,x,y) into a wsg84 bounding box // Converts a WMS tile coordinate (z,x,y) into a wsg84 bounding box
void xyz2wsg84(int x, int y, int z, double &minx, double &miny, double &maxx, double &maxy) inline void xyz2wsg84(int x, int y, int z, double &minx, double &miny, double &maxx, double &maxy)
{ {
minx = x * tile_size_; minx = x * tile_size_;
miny = (y + 1.0) * tile_size_; miny = (y + 1.0) * tile_size_;