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

Fixed compilation of benchmark tools.

Browse source
This commit is contained in:
Daria Volvenkova 2017-04-11 12:49:36 +03:00
parent 1a9b2ef125
commit 0229aba43f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
map/benchmark_tools.cpp
View file

@ -101,7 +101,7 @@ void RunGraphicsBenchmark(Framework * framework)
auto scenarioElem = json_array_get(scenariosNode, i);
if (scenarioElem == nullptr)
return;
my::FromJSONObject(scenarioElem, "name", handle->m_scenariosToRun[i].m_name);
FromJSONObject(scenarioElem, "name", handle->m_scenariosToRun[i].m_name);
json_t * stepsNode = json_object_get(scenarioElem, "steps");
if (stepsNode != nullptr && json_is_array(stepsNode))
{
@ -114,11 +114,11 @@ void RunGraphicsBenchmark(Framework * framework)
if (stepElem == nullptr)
return;
string actionType;
my::FromJSONObject(stepElem, "actionType", actionType);
FromJSONObject(stepElem, "actionType", actionType);
if (actionType == "waitForTime")
{
json_int_t timeInSeconds = 0;
my::FromJSONObject(stepElem, "time", timeInSeconds);
FromJSONObject(stepElem, "time", timeInSeconds);
scenario.push_back(std::unique_ptr<ScenarioManager::Action>(
new ScenarioManager::WaitForTimeAction(seconds(timeInSeconds))));
}
@ -128,10 +128,10 @@ void RunGraphicsBenchmark(Framework * framework)
if (centerNode == nullptr)
return;
double x = 0.0, y = 0.0;
my::FromJSONObject(centerNode, "x", x);
my::FromJSONObject(centerNode, "y", y);
FromJSONObject(centerNode, "x", x);
FromJSONObject(centerNode, "y", y);
json_int_t zoomLevel = -1;
my::FromJSONObject(stepElem, "zoomLevel", zoomLevel);
FromJSONObject(stepElem, "zoomLevel", zoomLevel);
m2::PointD const pt(x, y);
points.push_back(pt);
scenario.push_back(std::unique_ptr<ScenarioManager::Action>(