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

patch from TomH adds a global mutex to protect all access to the

Browse source 
proj4 library and ensure that only one thread can be inside a call to
the library at a time.
This commit is contained in:
Artem Pavlenko 2008-02-04 11:54:07 +00:00
parent eaf198f79c
commit f4949ffca5
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/projection.hpp
View file

@ -28,6 +28,7 @@
// mapnik
#include <mapnik/envelope.hpp>
// boost
#include <boost/thread/mutex.hpp>
#include <boost/utility.hpp>
// stl
#include <string>
@ -66,6 +67,7 @@ namespace mapnik {
private:
std::string params_;
void * proj_;
static boost::mutex mutex_;
};
}

10
src/proj_transform.cpp
View file

@ -22,8 +22,10 @@
//$Id$
// mapnik
#include <mapnik/proj_transform.hpp>
#include <mapnik/utils.hpp>
// proj4
#include <proj_api.h>
namespace mapnik {
@ -33,12 +35,16 @@ namespace mapnik {
: source_(source),
dest_(dest)
{
mutex::scoped_lock lock(projection::mutex_);
is_source_latlong_ = pj_is_latlong(source_.proj_);
is_dest_latlong_ = pj_is_latlong(dest_.proj_);
}
bool proj_transform::forward (double & x, double & y , double & z) const
{
mutex::scoped_lock lock(projection::mutex_);
if (is_source_latlong_)
{
x *= DEG_TO_RAD;
@ -62,6 +68,8 @@ namespace mapnik {
bool proj_transform::backward (double & x, double & y , double & z) const
{
mutex::scoped_lock lock(projection::mutex_);
if (is_dest_latlong_)
{
x *= DEG_TO_RAD;

8
src/projection.cpp
View file

@ -24,10 +24,13 @@
// mapnik
#include <mapnik/projection.hpp>
#include <mapnik/utils.hpp>
// proj4
#include <proj_api.h>
namespace mapnik {
boost::mutex projection::mutex_;
projection::projection(std::string params)
: params_(params)
{
@ -54,6 +57,7 @@ namespace mapnik {
bool projection::is_geographic() const
{
mutex::scoped_lock lock(mutex_);
return pj_is_latlong(proj_);
}
@ -64,6 +68,7 @@ namespace mapnik {
void projection::forward(double & x, double &y ) const
{
mutex::scoped_lock lock(mutex_);
projUV p;
p.u = x * DEG_TO_RAD;
p.v = y * DEG_TO_RAD;
@ -74,6 +79,7 @@ namespace mapnik {
void projection::inverse(double & x,double & y) const
{
mutex::scoped_lock lock(mutex_);
projUV p;
p.u = x;
p.v = y;
@ -84,11 +90,13 @@ namespace mapnik {
projection::~projection()
{
mutex::scoped_lock lock(mutex_);
if (proj_) pj_free(proj_);
}
void projection::init()
{
mutex::scoped_lock lock(mutex_);
proj_=pj_init_plus(params_.c_str());
if (!proj_) throw proj_init_error(params_);
}