← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mapnik/trusty

« back to all changes in this revision

Viewing changes to src/proj_transform.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-05-20 15:39:58 UTC
  • mfrom: (3.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090520153958-cf6z1ql9zva4y4dq
Tags: 0.6.0-1ubuntu1
https://launchpad.net/bugs/378819
* Merge from debian unstable (LP: #378819), remaining changes:
  - debian/control:
    + Change bdeps from python2.5-dev to python-all-dev (>= 2.5)
    + Change XS-Python-Version from 2.5 to >= 2.5
  - debian/rules:
    + Various changes to enable python2.5 and python2.6 builds
* debian/patches/libtool2_2.diff Dropped. Included upsteam.
* Removed quilt support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/proj_transform.cpp
38
38
#ifdef MAPNIK_THREADSAFE
39
39
        mutex::scoped_lock lock(projection::mutex_);
40
40
#endif
41
 
        is_source_latlong_ = pj_is_latlong(source_.proj_);
42
 
        is_dest_latlong_ = pj_is_latlong(dest_.proj_);
 
41
        is_source_latlong_ = pj_is_latlong(source_.proj_) ? true : false;
 
42
        is_dest_latlong_ = pj_is_latlong(dest_.proj_) ? true : false ;
 
43
        is_source_equal_dest = (source_ == dest_);
43
44
    }
44
45
    
45
46
    bool proj_transform::forward (double & x, double & y , double & z) const
47
48
#ifdef MAPNIK_THREADSAFE
48
49
        mutex::scoped_lock lock(projection::mutex_);
49
50
#endif
 
51
        if (is_source_equal_dest)
 
52
            return true;
 
53
 
50
54
        if (is_source_latlong_)
51
55
        {
52
56
            x *= DEG_TO_RAD;
73
77
#ifdef MAPNIK_THREADSAFE
74
78
        mutex::scoped_lock lock(projection::mutex_);
75
79
#endif
 
80
        if (is_source_equal_dest)
 
81
            return true;
76
82
      
77
83
        if (is_dest_latlong_)
78
84
        {