Subject: [Boost-commit] svn:boost r76915 - in trunk/libs/geometry/example: . with_external_libs with_external_libs/contrib/gd-2.0.35 with_external_libs/contrib/soci-3.0.0 with_external_libs/contrib/soci-3.1.0
From: barend.gehrels_at_[hidden]
Date: 2012-02-06 14:46:40
Author: barendgehrels
Date: 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
New Revision: 76915
URL: http://svn.boost.org/trac/boost/changeset/76915
Log:
Updated various examples, fixing old paths, etc
Added:
trunk/libs/geometry/example/with_external_libs/contrib/soci-3.1.0/
- copied from r76903, /trunk/libs/geometry/example/with_external_libs/contrib/soci-3.0.0/
Removed:
trunk/libs/geometry/example/with_external_libs/contrib/soci-3.0.0/
Text files modified:
trunk/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 4 ++++
trunk/libs/geometry/example/with_external_libs/contrib/gd-2.0.35/boost_geometry_readme.txt | 6 ++++--
trunk/libs/geometry/example/with_external_libs/soci.vsprops | 4 ++--
trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp | 8 +++-----
trunk/libs/geometry/example/with_external_libs/x02_gd_example.vcproj | 4 ++++
trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp | 1 -
trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj | 20 ++++++++++++++++++++
trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj | 20 ++++++++++++++++++++
trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj | 20 ++++++++++++++++++++
trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp | 9 +++++----
trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj | 20 ++++++++++++++++++++
trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 6 +++---
trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp | 2 +-
trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp | 6 ++++--
14 files changed, 110 insertions(+), 20 deletions(-)
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 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -10,6 +10,10 @@
//
// Linestring Polygon Overlay Example
+// NOTE: this example is obsolete. Boost.Geometry can now
+// overlay linestrings/polygons.
+// This sample will be removed in next version.
+
#include <fstream>
#include <iostream>
#include <string>
Modified: trunk/libs/geometry/example/with_external_libs/contrib/gd-2.0.35/boost_geometry_readme.txt
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/contrib/gd-2.0.35/boost_geometry_readme.txt (original)
+++ trunk/libs/geometry/example/with_external_libs/contrib/gd-2.0.35/boost_geometry_readme.txt 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -8,11 +8,13 @@
Download gd from
-http://www.libgd.og/
+http://www.libgd.org/
+(currently from: https://bitbucket.org/pierrejoye/gd-libgd/downloads)
+
and extract to this folder.
+(currently: extract from ../src/ into this folder)
Nothing has to be installed.
This is used in x02_gd_example.cpp
-
Modified: trunk/libs/geometry/example/with_external_libs/soci.vsprops
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/soci.vsprops (original)
+++ trunk/libs/geometry/example/with_external_libs/soci.vsprops 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -7,10 +7,10 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SOCI_ROOT)/src/core";"$(SOCI_ROOT)/src/backends/postgresql""
- PreprocessorDefinitions="SOCI_USE_BOOST"
+ PreprocessorDefinitions="SOCI_USE_BOOST;SOCI_LIB_PREFIX=\"libsoci_\";SOCI_LIB_SUFFIX=\".so\""
/>
<UserMacro
Name="SOCI_ROOT"
- Value="contrib/soci-3.0.0"
+ Value="contrib/soci-3.1.0"
/>
</VisualStudioPropertySheet>
Modified: trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -27,14 +27,12 @@
#include <boost/foreach.hpp>
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
-#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
-#include <boost/geometry/io/wkt/wkt.hpp>
-
#include <gd.h>
Modified: trunk/libs/geometry/example/with_external_libs/x02_gd_example.vcproj
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x02_gd_example.vcproj (original)
+++ trunk/libs/geometry/example/with_external_libs/x02_gd_example.vcproj 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -182,6 +182,10 @@
>
</File>
<File
+ RelativePath="$(GD)\gd_color.c"
+ >
+ </File>
+ <File
RelativePath="$(GD)\gd_gd.c"
>
</File>
Modified: trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -36,7 +36,6 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/io/wkt/wkt.hpp>
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
Modified: trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.vcproj 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -210,6 +210,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Modified: trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.vcproj 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -210,6 +210,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Modified: trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.vcproj 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -210,6 +210,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Modified: trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -28,12 +28,13 @@
#include <string>
#include <vector>
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry.hpp>
+
#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
-#include <boost/geometry/io/wkt/wkt.hpp>
int main()
{
@@ -65,7 +66,7 @@
if (!boost::geometry::hex2wkb(*it, std::back_inserter(wkb)))
throw std::runtime_error("hex2wkb translation failed");
- boost::geometry::model::d2::polygon parcel;
+ boost::geometry::model::polygon<boost::geometry::model::d2::point_xy<double> > parcel;
if (!boost::geometry::read_wkb(wkb.begin(), wkb.end(), parcel))
throw std::runtime_error("read_wkb failed");
Modified: trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.vcproj 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -210,6 +210,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\error.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\pgsql\"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Modified: trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -18,13 +18,13 @@
#include <boost/scoped_array.hpp>
#include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/ring.hpp>
-#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/io/wkt/read.hpp>
-#include <boost/geometry/multi/io/wkt/read.hpp>
// wxWidgets, if these headers are NOT found, adapt include path (and lib path)
Modified: trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -20,8 +20,8 @@
#include "shapefil.h"
#include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/io/wkt/iomanip.hpp>
using namespace boost::geometry;
Modified: trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp 2012-02-06 14:46:38 EST (Mon, 06 Feb 2012)
@@ -23,13 +23,15 @@
#include <boost/foreach.hpp>
#include <boost/geometry/geometry.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
+
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/register/ring.hpp>
-#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/io/wkt/wkt.hpp>