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

+ applied mapnik-skip-projection-if-equal.patch (jonb)

Browse source
This commit is contained in:
Artem Pavlenko 2008-12-07 16:23:57 +00:00
parent a3e81dd344
commit 65ea5bca98
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/proj_transform.hpp
View file

@ -46,6 +46,7 @@ namespace mapnik {
projection const& dest_;
bool is_source_latlong_;
bool is_dest_latlong_;
bool is_source_equal_dest;
};
}

6
src/proj_transform.cpp
View file

@ -40,6 +40,7 @@ namespace mapnik {
#endif
is_source_latlong_ = pj_is_latlong(source_.proj_);
is_dest_latlong_ = pj_is_latlong(dest_.proj_);
is_source_equal_dest = (source_ == dest_);
}
bool proj_transform::forward (double & x, double & y , double & z) const
@ -47,6 +48,9 @@ namespace mapnik {
#ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(projection::mutex_);
#endif
if (is_source_equal_dest)
return true;
if (is_source_latlong_)
{
x *= DEG_TO_RAD;
@ -73,6 +77,8 @@ namespace mapnik {
#ifdef MAPNIK_THREADSAFE
mutex::scoped_lock lock(projection::mutex_);
#endif
if (is_source_equal_dest)
return true;
if (is_dest_latlong_)
{