|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r61535 - in sandbox/geometry: boost/geometry/extensions/algorithms/buffer libs/geometry/test/extensions/algorithms/buffer
From: barend.gehrels_at_[hidden]
Date: 2010-04-24 10:20:49
Author: barendgehrels
Date: 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
New Revision: 61535
URL: http://svn.boost.org/trac/boost/changeset/61535
Log:
Moved buffer to extensions (includes)
Text files modified:
sandbox/geometry/boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp | 5 +++--
sandbox/geometry/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp | 2 +-
sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/linestring_buffer.vcproj | 8 ++++----
sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/polygon_buffer.vcproj | 8 ++++----
sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp | 20 +++++++++++---------
5 files changed, 23 insertions(+), 20 deletions(-)
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
@@ -17,8 +17,9 @@
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/strategies/buffer_side.hpp>
-#include <boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp>
-#include <boost/geometry/algorithms/detail/buffer/intersecting_inserter.hpp>
+
+#include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/intersecting_inserter.hpp>
Modified: sandbox/geometry/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp (original)
+++ sandbox/geometry/boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
@@ -17,7 +17,7 @@
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/strategies/buffer_side.hpp>
-#include <boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp>
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/linestring_buffer.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/linestring_buffer.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/linestring_buffer.vcproj 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\linestring_buffer"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../../../..;../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;TEST_WITH_SVG"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\linestring_buffer"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../../../..;../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TEST_WITH_SVG"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/polygon_buffer.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/polygon_buffer.vcproj (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/polygon_buffer.vcproj 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\polygon_buffer"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../../../..;../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;TEST_WITH_SVG"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\polygon_buffer"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../../..;../.."
+ AdditionalIncludeDirectories=".;../../../../../..;../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TEST_WITH_SVG"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp (original)
+++ sandbox/geometry/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp 2010-04-24 10:20:48 EDT (Sat, 24 Apr 2010)
@@ -39,7 +39,6 @@
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
#include <boost/geometry/algorithms/detail/overlay/dissolver.hpp>
-#include <boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp>
#include <boost/geometry/geometries/geometries.hpp>
@@ -47,13 +46,16 @@
#include <boost/geometry/algorithms/disjoint.hpp>
#include <boost/geometry/algorithms/dissolve.hpp>
-#include <boost/geometry/algorithms/buffer.hpp>
-#include <boost/geometry/algorithms/detail/buffer/linestring_buffer.hpp>
-#include <boost/geometry/algorithms/detail/buffer/polygon_buffer.hpp>
-#include <boost/geometry/algorithms/detail/buffer/unioning_buffer.hpp>
-#include <boost/geometry/algorithms/detail/buffer/segmenting_buffer.hpp>
#include <boost/geometry/algorithms/detail/overlay/split_rings.hpp>
+#include <boost/geometry/algorithms/buffer.hpp>
+
+#include <boost/geometry/extensions/algorithms/buffer/remove_within_distance.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/linestring_buffer.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/polygon_buffer.hpp>
+//#include <boost/geometry/extensions/algorithms/buffer/unioning_buffer.hpp>
+#include <boost/geometry/extensions/algorithms/buffer/segmenting_buffer.hpp>
+
#include <boost/geometry/strategies/buffer.hpp>
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
@@ -221,7 +223,7 @@
#if defined(BOOST_GEOMETRY_TEST_BUFFER_POLYGON)
-
+/*
bg::detail::buffer::unioning_buffer(geometry, sections_buffered_unioned,
distance(distance_left, distance_left / 2.0)
#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
@@ -230,7 +232,7 @@
, join_strategy()
#endif
);
-
+*/
Geometry buffered_step1;
bg::detail::buffer::polygon_buffer
@@ -370,7 +372,7 @@
//std::cout << caseid << std::endl;
if (join == 'm')
{
- return;
+ //return;
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk