diff --git a/SConstruct b/SConstruct index b860bb58e..e93a148d4 100644 --- a/SConstruct +++ b/SConstruct @@ -1411,6 +1411,7 @@ if not preconfigured: pthread = '-pthread' # Common debugging flags. + # http://lists.fedoraproject.org/pipermail/devel/2010-November/144952.html debug_flags = '-g -fno-omit-frame-pointer -DDEBUG -DMAPNIK_DEBUG' ndebug_flags = '-DNDEBUG' diff --git a/src/text_placements/registry.cpp b/src/text_placements/registry.cpp index 30668b78f..621c161b3 100644 --- a/src/text_placements/registry.cpp +++ b/src/text_placements/registry.cpp @@ -23,6 +23,7 @@ #include #include #include +#include namespace mapnik { @@ -33,6 +34,7 @@ registry::registry() { register_name("simple", &text_placements_simple::from_xml); register_name("list", &text_placements_list::from_xml); + register_name("dummy", &text_placements_list::from_xml); } void registry::register_name(std::string name, from_xml_function_ptr ptr, bool overwrite) diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 169dbbe81..67dc0d468 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -60,6 +60,6 @@ for f in files: m = render(f[0], width[0], width[1]) else: m = render(f[0], width) - mapnik.save_map(m, "%s-out.xml" % f[0]) + mapnik.save_map(m, os.path.join(dirname,"%s-out.xml" % f[0])) summary()