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

+ pass pixel_position by const ref

Browse source 
+ use BOOST_FOREACH for brevety
This commit is contained in:
artemp 2013-02-26 11:45:24 -05:00
parent c3fab9e665
commit 1ea60c472c
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/font_engine_freetype.hpp
View file

@ -312,9 +312,9 @@ public:
{
std::vector<std::string> const& names = fset.get_face_names();
face_set_ptr face_set = boost::make_shared<font_face_set>();
for (std::vector<std::string>::const_iterator name = names.begin(); name != names.end(); ++name)
BOOST_FOREACH( std::string const& name, names)
{
face_ptr face = get_face(*name);
face_ptr face = get_face(name);
if (face)
{
face_set->add(face);
@ -323,7 +323,7 @@ public:
else
{
MAPNIK_LOG_DEBUG(font_engine_freetype)
<< "Failed to find face '" << *name
<< "Failed to find face '" << name
<< "' in font set '" << fset.get_name() << "'\n";
}
#endif
@ -375,8 +375,8 @@ struct text_renderer : private mapnik::noncopyable
composite_mode_e comp_op = src_over,
double scale_factor=1.0);
box2d<double> prepare_glyphs(text_path const& path);
void render(pixel_position pos);
void render_id(int feature_id, pixel_position pos, double min_radius=1.0);
void render(pixel_position const& pos);
void render_id(int feature_id, pixel_position const& pos, double min_radius=1.0);
private:

13
src/font_engine_freetype.cpp
View file

@ -236,7 +236,8 @@ char_info font_face_set::character_dimensions(unsigned int c)
//Check if char is already in cache
std::map<unsigned, char_info>::const_iterator itr;
itr = dimension_cache_.find(c);
if (itr != dimension_cache_.end()) {
if (itr != dimension_cache_.end())
{
return itr->second;
}
@ -351,7 +352,7 @@ box2d<double> text_renderer<T>::prepare_glyphs(text_path const& path)
bbox.xMin = bbox.yMin = 32000; // Initialize these so we can tell if we
bbox.xMax = bbox.yMax = -32000; // properly grew the bbox later
for (int i = 0; i < path.num_nodes(); i++)
for (int i = 0; i < path.num_nodes(); ++i)
{
char_info_ptr c;
double x, y, angle;
@ -436,7 +437,7 @@ void composite_bitmap(T & pixmap, FT_Bitmap *bitmap, unsigned rgba, int x, int y
}
template <typename T>
void text_renderer<T>::render(pixel_position pos)
void text_renderer<T>::render(pixel_position const& pos)
{
FT_Error error;
FT_Vector start;
@ -501,7 +502,7 @@ void text_renderer<T>::render(pixel_position pos)
template <typename T>
void text_renderer<T>::render_id(int feature_id, pixel_position pos, double min_radius)
void text_renderer<T>::render_id(int feature_id, pixel_position const& pos, double min_radius)
{
FT_Error error;
FT_Vector start;
@ -540,11 +541,11 @@ void text_renderer<T>::render_id(int feature_id, pixel_position pos, double min_
boost::mutex freetype_engine::mutex_;
#endif
std::map<std::string,std::pair<int,std::string> > freetype_engine::name2file_;
template void text_renderer<image_32>::render(pixel_position);
template void text_renderer<image_32>::render(pixel_position const&);
template text_renderer<image_32>::text_renderer(image_32&, face_manager<freetype_engine>&, stroker&, composite_mode_e, double);
template box2d<double>text_renderer<image_32>::prepare_glyphs(text_path const&);
template void text_renderer<grid>::render_id(int, pixel_position, double );
template void text_renderer<grid>::render_id(int, pixel_position const& , double );
template text_renderer<grid>::text_renderer(grid&, face_manager<freetype_engine>&, stroker&, composite_mode_e, double);
template box2d<double>text_renderer<grid>::prepare_glyphs(text_path const& );
}