From 4091f526d564007866e0041d604d2f675f430103 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 7 Jan 2008 06:32:15 +0000 Subject: [PATCH] - fixed conflict - removed instance() call: the fontengine is not a singleton any more --- demo/c++/rundemo.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp index ee4f4f796..1d1e8052e 100644 --- a/demo/c++/rundemo.cpp +++ b/demo/c++/rundemo.cpp @@ -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"));