← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/stroke.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/stroke.cpp
57
57
        line_join_(MITER_JOIN),
58
58
        dash_() {}
59
59
 
60
 
    stroke::stroke(Color const& c, float width)
 
60
    stroke::stroke(color const& c, float width)
61
61
        : c_(c),
62
62
        width_(width),
63
63
        opacity_(1.0),
80
80
        return *this;
81
81
    }
82
82
 
83
 
    void stroke::set_color(const Color& c) 
 
83
    void stroke::set_color(const color& c) 
84
84
    {
85
85
        c_=c;
86
86
    }
87
87
 
88
 
    Color const& stroke::get_color() const
 
88
    color const& stroke::get_color() const
89
89
    {
90
90
        return c_;
91
91
    }