sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++ style

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-02 15:37:55 -07:00
parent d1f522b201
commit 109b45a0ad
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/group/group_symbolizer_helper.hpp
View file

@ -60,7 +60,7 @@ public:
unsigned width,
unsigned height,
double scale_factor,
view_transform const &t,
view_transform const& t,
DetectorType &detector,
box2d<double> const& query_extent);
@ -89,10 +89,10 @@ private:
/** Check if a point placement fits at given position */
bool check_point_placement(pixel_position const& pos);
/** Checks for collision. */
bool collision(box2d<double> const& box, const value_unicode_string &repeat_key = "") const;
bool collision(box2d<double> const& box, value_unicode_string const& repeat_key = "") const;
double get_spacing(double path_length) const;
DetectorType &detector_;
DetectorType & detector_;
/** Boxes and repeat keys to take into account when finding placement.
* Boxes are relative to starting point of current placement.

10
src/group/group_symbolizer_helper.cpp
View file

@ -38,12 +38,12 @@
namespace mapnik {
group_symbolizer_helper::group_symbolizer_helper(
const group_symbolizer &sym, const feature_impl &feature,
group_symbolizer const& sym, feature_impl const& feature,
attributes const& vars,
const proj_transform &prj_trans,
proj_transform const& prj_trans,
unsigned width, unsigned height, double scale_factor,
const view_transform &t, DetectorType &detector,
const box2d<double> &query_extent)
view_transform const& t, DetectorType & detector,
box2d<double> const& query_extent)
: base_symbolizer_helper(sym, feature, vars, prj_trans, width, height, scale_factor, t, query_extent),
detector_(detector)
{}
@ -154,7 +154,7 @@ bool group_symbolizer_helper::check_point_placement(pixel_position const& pos)
return true;
}
bool group_symbolizer_helper::collision(const box2d<double> &box, const value_unicode_string &repeat_key) const
bool group_symbolizer_helper::collision(box2d<double> const& box, value_unicode_string const& repeat_key) const
{
if (!detector_.extent().intersects(box)
||