Changeset 777

Timestamp:

12/07/08 11:23:57 (20 months ago)

Author:

artem

Message:

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

Location:

trunk

Files:

• include/mapnik/proj_transform.hpp (modified) (1 diff)
• src/proj_transform.cpp (modified) (3 diffs)

trunk/include/mapnik/proj_transform.hpp

@@ -47 +47 @@
         bool is_source_latlong_;
         bool is_dest_latlong_;
+        bool is_source_equal_dest;
     };
 }

trunk/src/proj_transform.cpp

@@ -41 +41 @@
         is_source_latlong_ = pj_is_latlong(source_.proj_);
         is_dest_latlong_ = pj_is_latlong(dest_.proj_);
+        is_source_equal_dest = (source_ == dest_);
     }
     
@@ -48 +49 @@
         mutex::scoped_lock lock(projection::mutex_);
 #endif
+        if (is_source_equal_dest)
+            return true;
+
         if (is_source_latlong_)
         {
@@ -74 +78 @@
         mutex::scoped_lock lock(projection::mutex_);
 #endif
+        if (is_source_equal_dest)
+            return true;
       
         if (is_dest_latlong_)