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

Merge commit 'c3fab9e66502c135e4566005b63a63e04842ddf0' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/char_info.hpp
This commit is contained in:
Hermann Kraus 2013-03-16 17:55:20 +01:00
commit d7ebac77a3
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/char_info.hpp
View file

@ -20,15 +20,16 @@
*
*****************************************************************************/
#ifndef CHAR_INFO_HPP
#define CHAR_INFO_HPP
#ifndef MAPNIK_CHAR_INFO_HPP
#define MAPNIK_CHAR_INFO_HPP
#include <boost/shared_ptr.hpp>
#include <mapnik/text/char_properties_ptr.hpp>
namespace mapnik {
class char_info {
class char_info
{
public:
char_info(unsigned c_, double width_, double ymax_, double ymin_, double line_height_)
: c(c_),
@ -36,7 +37,7 @@ public:
line_height(line_height_),
ymin(ymin_),
ymax(ymax_),
avg_height(ymax_-ymin_),
avg_height(ymax - ymin),
format()
{
}
@ -52,6 +53,8 @@ public:
{
}
double height() const { return ymax-ymin; }
unsigned c;
double width;
double line_height;
@ -59,7 +62,8 @@ public:
double ymax;
double avg_height;
char_properties_ptr format;
double height() const { return ymax-ymin; }
};
}
#endif
#endif //MAPNIK_CHAR_INFO_HPP