sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sqlite plugin: use mapnik::geometry_container alias

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-24 12:08:16 -07:00
parent f8ccbf3ded
commit 11b0816d2a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/sqlite/sqlite_datasource.cpp
View file

@ -444,7 +444,7 @@ boost::optional<mapnik::datasource::geometry_t> sqlite_datasource::get_geometry_
const char* data = (const char*) rs->column_blob(0, size); const char* data = (const char*) rs->column_blob(0, size);
if (data) if (data)
{ {
boost::ptr_vector<mapnik::geometry_type> paths; mapnik::geometry_container paths;
if (mapnik::geometry_utils::from_wkb(paths, data, size, format_)) if (mapnik::geometry_utils::from_wkb(paths, data, size, format_))
{ {
mapnik::util::to_ds_type(paths,result); mapnik::util::to_ds_type(paths,result);

6
plugins/input/sqlite/sqlite_utils.hpp
View file

@ -191,7 +191,7 @@ public:
const char* data = static_cast<const char*>(rs->column_blob(0, size)); const char* data = static_cast<const char*>(rs->column_blob(0, size));
if (data) if (data)
{ {
boost::ptr_vector<mapnik::geometry_type> paths; mapnik::geometry_container paths;
if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto)) if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto))
{ {
for (unsigned i=0; i<paths.size(); ++i) for (unsigned i=0; i<paths.size(); ++i)
@ -278,7 +278,7 @@ public:
const char* data = (const char*) rs->column_blob(0, size); const char* data = (const char*) rs->column_blob(0, size);
if (data) if (data)
{ {
boost::ptr_vector<mapnik::geometry_type> paths; mapnik::geometry_container paths;
mapnik::box2d<double> bbox; mapnik::box2d<double> bbox;
if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto)) if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto))
{ {
@ -365,7 +365,7 @@ public:
const char* data = static_cast<const char*>(rs->column_blob(0, size)); const char* data = static_cast<const char*>(rs->column_blob(0, size));
if (data) if (data)
{ {
boost::ptr_vector<mapnik::geometry_type> paths; mapnik::geometry_container paths;
if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto)) if (mapnik::geometry_utils::from_wkb(paths, data, size, mapnik::wkbAuto))
{ {
for (unsigned i=0; i<paths.size(); ++i) for (unsigned i=0; i<paths.size(); ++i)