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

fix -Wshadow warning

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-03 18:03:08 -08:00
parent 626e0056fd
commit 6434466ee3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/font_engine_freetype.hpp
View file

@ -369,7 +369,7 @@ struct text_renderer : private mapnik::noncopyable
typedef T pixmap_type;
text_renderer (pixmap_type & pixmap,
face_manager<freetype_engine> &font_manager_,
face_manager<freetype_engine> & font_manager,
stroker & s,
composite_mode_e comp_op = src_over,
double scale_factor=1.0);
@ -419,7 +419,7 @@ private:
}
pixmap_type & pixmap_;
face_manager<freetype_engine> &font_manager_;
face_manager<freetype_engine> & font_manager_;
stroker & stroker_;
glyphs_t glyphs_;
composite_mode_e comp_op_;

4
src/font_engine_freetype.cpp
View file

@ -323,12 +323,12 @@ void font_face_set::get_string_info(string_info & info, UnicodeString const& ust
template <typename T>
text_renderer<T>::text_renderer (pixmap_type & pixmap,
face_manager<freetype_engine> &font_manager_,
face_manager<freetype_engine> & font_manager,
stroker & s,
composite_mode_e comp_op,
double scale_factor)
: pixmap_(pixmap),
font_manager_(font_manager_),
font_manager_(font_manager),
stroker_(s),
comp_op_(comp_op),
scale_factor_(scale_factor) {}