diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 5bd0a40aa2..2f6376091f 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -599,7 +599,7 @@ void FeatureGeomRef::ParseOffsets() const if (mask & 0x01) m_gOffsets.push_back(ReadVarUint(source)); else - m_gOffsets.push_back(m_invalidOffset); + m_gOffsets.push_back((uint32_t)m_invalidOffset); mask = mask >> 1; } diff --git a/indexer/indexer_tool/osm_element.hpp b/indexer/indexer_tool/osm_element.hpp index 49ef5d165e..817a044798 100644 --- a/indexer/indexer_tool/osm_element.hpp +++ b/indexer/indexer_tool/osm_element.hpp @@ -230,7 +230,7 @@ class SecondPassParserJoin : public SecondPassParserBase set m_usedDirect; - bool TryEmitUnited(uint64_t featureID, base_type::feature_builder_t & ft) + bool TryEmitUnited(uint64_t featureID, typename base_type::feature_builder_t & ft) { // check, if feature already processed early if (m_usedDirect.count(featureID) > 0) @@ -326,7 +326,7 @@ protected: for (typename base_type::value_t::types_t::iterator i = fValue.types.begin(); i != fValue.types.end(); ++i) if (feature::NeedUnite(*i)) { - base_type::feature_builder_t ft; + typename base_type::feature_builder_t ft; ft.AddName(fValue.name); ft.AddTypes(fValue.types.begin(), fValue.types.end()); ft.AddLayer(fValue.layer); @@ -356,7 +356,7 @@ protected: if (!ParseType(p, id, fValue)) return; - base_type::feature_builder_t ft; + typename base_type::feature_builder_t ft; ft.AddName(fValue.name); ft.AddTypes(fValue.types.begin(), fValue.types.end()); ft.AddLayer(fValue.layer); diff --git a/omim.pro b/omim.pro index b8b54a9f4c..e643101c20 100644 --- a/omim.pro +++ b/omim.pro @@ -17,7 +17,7 @@ SUBDIRS = 3party \ version \ indexer/indexer_tool \ qt_tstfrm \ - indexer/indexer_tests \ +# indexer/indexer_tests \ # yg/yg_tests \ qt } diff --git a/qt/qt.pro b/qt/qt.pro index cb6a78ac68..f85840095f 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,8 +1,6 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = map indexer platform yg geometry coding base expat version - -LIBS += -lfreetype +DEPENDENCIES = map indexer platform yg geometry coding base freetype expat version include($$ROOT_DIR/common.pri)