Subject: [Boost-commit] svn:boost r84233 - in trunk: boost/geometry boost/geometry/extensions/io/svg boost/geometry/io/svg libs/geometry/doc/doxy/doxygen_input/sourcecode libs/geometry/doc/src/examples/algorithms libs/geometry/example libs/geometry/example_extensions/gis/projections libs/geometry/test/algorithms libs/geometry/test/algorithms/detail libs/geometry/test/algorithms/detail/sections libs/geometry/test/algorithms/overlay libs/geometry/test/algorithms/overlay/robustness libs/geometry/test/robustness/convex_hull libs/geometry/test/robustness/overlay/buffer libs/geometry/test/robustness/overlay/linear_areal libs/geometry/test_extensions/algorithms libs/geometry/test_extensions/algorithms/buffer
From: barend.gehrels_at_[hidden]
Date: 2013-05-11 08:27:47
Author: barendgehrels
Date: 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
New Revision: 84233
URL: http://svn.boost.org/trac/boost/changeset/84233
Log:
[geometry] Moved SVG from extensions to main tree, to release it
Added:
trunk/boost/geometry/io/svg/
- copied from r84231, /trunk/boost/geometry/extensions/io/svg/
Removed:
trunk/boost/geometry/extensions/io/svg/
Text files modified:
trunk/boost/geometry/geometry.hpp | 1 +
trunk/boost/geometry/io/svg/svg_mapper.hpp | 2 +-
trunk/boost/geometry/io/svg/write_svg_multi.hpp | 2 +-
trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp | 4 ++--
trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp | 2 +-
trunk/libs/geometry/doc/src/examples/algorithms/create_svg_two.hpp | 2 +-
trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp | 2 +-
trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 2 +-
trunk/libs/geometry/example/06_b_transformation_example.cpp | 2 +-
trunk/libs/geometry/example/07_a_graph_route_example.cpp | 14 ++++++--------
trunk/libs/geometry/example/07_b_graph_route_example.cpp | 13 +++++--------
trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp | 2 +-
trunk/libs/geometry/example_extensions/gis/projections/p04_example.cpp | 2 +-
trunk/libs/geometry/example_extensions/gis/projections/p05_example.cpp | 2 +-
trunk/libs/geometry/test/algorithms/detail/partition.cpp | 2 +-
trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/assemble.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp | 4 ++--
trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/relative_order.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp | 2 +-
trunk/libs/geometry/test/algorithms/overlay/traverse.cpp | 4 ++--
trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 2 +-
trunk/libs/geometry/test/algorithms/test_difference.hpp | 2 +-
trunk/libs/geometry/test/algorithms/test_intersection.hpp | 2 +-
trunk/libs/geometry/test/algorithms/test_union.hpp | 2 +-
trunk/libs/geometry/test/robustness/convex_hull/random_multi_points.cpp | 2 +-
trunk/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp | 2 +-
trunk/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp | 2 +-
trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp | 2 +-
trunk/libs/geometry/test_extensions/algorithms/connect.cpp | 2 +-
trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp | 9 ++-------
trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp | 2 +-
trunk/libs/geometry/test_extensions/algorithms/offset.cpp | 2 +-
40 files changed, 53 insertions(+), 62 deletions(-)
Modified: trunk/boost/geometry/geometry.hpp
==============================================================================
--- trunk/boost/geometry/geometry.hpp (original)
+++ trunk/boost/geometry/geometry.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -87,5 +87,6 @@
#include <boost/geometry/views/segment_view.hpp>
#include <boost/geometry/io/io.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#endif // BOOST_GEOMETRY_GEOMETRY_HPP
Modified: trunk/boost/geometry/io/svg/svg_mapper.hpp
==============================================================================
--- /trunk/boost/geometry/extensions/io/svg/svg_mapper.hpp (original)
+++ trunk/boost/geometry/io/svg/svg_mapper.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -41,7 +41,7 @@
#include <boost/geometry/multi/algorithms/envelope.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
// Helper geometries (all points are transformed to integer-points)
#include <boost/geometry/geometries/geometries.hpp>
Modified: trunk/boost/geometry/io/svg/write_svg_multi.hpp
==============================================================================
--- /trunk/boost/geometry/extensions/io/svg/write_svg_multi.hpp (original)
+++ trunk/boost/geometry/io/svg/write_svg_multi.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -13,7 +13,7 @@
#define BOOST_GEOMETRY_IO_SVG_WRITE_SVG_MULTI_HPP
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
namespace boost { namespace geometry
Modified: trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -18,9 +18,9 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
+#include <boost/geometry/io/svg/write_svg_multi.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
static const int wkt_countries_count = 1;
Modified: trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -17,7 +17,7 @@
#include <boost/algorithm/string.hpp>
#if defined(HAVE_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
template <typename Geometry, typename Range>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/create_svg_two.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/create_svg_two.hpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/create_svg_two.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -15,7 +15,7 @@
#include <boost/algorithm/string.hpp>
#if defined(HAVE_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
template <typename Geometry1, typename Geometry2>
Modified: trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/05_a_overlay_polygon_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/adapted/c_array.hpp>
#if defined(HAVE_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
Modified: trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -29,7 +29,7 @@
#include <boost/geometry/geometries/adapted/c_array.hpp>
#if defined(HAVE_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian);
Modified: trunk/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- trunk/libs/geometry/example/06_b_transformation_example.cpp (original)
+++ trunk/libs/geometry/example/06_b_transformation_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -24,7 +24,7 @@
#include <boost/geometry/io/wkt/read.hpp>
#if defined(HAVE_SVG)
-# include <boost/geometry/extensions/io/svg/write_svg.hpp>
+# include <boost/geometry/io/svg/write_svg.hpp>
#endif
#include <boost/bind.hpp>
Modified: trunk/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_a_graph_route_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -28,16 +28,14 @@
#include <boost/geometry/io/wkt/read.hpp>
-// Yes, this example currently uses some extensions:
-
- // For output:
- #if defined(HAVE_SVG)
- # include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
- #endif
+// For output:
+#include <boost/geometry/io/svg/svg_mapper.hpp>
- // For distance-calculations over the Earth:
- //#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
+// Yes, this example currently uses an extension:
+// For distance-calculations over the Earth:
+//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
+// Yes, this example currently uses some extensions:
// Read an ASCII file containing WKT's, fill a vector of tuples
Modified: trunk/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_b_graph_route_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -31,16 +31,13 @@
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/io/wkt/read.hpp>
+// For output:
+#include <boost/geometry/io/svg/svg_mapper.hpp>
-// Yes, this example currently uses some extensions:
+// Yes, this example currently uses an extension:
- // For output:
- #if defined(HAVE_SVG)
- # include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
- #endif
-
- // For distance-calculations over the Earth:
- //#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
+// For distance-calculations over the Earth:
+//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
Modified: trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>
Modified: trunk/libs/geometry/example_extensions/gis/projections/p04_example.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p04_example.cpp (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p04_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
Modified: trunk/libs/geometry/example_extensions/gis/projections/p05_example.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p05_example.cpp (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p05_example.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
Modified: trunk/libs/geometry/test/algorithms/detail/partition.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/partition.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/partition.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -21,7 +21,7 @@
#include <boost/geometry/multi/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
#include <boost/random/linear_congruential.hpp>
Modified: trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#include <test_common/test_point.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
# include <boost/geometry/algorithms/buffer.hpp>
# include <boost/geometry/algorithms/centroid.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/assemble.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -34,7 +34,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
template <typename Geometry>
Modified: trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -21,7 +21,7 @@
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -20,7 +20,6 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/multi/io/wkt/read.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
#include <test_common/test_point.hpp>
@@ -28,7 +27,8 @@
//#define TEST_WITH_SVG
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/write_svg_multi.hpp>
#endif
// Collection might be a multi-geometry, or std::vector<ring>
Modified: trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -32,7 +32,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
struct test_enrich_intersection_points
Modified: trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turn_info.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -33,7 +33,7 @@
#include <boost/geometry/io/wkt/write.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
#include <algorithms/overlay/overlay_cases.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
Modified: trunk/libs/geometry/test/algorithms/overlay/relative_order.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/relative_order.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/relative_order.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -23,7 +23,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -28,7 +28,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
#include <boost/geometry/algorithms/intersects.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -36,7 +36,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -21,7 +21,7 @@
#include <boost/type_traits/is_same.hpp>
#ifdef HAVE_TTMATH
-# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+# include <boost/geometry/contrib/ttmath_stub.hpp>
#endif
#include <geometry_test_common.hpp>
@@ -62,7 +62,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
#include <boost/geometry/strategies/strategies.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -48,7 +48,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/test_difference.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_difference.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_difference.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -40,7 +40,7 @@
#if defined(TEST_WITH_SVG)
# define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
# define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
#endif
Modified: trunk/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersection.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersection.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -28,7 +28,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
#include <geometry_test_common.hpp>
Modified: trunk/libs/geometry/test/algorithms/test_union.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_union.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_union.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test/robustness/convex_hull/random_multi_points.cpp
==============================================================================
--- trunk/libs/geometry/test/robustness/convex_hull/random_multi_points.cpp (original)
+++ trunk/libs/geometry/test/robustness/convex_hull/random_multi_points.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
struct settings_type
{
Modified: trunk/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
==============================================================================
--- trunk/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp (original)
+++ trunk/libs/geometry/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -28,7 +28,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
#include <boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp>
Modified: trunk/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
==============================================================================
--- trunk/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp (original)
+++ trunk/libs/geometry/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -28,7 +28,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
#include <common/common_settings.hpp>
Modified: trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -48,7 +48,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test_extensions/algorithms/connect.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/connect.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/connect.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#if defined(TEST_WITH_SVG)
# include <boost/geometry/multi/algorithms/envelope.hpp>
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -34,15 +34,10 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
-
-
-
-
-
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/write_svg_multi.hpp>
#endif
template <typename Mapper>
Modified: trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -29,7 +29,7 @@
#if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif
// BSG 2011/08/05
Modified: trunk/libs/geometry/test_extensions/algorithms/offset.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.cpp 2013-05-11 08:27:43 EDT (Sat, 11 May 2013)
@@ -30,7 +30,7 @@
#if defined(TEST_WITH_SVG)
# include <boost/geometry/multi/algorithms/envelope.hpp>
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
#endif