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

- fixed conflict

Browse source 
- removed instance() call: the fontengine is not a singleton any more
This commit is contained in:
David 2008-01-07 06:32:15 +00:00
parent bec8f8951f
commit 4091f526d5
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
demo/c++/rundemo.cpp
View file

@ -42,11 +42,7 @@ int main ( int argc , char** argv)
std::cout << " running demo ... \n";
using namespace mapnik;
datasource_cache::instance()->register_datasources(argv[1]);
<<<<<<< .mine
freetype_engine::instance()->register_font("../lib/mapnik/fonts/DejaVuSans.ttf");
=======
freetype_engine::instance()->register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
>>>>>>> .r549
freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
Map m(800,600);
m.set_background(color_factory::from_string("white"));