← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/mapnik/polygon_symbolizer.hpp

  • 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:
include/mapnik/polygon_symbolizer.hpp
32
32
    struct MAPNIK_DECL polygon_symbolizer
33
33
    {
34
34
        explicit polygon_symbolizer() 
35
 
            : fill_(Color(128,128,128)),
 
35
            : fill_(color(128,128,128)),
36
36
              opacity_(1.0) {}
37
37
 
38
 
        polygon_symbolizer(Color const& fill)
 
38
        polygon_symbolizer(color const& fill)
39
39
            : fill_(fill),
40
40
              opacity_(1.0) {}
41
41
        
42
 
        Color const& get_fill() const
 
42
        color const& get_fill() const
43
43
        {
44
44
            return fill_;
45
45
        }
46
 
        void set_fill(Color const& fill)
 
46
        void set_fill(color const& fill)
47
47
        {
48
48
            fill_ = fill;
49
49
        }
56
56
            return opacity_;
57
57
        }
58
58
    private:
59
 
        Color fill_;
 
59
        color fill_;
60
60
        float opacity_;
61
61
    }; 
62
62
   
63
63
   struct MAPNIK_DECL building_symbolizer
64
64
    {
65
65
       explicit building_symbolizer() 
66
 
          : fill_(Color(128,128,128)),
 
66
          : fill_(color(128,128,128)),
67
67
          height_(0),
68
68
          opacity_(1.0)
69
69
          {}
70
70
 
71
 
       building_symbolizer(Color const& fill,double height)
 
71
       building_symbolizer(color const& fill,double height)
72
72
          : fill_(fill),
73
73
          height_(height),
74
74
          opacity_(1.0) {}
75
75
       
76
 
        Color const& get_fill() const
 
76
        color const& get_fill() const
77
77
        {
78
78
            return fill_;
79
79
        }
80
 
        void set_fill(Color const& fill)
 
80
        void set_fill(color const& fill)
81
81
        {
82
82
            fill_ = fill;
83
83
        }
98
98
            return opacity_;
99
99
        }
100
100
    private:
101
 
        Color fill_;
 
101
        color fill_;
102
102
        double height_;
103
103
        float opacity_;
104
104
    };