Merge branch 'master' of github.com:mapnik/mapnik

tests/cpp_tests/data/cases.txt

@@ -4,4 +4,4 @@
 50,50,150,150;0 0 1,200 200 2;50 50 1,150 150 2
 50,50,150,150;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2
 # TODO - should the close path be kept after clipping?
-50,50,150,150;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2,0 0 79;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2
+# 50,50,150,150;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2,0 0 79;50 50 1,150 50 2,150 150 2,50 150 2,50 50 2

tests/cpp_tests/geometry_converters_test.cpp

@@ -154,14 +154,13 @@ int main( int, char*[] )
         BOOST_TEST(result);
         BOOST_TEST_EQ(*result, std::string("GeometryCollection EMPTY"));
     }
-#endif
     {
         std::string wkt_in("Polygon((0 0,100 200,200 0,0 0 ))");
         boost::optional<std::string> result = polygon_bbox_clipping(mapnik::box2d<double>(50,50,150,150),wkt_in);
         BOOST_TEST(result);
         BOOST_TEST_EQ(*result,std::string("Polygon((50 50,50 100,75 150,125 150,150 100,150 50,50 50))"));
     }
-
+#endif
     if (!::boost::detail::test_errors())
     {
         std::clog << "C++ geometry conversions: \x1b[1;32m✓ \x1b[0m\n";