Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove raster mode serialization and a few std::clog references in sa…

…ve_map and load_map
  • Loading branch information...
commit 0de815ba03190d97c8e23b0a7e9052e20ec7a716 1 parent 6915d3f
@springmeyer springmeyer authored
Showing with 6 additions and 4 deletions.
  1. +1 −1  src/load_map.cpp
  2. +5 −3 src/save_map.cpp
View
2  src/load_map.cpp
@@ -851,7 +851,7 @@ void map_parser::parse_symbolizer_base(symbolizer_base &sym, xml_node const &pt)
if (strict_)
throw config_error(ss.str()); // value_error here?
else
- std::clog << "### WARNING: " << ss.str() << endl;
+ MAPNIK_LOG_WARN(load_map) << "### WARNING: " << ss;
}
sym.set_transform(tl);
}
View
8 src/save_map.cpp
@@ -21,6 +21,7 @@
*****************************************************************************/
// mapnik
+#include <mapnik/debug.hpp>
#include <mapnik/save_map.hpp>
#include <mapnik/map.hpp>
#include <mapnik/ptree_helpers.hpp>
@@ -156,10 +157,11 @@ class serialize_symbolizer : public boost::static_visitor<>
ptree::value_type("RasterSymbolizer", ptree()))->second;
raster_symbolizer dfl;
- if ( sym.get_mode() != dfl.get_mode() || explicit_defaults_ )
+ // should be serialized as comp-op now…
+ /*if ( sym.get_mode() != dfl.get_mode() || explicit_defaults_ )
{
set_attr( sym_node, "mode", sym.get_mode() );
- }
+ }*/
if ( sym.get_scaling() != dfl.get_scaling() || explicit_defaults_ )
{
@@ -318,7 +320,7 @@ class serialize_symbolizer : public boost::static_visitor<>
{
// not-supported
#ifdef MAPNIK_DEBUG
- std::clog << typeid(sym).name() << " is not supported" << std::endl;
+ MAPNIK_LOG_WARN(save_map) << typeid(sym).name() << " is not supported" << std::endl;
#endif
}
Please sign in to comment.
Something went wrong with that request. Please try again.