Merged changes with ifdefs for release branch

[SVN r70920]
This commit is contained in:
Barend Gehrels
2011-04-03 07:55:46 +00:00
parent 0f9eb1c664
commit c5b04559ba
10 changed files with 53 additions and 453 deletions

View File

@@ -19,9 +19,12 @@
#include <boost/geometry/algorithms/centroid.hpp>
#include <boost/geometry/strategies/transform.hpp>
#include <boost/geometry/strategies/transform/matrix_transformers.hpp>
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/write_svg.hpp>
#endif
#include <boost/bind.hpp>
#include <boost/random.hpp>
#include <boost/range.hpp>
@@ -84,8 +87,9 @@ struct svg_output
void put(G const& g, std::string const& label)
{
std::string style_str(style.fill(opacity) + style.stroke(5, opacity));
os << ::boost::geometry::svg(g, style_str) << std::endl;
#if defined(HAVE_SVG)
os << boost::geometry::svg(g, style_str) << std::endl;
#endif
if (!label.empty())
{
typename point_type<G>::type c;
@@ -101,6 +105,7 @@ private:
random_style style;
};
int main()
{
using namespace boost::geometry::strategy::transform;