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

rename the image transform for clarity

Browse source
This commit is contained in:
Dane Springmeyer 2012-05-09 18:15:34 -07:00
parent 953db9b209
commit ab73f13525
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/symbolizer_helpers.hpp
View file

@ -161,7 +161,7 @@ protected:
shield_symbolizer const& sym_;
box2d<double> marker_ext_;
boost::optional<marker_ptr> marker_;
agg::trans_affine transform_;
agg::trans_affine image_transform_;
double marker_w_;
double marker_h_;
double marker_x_;

12
src/symbolizer_helpers.cpp
View file

@ -351,7 +351,7 @@ void shield_symbolizer_helper<FaceManagerT, DetectorT>::init_marker()
{
std::string filename = path_processor_type::evaluate(*sym_.get_filename(), this->feature_);
boost::array<double,6> const& m = sym_.get_image_transform();
transform_.load_from(&m[0]);
image_transform_.load_from(&m[0]);
marker_.reset();
if (!filename.empty())
{
@ -373,10 +373,10 @@ void shield_symbolizer_helper<FaceManagerT, DetectorT>::init_marker()
double py2 = py0;
double px3 = px0;
double py3 = py1;
transform_.transform(&px0,&py0);
transform_.transform(&px1,&py1);
transform_.transform(&px2,&py2);
transform_.transform(&px3,&py3);
image_transform_.transform(&px0,&py0);
image_transform_.transform(&px1,&py1);
image_transform_.transform(&px2,&py2);
image_transform_.transform(&px3,&py3);
marker_ext_.init(px0, py0, px1, py1);
marker_ext_.expand_to_include(px2, py2);
marker_ext_.expand_to_include(px3, py3);
@ -412,7 +412,7 @@ marker& shield_symbolizer_helper<FaceManagerT, DetectorT>::get_marker() const
template <typename FaceManagerT, typename DetectorT>
agg::trans_affine const& shield_symbolizer_helper<FaceManagerT, DetectorT>::get_image_transform() const
{
return transform_;
return image_transform_;
}
template class text_symbolizer_helper<face_manager<freetype_engine>, label_collision_detector4>;