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

Revert "avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072"

Browse source 
This reverts commit 150c9f819a.
This commit is contained in:
Dane Springmeyer 2012-03-24 08:01:13 -07:00
parent 19f43c9d2f
commit 0be7d66549
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/proj_transform.cpp
View file

@ -101,8 +101,7 @@ bool proj_transform::forward (double * x, double * y , double * z, int point_cou
}
do {
// https://github.com/mapnik/mapnik/issues/1072
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(projection::mutex_);
#endif
if (pj_transform( source_.proj_, dest_.proj_, point_count,
@ -153,8 +152,7 @@ bool proj_transform::backward (double * x, double * y , double * z, int point_co
}
do {
// https://github.com/mapnik/mapnik/issues/1072
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(projection::mutex_);
#endif

10
src/projection.cpp
View file

@ -34,7 +34,7 @@
namespace mapnik {
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
boost::mutex projection::mutex_;
#endif
@ -84,7 +84,7 @@ std::string const& projection::params() const
void projection::forward(double & x, double &y ) const
{
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(mutex_);
#endif
projUV p;
@ -102,7 +102,7 @@ void projection::forward(double & x, double &y ) const
void projection::inverse(double & x,double & y) const
{
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(mutex_);
#endif
if (is_geographic_)
@ -120,7 +120,7 @@ void projection::inverse(double & x,double & y) const
projection::~projection()
{
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(mutex_);
#endif
if (proj_) pj_free(proj_);
@ -131,7 +131,7 @@ projection::~projection()
void projection::init()
{
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 470
#if defined(MAPNIK_THREADSAFE) && PJ_VERSION < 480
mutex::scoped_lock lock(mutex_);
#endif
#if PJ_VERSION >= 480