Integrated libtess2 library into our code.

3 files changed, 4 insertions, 3 deletions

diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index 490c056990..1a3cae120c 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = generator map routing indexer platform geometry coding base expat sgitess protobuf tomcrypt osrm succinct
+DEPENDENCIES = generator map routing indexer platform geometry coding base expat tess2 protobuf tomcrypt osrm succinct
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/generator/generator_tests/tesselator_test.cpp b/generator/generator_tests/tesselator_test.cpp
index 86f235714f..76740d609e 100644
--- a/generator/generator_tests/tesselator_test.cpp
+++ b/generator/generator_tests/tesselator_test.cpp
@@ -27,10 +27,11 @@ namespace
   size_t RunTest(list<vector<P> > const & l)
   {
     tesselator::TrianglesInfo info;
-    tesselator::TesselateInterior(l, info);
+    int const trianglesCount = tesselator::TesselateInterior(l, info);
 
     size_t count;
     info.ForEachTriangle(DoDump(count));
+    ASSERT_EQUAL(count, trianglesCount, ());
     return count;
   }
 
diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp
index dd90fbe992..c21c933477 100644
--- a/generator/generator_tests/triangles_tree_coding_test.cpp
+++ b/generator/generator_tests/triangles_tree_coding_test.cpp
@@ -56,7 +56,7 @@ namespace
     info.Reserve(countT);
 
     for (size_t i = 0; i < countT; ++i)
-      info.Add(arrT[i]);
+      info.Add(arrT[i][0], arrT[i][1], arrT[i][2]);
 
     serial::CodingParams cp;