← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/mapnik/shield_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/shield_symbolizer.hpp
39
39
    shield_symbolizer(std::string const& name,
40
40
                      std::string const& face_name,
41
41
                      unsigned size,
42
 
                      Color const& fill, 
43
 
                      std::string const& file,
44
 
                      std::string const& type,
45
 
                      unsigned width,unsigned height);
46
 
    
 
42
                      color const& fill, 
 
43
                      std::string const& file,
 
44
                      std::string const& type,
 
45
                      unsigned width,unsigned height);
 
46
    shield_symbolizer(std::string const& name,
 
47
                      unsigned size,
 
48
                      color const& fill, 
 
49
                      std::string const& file,
 
50
                      std::string const& type,
 
51
                      unsigned width,unsigned height);
47
52
  };
48
53
}
49
54