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

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

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-28 17:48:14 -08:00
commit 2ee6c9aca1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/pool.hpp
View file

@ -195,6 +195,7 @@ public:
{
initialSize_ = size;
unsigned total_size = usedPool_.size() + unusedPool_.size();
// ensure we don't have ghost obj's in the pool.
if (total_size < initialSize_)
{
unsigned grow_size = initialSize_ - total_size ;

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

@ -122,7 +122,7 @@ public:
if (itr != pools_.end())
{
itr->second->set_max_size(initialSize);
itr->second->set_initial_size(initialSize);
itr->second->set_max_size(maxSize);
}
else