Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'software_renderer/feature_processor.cpp')
-rw-r--r--software_renderer/feature_processor.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/software_renderer/feature_processor.cpp b/software_renderer/feature_processor.cpp
index 1b48a7a573..1f16468d37 100644
--- a/software_renderer/feature_processor.cpp
+++ b/software_renderer/feature_processor.cpp
@@ -4,9 +4,12 @@
#include "software_renderer/feature_styler.hpp"
#include "software_renderer/cpu_drawer.hpp"
+#include "indexer/feature.hpp"
#include "indexer/feature_impl.hpp"
#include "indexer/feature_algo.hpp"
+#include "base/assert.hpp"
+
namespace software_renderer
{
namespace
@@ -43,7 +46,7 @@ FeatureProcessor::FeatureProcessor(ref_ptr<CPUDrawer> drawer,
// ASSERT_GREATER(m_zoom, scales::GetUpperWorldScale(), ());
}
-bool FeatureProcessor::operator()(FeatureType const & f)
+bool FeatureProcessor::operator()(FeatureType & f)
{
FeatureData data;
data.m_id = f.GetID();
@@ -63,7 +66,7 @@ bool FeatureProcessor::operator()(FeatureType const & f)
switch (data.m_styler.m_geometryType)
{
- case feature::GEOM_POINT:
+ case feature::GeomType::Point:
{
typedef one_point functor_t;
@@ -82,7 +85,7 @@ bool FeatureProcessor::operator()(FeatureType const & f)
break;
}
- case feature::GEOM_AREA:
+ case feature::GeomType::Area:
{
typedef filter_screenpts_adapter<area_tess_points> functor_t;
@@ -107,7 +110,7 @@ bool FeatureProcessor::operator()(FeatureType const & f)
break;
}
- case feature::GEOM_LINE:
+ case feature::GeomType::Line:
{
if (data.m_styler.m_hasPathText)
{