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

mapnik · Dec 7, 2008 · 65ea5bc · 65ea5bc
1 parent a3e81dd
commit 65ea5bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/include/mapnik/proj_transform.hpp b/include/mapnik/proj_transform.hpp
@@ -46,6 +46,7 @@ namespace mapnik {
         projection const& dest_;
         bool is_source_latlong_;
         bool is_dest_latlong_;
+        bool is_source_equal_dest;
     };
 }
 

diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp
@@ -40,13 +40,17 @@ 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
     {
 #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_)
         {