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

char is to short for unicode chars. Replace it with unsigned int. Should fix #746.

Browse source
This commit is contained in:
Hermann Kraus 2011-04-27 20:28:53 +00:00
parent dffe53036e
commit 6650f999b9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/font_engine_freetype.hpp
View file

@ -190,7 +190,7 @@ public:
} }
private: private:
std::vector<face_ptr> faces_; std::vector<face_ptr> faces_;
std::map<char, dimension_t> dimension_cache_; std::map<unsigned, dimension_t> dimension_cache_;
}; };
// FT_Stroker wrapper // FT_Stroker wrapper

2
src/font_engine_freetype.cpp
View file

@ -202,7 +202,7 @@ font_face_set::dimension_t font_face_set::character_dimensions(const unsigned c)
//std::clog << "glyph: " << glyph_index << " x: " << tempx << " y: " << tempy << std::endl; //std::clog << "glyph: " << glyph_index << " x: " << tempx << " y: " << tempy << std::endl;
dimension_t dim(tempx, glyph_bbox.yMax, glyph_bbox.yMin); dimension_t dim(tempx, glyph_bbox.yMax, glyph_bbox.yMin);
//dimension_cache_[c] = dim; would need an default constructor for dimension_t //dimension_cache_[c] = dim; would need an default constructor for dimension_t
dimension_cache_.insert(std::pair<char, dimension_t>(c, dim)); dimension_cache_.insert(std::pair<unsigned, dimension_t>(c, dim));
return dim; return dim;
} }