pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed GCC compilation

Browse source
This commit is contained in:
Alex Zolotarev 2011-01-30 20:52:18 +01:00 • committed by Alex Zolotarev
parent e69d3aa49d
commit 8b5990c237
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
geometry/geometry_tests/large_polygon.hpp
View file

@ -1,5 +1,8 @@
#include "../point2d.hpp"
namespace LargePolygon
{
typedef m2::PointD P;
// This is actually part of coastline of Australia.
@ -5545,3 +5548,5 @@ m2::PointD const kLargePolygon[] =
P(136.0341491699219,-12.4697208404541),
P(136.0397033691406,-12.47166633605957)
};
} // namespace LargePolygon

4
geometry/geometry_tests/simplification_test.cpp
View file

@ -163,5 +163,5 @@ UNIT_TEST(Simpfication_DP_DegenerateTrg)
#include "large_polygon.hpp"
m2::PointD const * LargePolylineTestData::m_Data = kLargePolygon;
size_t LargePolylineTestData::m_Size = ARRAY_SIZE(kLargePolygon);
m2::PointD const * LargePolylineTestData::m_Data = LargePolygon::kLargePolygon;
size_t LargePolylineTestData::m_Size = ARRAY_SIZE(LargePolygon::kLargePolygon);

6
indexer/indexer_tests/geometry_coding_test.cpp
View file

@ -131,7 +131,7 @@ void TestEncodePolyline(string name, m2::PointU maxPoint, vector<m2::PointU> con
UNIT_TEST(EncodePolyline)
{
size_t const kSizes [] = { 0, 1, 2, 3, 4, ARRAY_SIZE(kLargePolygon) };
size_t const kSizes [] = { 0, 1, 2, 3, 4, ARRAY_SIZE(LargePolygon::kLargePolygon) };
m2::PointU const maxPoint(1000000000, 1000000000);
for (size_t iSize = 0; iSize < ARRAY_SIZE(kSizes); ++iSize)
{
@ -139,8 +139,8 @@ UNIT_TEST(EncodePolyline)
vector<m2::PointU> points;
points.reserve(polygonSize);
for (size_t i = 0; i < polygonSize; ++i)
points.push_back(m2::PointU(static_cast<uint32_t>(kLargePolygon[i].x * 10000),
static_cast<uint32_t>((kLargePolygon[i].y + 200) * 10000)));
points.push_back(m2::PointU(static_cast<uint32_t>(LargePolygon::kLargePolygon[i].x * 10000),
static_cast<uint32_t>((LargePolygon::kLargePolygon[i].y + 200) * 10000)));
TestEncodePolyline("Unsimp", maxPoint, points);
TestEncodePolyline("1simp", maxPoint, SimplifyPoints(points, 1));