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

backport r1893 and r1902 - fixing compile for enums

Browse source
This commit is contained in:
Dane Springmeyer 2010-07-14 01:55:54 +00:00
parent d785b9c5b4
commit c599c52a61
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/map.cpp
View file

@ -45,7 +45,7 @@ namespace mapnik
""
};
IMPLEMENT_ENUM( mapnik::aspect_fix_mode_e, aspect_fix_mode_strings );
IMPLEMENT_ENUM( aspect_fix_mode_e, aspect_fix_mode_strings );
Map::Map()
: width_(400),

8
src/stroke.cpp
View file

@ -41,14 +41,10 @@ namespace mapnik
""
};
}
IMPLEMENT_ENUM( mapnik::line_cap_e, line_cap_strings );
IMPLEMENT_ENUM( mapnik::line_join_e, line_join_strings );
IMPLEMENT_ENUM( line_cap_e, line_cap_strings );
IMPLEMENT_ENUM( line_join_e, line_join_strings );
namespace mapnik
{
stroke::stroke()
: c_(0,0,0),
width_(1.0),

16
src/text_symbolizer.cpp
View file

@ -27,6 +27,9 @@
// boost
#include <boost/scoped_ptr.hpp>
namespace mapnik
{
static const char * label_placement_strings[] = {
"point",
"line",
@ -35,7 +38,7 @@ static const char * label_placement_strings[] = {
};
IMPLEMENT_ENUM( mapnik::label_placement_e, label_placement_strings );
IMPLEMENT_ENUM( label_placement_e, label_placement_strings );
static const char * vertical_alignment_strings[] = {
"top",
@ -45,7 +48,7 @@ static const char * vertical_alignment_strings[] = {
};
IMPLEMENT_ENUM( mapnik::vertical_alignment_e, vertical_alignment_strings );
IMPLEMENT_ENUM( vertical_alignment_e, vertical_alignment_strings );
static const char * horizontal_alignment_strings[] = {
"left",
@ -55,7 +58,7 @@ static const char * horizontal_alignment_strings[] = {
};
IMPLEMENT_ENUM( mapnik::horizontal_alignment_e, horizontal_alignment_strings );
IMPLEMENT_ENUM( horizontal_alignment_e, horizontal_alignment_strings );
static const char * justify_alignment_strings[] = {
"left",
@ -65,7 +68,7 @@ static const char * justify_alignment_strings[] = {
};
IMPLEMENT_ENUM( mapnik::justify_alignment_e, justify_alignment_strings );
IMPLEMENT_ENUM( justify_alignment_e, justify_alignment_strings );
static const char * text_convert_strings[] = {
"none",
@ -75,11 +78,10 @@ static const char * text_convert_strings[] = {
};
IMPLEMENT_ENUM( mapnik::text_convert_e, text_convert_strings );
IMPLEMENT_ENUM( text_convert_e, text_convert_strings );
namespace mapnik
{
text_symbolizer::text_symbolizer(std::string const& name, std::string const& face_name, unsigned size, color const& fill)
: name_(name),
face_name_(face_name),