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

Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor

Browse source
This commit is contained in:
Dane Springmeyer 2012-01-12 18:48:53 -08:00
commit 2c4a86d4cb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/postgis/postgis_datasource.cpp
View file

@ -449,7 +449,7 @@ std::string postgis_datasource::populate_tokens(const std::string& sql) const
return populated_sql;
}
std::string postgis_datasource::populate_tokens(const std::string& sql, double const& scale_denom, box2d<double> const& env) const
std::string postgis_datasource::populate_tokens(const std::string& sql, double scale_denom, box2d<double> const& env) const
{
std::string populated_sql = sql;
std::string box = sql_bbox(env);

2
plugins/input/postgis/postgis_datasource.hpp
View file

@ -89,7 +89,7 @@ public:
void bind() const;
private:
std::string sql_bbox(box2d<double> const& env) const;
std::string populate_tokens(const std::string& sql, double const& scale_denom, box2d<double> const& env) const;
std::string populate_tokens(const std::string& sql, double scale_denom, box2d<double> const& env) const;
std::string populate_tokens(const std::string& sql) const;
static std::string unquote(const std::string& sql);
boost::shared_ptr<IResultSet> get_resultset(boost::shared_ptr<Connection> const &conn, const std::string &sql) const;