From b60c508c1c1dec664b7acafa3de4e342cfeb711c Mon Sep 17 00:00:00 2001 From: kunitoki Date: Mon, 9 Apr 2012 21:41:56 +0200 Subject: [PATCH] - finish thrashing all the useless ifdef MAPNIK_LOG --- bindings/python/mapnik_parameters.cpp | 4 +- bindings/python/python_grid_utils.hpp | 4 +- include/mapnik/ctrans.hpp | 21 ++++---- include/mapnik/font_engine_freetype.hpp | 9 ++-- include/mapnik/grid/grid.hpp | 8 +-- include/mapnik/memory_featureset.hpp | 6 +-- include/mapnik/metawriter_json.hpp | 14 ++++-- include/mapnik/pool.hpp | 21 ++++---- include/mapnik/rule.hpp | 4 +- include/mapnik/svg/svg_renderer.hpp | 4 +- include/mapnik/utils.hpp | 8 +-- plugins/input/occi/occi_types.hpp | 2 - src/agg/agg_renderer.cpp | 30 ++++-------- src/agg/process_line_pattern_symbolizer.cpp | 5 +- src/agg/process_markers_symbolizer.cpp | 15 +++--- .../process_polygon_pattern_symbolizer.cpp | 9 ++-- src/cairo_renderer.cpp | 35 +++++-------- src/datasource_cache.cpp | 28 ++++++----- src/feature_style_processor.cpp | 41 +++++++--------- src/font_engine_freetype.cpp | 10 ++-- src/grid/grid_renderer.cpp | 31 +++--------- src/grid/process_markers_symbolizer.cpp | 5 +- src/grid/process_raster_symbolizer.cpp | 4 +- src/load_map.cpp | 49 ++++++------------- src/map.cpp | 18 +++---- src/memory_datasource.cpp | 4 +- src/metawriter.cpp | 19 +++---- src/placement_finder.cpp | 2 +- src/png_reader.cpp | 8 +-- src/raster_colorizer.cpp | 20 ++++---- src/svg/svg_renderer.cpp | 19 ++----- src/svg_parser.cpp | 2 +- src/text_symbolizer.cpp | 4 +- src/tiff_reader.cpp | 4 +- 34 files changed, 170 insertions(+), 297 deletions(-) diff --git a/bindings/python/mapnik_parameters.cpp b/bindings/python/mapnik_parameters.cpp index 1bc7d853a..e90487193 100644 --- a/bindings/python/mapnik_parameters.cpp +++ b/bindings/python/mapnik_parameters.cpp @@ -103,9 +103,7 @@ struct parameters_pickle_suite : boost::python::pickle_suite } else { -#ifdef MAPNIK_LOG - mapnik::log() << "parameters_pickle_suite: Could not unpickle key=" << key; -#endif + MAPNIK_LOG_DEBUG(bindings) << "parameters_pickle_suite: Could not unpickle key=" << key; } } } diff --git a/bindings/python/python_grid_utils.hpp b/bindings/python/python_grid_utils.hpp index 2a9b21cf4..031adb46c 100644 --- a/bindings/python/python_grid_utils.hpp +++ b/bindings/python/python_grid_utils.hpp @@ -272,9 +272,7 @@ static void write_features(T const& grid_type, } else { -#ifdef MAPNIK_LOG - mapnik::log() << "write_features: Should not get here: key " << key << " not found in grid feature properties"; -#endif + MAPNIK_LOG_DEBUG(bindings) << "write_features: Should not get here: key " << key << " not found in grid feature properties"; } } } diff --git a/include/mapnik/ctrans.hpp b/include/mapnik/ctrans.hpp index 2d8423d85..2456f943d 100644 --- a/include/mapnik/ctrans.hpp +++ b/include/mapnik/ctrans.hpp @@ -240,10 +240,10 @@ struct MAPNIK_DECL coord_transform_parallel angle_a = atan2((m_pre_y-m_cur_y),(m_pre_x-m_cur_x)); dx_pre = cos(angle_a + pi_by_2); dy_pre = sin(angle_a + pi_by_2); -#ifdef MAPNIK_LOG - mapnik::log() << "coord_transform_parallel: Offsetting line by=" << offset_; - mapnik::log() << "coord_transform_parallel: Initial dx=" << (dx_pre * offset_) << ",dy=" << (dy_pre * offset_); -#endif + + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: Offsetting line by=" << offset_; + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: Initial dx=" << (dx_pre * offset_) << ",dy=" << (dy_pre * offset_); + *x = m_pre_x + (dx_pre * offset_); *y = m_pre_y + (dy_pre * offset_); m_status = process; @@ -290,15 +290,14 @@ struct MAPNIK_DECL coord_transform_parallel } else // skip sharp spikes { - #ifdef MAPNIK_LOG dx_curr = cos(angle_a + pi_by_2); dy_curr = sin(angle_a + pi_by_2); sin_curve = dx_curr*dy_pre-dy_curr*dx_pre; - mapnik::log() << "coord_transform_parallel: angle a=" << angle_a; - mapnik::log() << "coord_transform_parallel: angle b=" << angle_b; - mapnik::log() << "coord_transform_parallel: h=" << h; - mapnik::log() << "coord_transform_parallel: sin_curve=" << sin_curve; + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: angle a=" << angle_a; + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: angle b=" << angle_b; + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: h=" << h; + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: sin_curve=" << sin_curve; #endif m_status = process; break; @@ -310,9 +309,7 @@ struct MAPNIK_DECL coord_transform_parallel sin_curve = dx_curr*dy_pre-dy_curr*dx_pre; cos_curve = -dx_pre*dx_curr-dy_pre*dy_curr; - #ifdef MAPNIK_LOG - mapnik::log() << "coord_transform_parallel: sin_curve value=" << sin_curve; - #endif + MAPNIK_LOG_DEBUG(ctrans) << "coord_transform_parallel: sin_curve value=" << sin_curve; if(sin_curve > -0.3 && sin_curve < 0.3) { angle_b = atan2((m_cur_y-m_next_y),(m_cur_x-m_next_x)); h = tan((angle_b - angle_a)/2.0); diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp index 8865faa49..cf717c475 100644 --- a/include/mapnik/font_engine_freetype.hpp +++ b/include/mapnik/font_engine_freetype.hpp @@ -139,9 +139,8 @@ public: ~font_face() { -#ifdef MAPNIK_LOG - mapnik::log() << "font_face: Clean up face \"" << family_name() << " " << style_name() << "\""; -#endif + MAPNIK_LOG_DEBUG(font_engine_freetype) << "font_face: Clean up face \"" << family_name() << " " << style_name() << "\""; + FT_Done_Face(face_); } @@ -225,9 +224,7 @@ public: ~stroker() { -#ifdef MAPNIK_LOG - mapnik::log() << "stroker: Destroy stroker=" << s_; -#endif + MAPNIK_LOG_DEBUG(font_engine_freetype) << "stroker: Destroy stroker=" << s_; FT_Stroker_Done(s_); } diff --git a/include/mapnik/grid/grid.hpp b/include/mapnik/grid/grid.hpp index d2e6e0986..3e3022fb1 100644 --- a/include/mapnik/grid/grid.hpp +++ b/include/mapnik/grid/grid.hpp @@ -136,9 +136,7 @@ public: } else { -#ifdef MAPNIK_LOG - mapnik::log() << "hit_grid: Should not get here: key '" << key_ << "' not found in feature properties"; -#endif + MAPNIK_LOG_DEBUG(grid) << "hit_grid: Should not get here: key '" << key_ << "' not found in feature properties"; } } @@ -155,9 +153,7 @@ public: } else { -#ifdef MAPNIK_LOG - mapnik::log() << "hit_grid: Warning - key '" << key_ << "' was blank for " << *feature; -#endif + MAPNIK_LOG_DEBUG(grid) << "hit_grid: Warning - key '" << key_ << "' was blank for " << *feature; } } diff --git a/include/mapnik/memory_featureset.hpp b/include/mapnik/memory_featureset.hpp index 91dd65782..8f14940e5 100644 --- a/include/mapnik/memory_featureset.hpp +++ b/include/mapnik/memory_featureset.hpp @@ -56,9 +56,9 @@ public: for (unsigned i=0; i<(*pos_)->num_geometries();++i) { geometry_type & geom = (*pos_)->get_geometry(i); -#ifdef MAPNIK_LOG - mapnik::log() << "memory_featureset: BBox=" << bbox_ << ",Envelope=" << geom.envelope(); -#endif + + MAPNIK_LOG_DEBUG(memory_featureset) << "memory_featureset: BBox=" << bbox_ << ",Envelope=" << geom.envelope(); + if (bbox_.intersects(geom.envelope())) { return *pos_++; diff --git a/include/mapnik/metawriter_json.hpp b/include/mapnik/metawriter_json.hpp index 045c3ef73..693824921 100644 --- a/include/mapnik/metawriter_json.hpp +++ b/include/mapnik/metawriter_json.hpp @@ -72,12 +72,14 @@ public: void set_pixel_coordinates(bool on) { pixel_coordinates_ = on; } bool get_pixel_coordinates() { return pixel_coordinates_; } virtual void set_map_srs(projection const& proj); + protected: enum { HEADER_NOT_WRITTEN = -1, STOPPED = -2, STARTED = 0 }; + /** Features written. */ int count_; bool output_empty_; @@ -85,20 +87,23 @@ protected: proj_transform *trans_; projection output_srs_; bool pixel_coordinates_; + virtual void write_header(); + inline void write_feature_header(std::string type) { -#ifdef MAPNIK_LOG if (count_ == STOPPED) { - std::cerr << "WARNING: Metawriter not started before using it.\n"; + MAPNIK_LOG_WARN(metawrite_json) << "Metawriter: instance not started before using it."; } -#endif + if (count_ == HEADER_NOT_WRITTEN) write_header(); if (count_++) *f_ << ",\n"; *f_ << "{ \"type\": \"Feature\",\n \"geometry\": { \"type\": \"" << type << "\",\n \"coordinates\":"; } + void write_properties(Feature const& feature, metawriter_properties const& properties); + inline void write_point(CoordTransform const& t, double x, double y, bool last = false) { double z = 0.0; @@ -111,6 +116,7 @@ protected: *f_ << ","; } } + void write_line_polygon(path_type & path, CoordTransform const& t, bool polygon); private: @@ -136,10 +142,12 @@ public: void set_filename(path_expression_ptr fn); /** Get filename template. */ path_expression_ptr get_filename() const; + private: path_expression_ptr fn_; std::fstream f_; std::string filename_; + protected: virtual void write_header(); }; diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp index 8e6a5619c..83364fc3d 100644 --- a/include/mapnik/pool.hpp +++ b/include/mapnik/pool.hpp @@ -101,9 +101,8 @@ public: typename ContType::iterator itr=unusedPool_.begin(); while ( itr!=unusedPool_.end()) { -#ifdef MAPNIK_LOG - mapnik::log() << "pool: Borrow instance=" << (*itr).get(); -#endif + MAPNIK_LOG_DEBUG(pool) << "pool: Borrow instance=" << (*itr).get(); + if ((*itr)->isOK()) { usedPool_.push_back(*itr); @@ -112,9 +111,8 @@ public: } else { -#ifdef MAPNIK_LOG - mapnik::log() << "pool: Bad connection (erase) instance=" << (*itr).get(); -#endif + MAPNIK_LOG_DEBUG(pool) << "pool: Bad connection (erase) instance=" << (*itr).get(); + itr=unusedPool_.erase(itr); } } @@ -124,9 +122,9 @@ public: if (conn->isOK()) { usedPool_.push_back(conn); -#ifdef MAPNIK_LOG - mapnik::log() << "pool: Create connection=" << conn.get(); -#endif + + MAPNIK_LOG_DEBUG(pool) << "pool: Create connection=" << conn.get(); + return conn; } } @@ -143,9 +141,8 @@ public: { if (obj.get()==(*itr).get()) { -#ifdef MAPNIK_LOG - mapnik::log() << "pool: Return instance=" << (*itr).get(); -#endif + MAPNIK_LOG_DEBUG(pool) << "pool: Return instance=" << (*itr).get(); + unusedPool_.push_back(*itr); usedPool_.erase(itr); return; diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp index a0e625603..1ec7ed33a 100644 --- a/include/mapnik/rule.hpp +++ b/include/mapnik/rule.hpp @@ -203,9 +203,7 @@ private: template void copy_text_ptr(T & sym) const { -#ifdef MAPNIK_LOG - std::cerr << "Warning: Deep copying TextSymbolizers is broken!\n"; -#endif + MAPNIK_LOG_WARN(rule) << "rule: deep copying TextSymbolizers is broken!"; } template diff --git a/include/mapnik/svg/svg_renderer.hpp b/include/mapnik/svg/svg_renderer.hpp index 391d4b8c4..e62b2dfe7 100644 --- a/include/mapnik/svg/svg_renderer.hpp +++ b/include/mapnik/svg/svg_renderer.hpp @@ -146,9 +146,7 @@ public: unsigned g = stop_color.green(); unsigned b = stop_color.blue(); unsigned a = stop_color.alpha(); -#ifdef MAPNIK_LOG - //mapnik::log() << "svg_renderer: r=" << r << ",g=" << g << ",b=" << b << ",a=" << a; -#endif + //MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: r=" << r << ",g=" << g << ",b=" << b << ",a=" << a; m_gradient_lut.add_color(st.first, agg::rgba8(r, g, b, int(a * opacity))); } m_gradient_lut.build_lut(); diff --git a/include/mapnik/utils.hpp b/include/mapnik/utils.hpp index 822273921..dfa1bc959 100644 --- a/include/mapnik/utils.hpp +++ b/include/mapnik/utils.hpp @@ -125,9 +125,7 @@ template ::create(); -#ifdef MAPNIK_LOG - mapnik::log() << "singleton: Created instance"; -#endif + MAPNIK_LOG_DEBUG(utils) << "singleton: Created instance"; // register destruction std::atexit(&DestroySingleton); diff --git a/plugins/input/occi/occi_types.hpp b/plugins/input/occi/occi_types.hpp index 80ce6a88d..69f218520 100644 --- a/plugins/input/occi/occi_types.hpp +++ b/plugins/input/occi/occi_types.hpp @@ -160,9 +160,7 @@ public: { close_query(false); -#ifdef MAPNIK_LOG MAPNIK_LOG_DEBUG(occi) << "occi_connection_ptr: " << s; -#endif stmt_ = conn_->createStatement(s); diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp index a9bec9553..f764cc51e 100644 --- a/src/agg/agg_renderer.cpp +++ b/src/agg/agg_renderer.cpp @@ -73,10 +73,6 @@ #include // stl -#ifdef MAPNIK_LOG -#include -#endif - #include namespace mapnik @@ -172,9 +168,7 @@ void agg_renderer::setup(Map const &m) } } -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: Scale=" << m.scale(); -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Scale=" << m.scale(); } template @@ -183,28 +177,24 @@ agg_renderer::~agg_renderer() {} template void agg_renderer::start_map_processing(Map const& map) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: Start map processing bbox=" << map.get_current_extent(); -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Start map processing bbox=" << map.get_current_extent(); + ras_ptr->clip_box(0,0,width_,height_); } template void agg_renderer::end_map_processing(Map const& ) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: End map processing"; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: End map processing"; } template void agg_renderer::start_layer_processing(layer const& lay, box2d const& query_extent) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: Start processing layer=" << lay.name(); - mapnik::log() << "agg_renderer: -- datasource=" << lay.datasource().get(); - mapnik::log() << "agg_renderer: -- query_extent=" << query_extent; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Start processing layer=" << lay.name(); + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: -- datasource=" << lay.datasource().get(); + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: -- query_extent=" << query_extent; + if (lay.clear_label_cache()) { detector_->clear(); @@ -215,9 +205,7 @@ void agg_renderer::start_layer_processing(layer const& lay, box2d con template void agg_renderer::end_layer_processing(layer const&) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: End layer processing"; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: End layer processing"; } template diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp index 37742f695..4fa185ef3 100644 --- a/src/agg/process_line_pattern_symbolizer.cpp +++ b/src/agg/process_line_pattern_symbolizer.cpp @@ -68,9 +68,8 @@ void agg_renderer::process(line_pattern_symbolizer const& sym, if (!(*mark)->is_bitmap()) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: Only images (not '" << filename << "') are supported in the line_pattern_symbolizer"; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Only images (not '" << filename << "') are supported in the line_pattern_symbolizer"; + return; } diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp index d7e8613ec..96f37f5d4 100644 --- a/src/agg/process_markers_symbolizer.cpp +++ b/src/agg/process_markers_symbolizer.cpp @@ -83,9 +83,8 @@ void agg_renderer::process(markers_symbolizer const& sym, { if (!(*mark)->is_vector()) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: markers_symbolizer do not yet support SVG markers"; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: markers_symbolizer do not yet support SVG markers"; + return; } boost::optional marker = (*mark)->get_vector_data(); @@ -154,9 +153,8 @@ void agg_renderer::process(markers_symbolizer const& sym, if (writer.first) { //writer.first->add_box(label_ext, feature, t_, writer.second); -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: metawriter do not yet supported for line placement"; -#endif + + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: metawriter do not yet supported for line placement"; } } } @@ -300,9 +298,8 @@ void agg_renderer::process(markers_symbolizer const& sym, if (writer.first) { //writer.first->add_box(label_ext, feature, t_, writer.second); -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: metawriter do not yet supported for line placement"; -#endif + + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: metawriter do not yet supported for line placement"; } agg::conv_transform trans(marker, matrix); diff --git a/src/agg/process_polygon_pattern_symbolizer.cpp b/src/agg/process_polygon_pattern_symbolizer.cpp index 9c6dc083c..2a514fc89 100644 --- a/src/agg/process_polygon_pattern_symbolizer.cpp +++ b/src/agg/process_polygon_pattern_symbolizer.cpp @@ -83,18 +83,15 @@ void agg_renderer::process(polygon_pattern_symbolizer const& sym, } else { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: File not found=" << filename; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: File not found=" << filename; } if (!marker) return; if (!(*marker)->is_bitmap()) { -#ifdef MAPNIK_LOG - mapnik::log() << "agg_renderer: Only images (not '" << filename << "') are supported in the polygon_pattern_symbolizer"; -#endif + MAPNIK_LOG_DEBUG(agg_renderer) << "agg_renderer: Only images (not '" << filename << "') are supported in the polygon_pattern_symbolizer"; + return; } diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp index 664cafe35..d2158bc49 100644 --- a/src/cairo_renderer.cpp +++ b/src/cairo_renderer.cpp @@ -639,9 +639,7 @@ cairo_renderer_base::cairo_renderer_base(Map const& m, Cairo::RefPtr(-m.buffer_size() ,-m.buffer_size() , m.width() + m.buffer_size() ,m.height() + m.buffer_size())) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: Scale=" << m.scale(); -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Scale=" << m.scale(); } template <> @@ -662,9 +660,7 @@ cairo_renderer_base::~cairo_renderer_base() {} void cairo_renderer_base::start_map_processing(Map const& map) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: Start map processing bbox=" << map.get_current_extent(); -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Start map processing bbox=" << map.get_current_extent(); #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) box2d bounds = t_.forward(t_.extent()); @@ -684,27 +680,23 @@ void cairo_renderer_base::start_map_processing(Map const& map) template <> void cairo_renderer::end_map_processing(Map const& ) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: End map processing"; -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: End map processing"; } template <> void cairo_renderer::end_map_processing(Map const& ) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: End map processing"; -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: End map processing"; + context_->show_page(); } void cairo_renderer_base::start_layer_processing(layer const& lay, box2d const& query_extent) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: Start processing layer=" << lay.name() ; - mapnik::log() << "cairo_renderer_base: -- datasource=" << lay.datasource().get(); - mapnik::log() << "cairo_renderer_base: -- query_extent=" << query_extent; -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Start processing layer=" << lay.name() ; + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: -- datasource=" << lay.datasource().get(); + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: -- query_extent=" << query_extent; + if (lay.clear_label_cache()) { detector_.clear(); @@ -714,9 +706,7 @@ void cairo_renderer_base::start_map_processing(Map const& map) void cairo_renderer_base::end_layer_processing(layer const&) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: End layer processing"; -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: End layer processing"; } void cairo_renderer_base::process(polygon_symbolizer const& sym, @@ -1276,9 +1266,8 @@ void cairo_renderer_base::start_map_processing(Map const& map) { if (!(*mark)->is_vector()) { -#ifdef MAPNIK_LOG - mapnik::log() << "cairo_renderer_base: markers_symbolizer does not yet support SVG markers"; -#endif + MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: markers_symbolizer does not yet support SVG markers"; + return; } boost::optional marker = (*mark)->get_vector_data(); diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp index 317e99d19..4c78d6cf2 100644 --- a/src/datasource_cache.cpp +++ b/src/datasource_cache.cpp @@ -102,20 +102,19 @@ datasource_ptr datasource_cache::create(const parameters& params, bool bind) } #ifdef MAPNIK_LOG - mapnik::log() << "datasource_cache: Size=" << params.size(); + MAPNIK_LOG_DEBUG(datasource_cache) << "datasource_cache: Size=" << params.size(); parameters::const_iterator i = params.begin(); for (; i != params.end(); ++i) { - mapnik::log() << "datasource_cache: -- " << i->first << "=" << i->second; + MAPNIK_LOG_DEBUG(datasource_cache) << "datasource_cache: -- " << i->first << "=" << i->second; } #endif ds = datasource_ptr(create_datasource(params, bind), datasource_deleter()); -#ifdef MAPNIK_LOG - mapnik::log() << "datasource_cache: Datasource=" << ds << " type=" << type; -#endif + MAPNIK_LOG_DEBUG(datasource_cache) << "datasource_cache: Datasource=" << ds << " type=" << type; + return ds; } @@ -180,24 +179,27 @@ void datasource_cache::register_datasources(const std::string& str) reinterpret_cast(lt_dlsym(module, "datasource_name")); if (ds_name && insert(ds_name(),module)) { -#ifdef MAPNIK_LOG - mapnik::log() << "datasource_cache: Registered=" << ds_name(); -#endif + MAPNIK_LOG_DEBUG(datasource_cache) << "datasource_cache: Registered=" << ds_name(); + registered_=true; } else if (!ds_name) { - std::cerr << "Problem loading plugin library '" << itr->path().string() << "' (plugin is lacking compatible interface)" << std::endl; + MAPNIK_LOG_ERROR(datasource_cache) + << "Problem loading plugin library '" + << itr->path().string() << "' (plugin is lacking compatible interface)"; } } else { #if (BOOST_FILESYSTEM_VERSION == 3) - std::cerr << "Problem loading plugin library: " << itr->path().string() - << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)" << std::endl; + MAPNIK_LOG_ERROR(datasource_cache) + << "Problem loading plugin library: " << itr->path().string() + << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)"; #else // v2 - std::cerr << "Problem loading plugin library: " << itr->string() - << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)" << std::endl; + MAPNIK_LOG_ERROR(datasource_cache) + << "Problem loading plugin library: " << itr->string() + << " (dlopen failed - plugin likely has an unsatisfied dependency or incompatible ABI)"; #endif } } diff --git a/src/feature_style_processor.cpp b/src/feature_style_processor.cpp index 546d70776..2bf1614af 100644 --- a/src/feature_style_processor.cpp +++ b/src/feature_style_processor.cpp @@ -122,9 +122,7 @@ void feature_style_processor::apply() } catch (proj_init_error& ex) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: proj_init_error=" << ex.what(); -#endif + MAPNIK_LOG_ERROR(feature_style_processor) << "feature_style_processor: proj_init_error=" << ex.what(); } p.end_map_processing(m_); @@ -154,9 +152,7 @@ void feature_style_processor::apply(mapnik::layer const& lyr, std::se } catch (proj_init_error& ex) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: proj_init_error=" << ex.what(); -#endif + MAPNIK_LOG_ERROR(feature_style_processor) << "feature_style_processor: proj_init_error=" << ex.what(); } p.end_map_processing(m_); } @@ -196,18 +192,16 @@ void feature_style_processor::apply_to_layer(layer const& lay, Proces unsigned int num_styles = style_names.size(); if (! num_styles) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: No style for layer=" << lay.name(); -#endif + MAPNIK_LOG_DEBUG(feature_style_processor) << "feature_style_processor: No style for layer=" << lay.name(); + return; } mapnik::datasource_ptr ds = lay.datasource(); if (! ds) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: No datasource for layer=" << lay.name(); -#endif + MAPNIK_LOG_DEBUG(feature_style_processor) << "feature_style_processor: No datasource for layer=" << lay.name(); + return; } @@ -219,10 +213,12 @@ void feature_style_processor::apply_to_layer(layer const& lay, Proces proj_transform prj_trans(proj0,proj1); #if defined(RENDERING_STATS) - if (!prj_trans.equal()) + if (! prj_trans.equal()) + { std::clog << "notice: reprojecting layer: '" << lay.name() << "' from/to:\n\t'" << lay.srs() << "'\n\t'" << m_.srs() << "'\n"; + } #endif box2d buffered_query_ext = m_.get_buffered_extent(); // buffered @@ -255,13 +251,12 @@ void feature_style_processor::apply_to_layer(layer const& lay, Proces { layer_ext.clip(buffered_query_ext); // forward project layer extent back into native projection - if (!prj_trans.forward(layer_ext, PROJ_ENVELOPE_POINTS)) + if (! prj_trans.forward(layer_ext, PROJ_ENVELOPE_POINTS)) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: Layer=" << lay.name() - << " extent=" << layer_ext << " in map projection " - << " did not reproject properly back to layer projection"; -#endif + MAPNIK_LOG_DEBUG(feature_style_processor) + << "feature_style_processor: Layer=" << lay.name() + << " extent=" << layer_ext << " in map projection " + << " did not reproject properly back to layer projection"; } } else @@ -315,10 +310,10 @@ void feature_style_processor::apply_to_layer(layer const& lay, Proces boost::optional style=m_.find_style(style_name); if (!style) { -#ifdef MAPNIK_LOG - mapnik::log() << "feature_style_processor: Style=" << style_name << " required for layer=" - << lay.name() << " does not exist."; -#endif + MAPNIK_LOG_DEBUG(feature_style_processor) + << "feature_style_processor: Style=" << style_name + << " required for layer=" << lay.name() << " does not exist."; + continue; } diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp index afccd52dc..a2fde3e61 100644 --- a/src/font_engine_freetype.cpp +++ b/src/font_engine_freetype.cpp @@ -117,9 +117,7 @@ bool freetype_engine::register_font(std::string const& file_name) else if (face->style_name) s << "which reports a style name of '" << std::string(face->style_name) << "' and lacks a family name"; -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: " << s.str(); -#endif + MAPNIK_LOG_DEBUG(font_engine_freetype) << "freetype_engine: " << s.str(); } } if (face) @@ -332,11 +330,9 @@ box2d text_renderer::prepare_glyphs(text_path *path) path->vertex(&c, &x, &y, &angle); -#ifdef MAPNIK_LOG // TODO Enable when we have support for setting verbosity - //mapnik::log() << "text_renderer: prepare_glyphs=" - // << c << "," << x << "," << y << "," << angle; -#endif + // MAPNIK_LOG_DEBUG(font_engine_freetype) << "text_renderer: prepare_glyphs=" + // << c << "," << x << "," << y << "," << angle; FT_BBox glyph_bbox; FT_Glyph image; diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp index 2dc93991e..07bfeaad4 100644 --- a/src/grid/grid_renderer.cpp +++ b/src/grid/grid_renderer.cpp @@ -44,13 +44,6 @@ // agg #include "agg_trans_affine.h" -// stl -#ifdef MAPNIK_LOG -#include -#endif - -//#include - namespace mapnik { @@ -67,9 +60,7 @@ grid_renderer::grid_renderer(Map const& m, T & pixmap, double scale_factor, u detector_(box2d(-m.buffer_size(), -m.buffer_size(), pixmap_.width() + m.buffer_size(), pixmap_.height() + m.buffer_size())), ras_ptr(new grid_rasterizer) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: Scale=" << m.scale(); -#endif + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: Scale=" << m.scale(); } template @@ -78,9 +69,7 @@ grid_renderer::~grid_renderer() {} template void grid_renderer::start_map_processing(Map const& m) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: Start map processing bbox=" << m.get_current_extent(); -#endif + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: Start map processing bbox=" << m.get_current_extent(); ras_ptr->clip_box(0,0,width_,height_); } @@ -88,19 +77,15 @@ void grid_renderer::start_map_processing(Map const& m) template void grid_renderer::end_map_processing(Map const& m) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: End map processing"; -#endif + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: End map processing"; } template void grid_renderer::start_layer_processing(layer const& lay, box2d const& query_extent) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: Start processing layer=" << lay.name(); - mapnik::log() << "grid_renderer: datasource=" << lay.datasource().get(); - mapnik::log() << "grid_renderer: query_extent = " << query_extent; -#endif + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: Start processing layer=" << lay.name(); + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: datasource=" << lay.datasource().get(); + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: query_extent = " << query_extent; if (lay.clear_label_cache()) { @@ -111,9 +96,7 @@ void grid_renderer::start_layer_processing(layer const& lay, box2d co template void grid_renderer::end_layer_processing(layer const&) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: End layer processing"; -#endif + MAPNIK_LOG_DEBUG(grid_renderer) << "grid_renderer: End layer processing"; } template diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp index 9e59c7063..7c57b80b4 100644 --- a/src/grid/process_markers_symbolizer.cpp +++ b/src/grid/process_markers_symbolizer.cpp @@ -106,9 +106,8 @@ void grid_renderer::process(markers_symbolizer const& sym, geometry_type & geom = feature->get_geometry(i); if (geom.num_points() <= 1) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: markers_symbolizer points do not yet support SVG markers"; -#endif + MAPNIK_LOG_WARN(grid_renderer) << "grid_renderer: markers_symbolizer points do not yet support SVG markers"; + continue; } diff --git a/src/grid/process_raster_symbolizer.cpp b/src/grid/process_raster_symbolizer.cpp index 806ae54f6..9aaf05395 100644 --- a/src/grid/process_raster_symbolizer.cpp +++ b/src/grid/process_raster_symbolizer.cpp @@ -32,9 +32,7 @@ void grid_renderer::process(raster_symbolizer const& sym, mapnik::feature_ptr const& feature, proj_transform const& prj_trans) { -#ifdef MAPNIK_LOG - mapnik::log() << "grid_renderer: raster_symbolizer is not yet supported"; -#endif + MAPNIK_LOG_WARN(grid_renderer) << "grid_renderer: raster_symbolizer is not yet supported"; } template void grid_renderer::process(raster_symbolizer const&, diff --git a/src/load_map.cpp b/src/load_map.cpp index 4de988482..4ecb31706 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -234,9 +234,7 @@ void map_parser::parse_map(Map & map, xml_node const& pt, std::string const& bas } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << s_err.str(); -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << s_err.str(); } } } @@ -574,9 +572,7 @@ void map_parser::parse_layer(Map & map, xml_node const& lay) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << ss.str(); -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << ss.str(); } } else @@ -818,9 +814,7 @@ void map_parser::parse_point_symbolizer(rule & rule, xml_node const & sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << ss; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << ss; } } boost::array matrix; @@ -838,9 +832,7 @@ void map_parser::parse_point_symbolizer(rule & rule, xml_node const & sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << msg; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << msg; } } } @@ -888,9 +880,7 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << msg; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << msg; } } } @@ -919,9 +909,7 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << ss; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << ss; } } boost::array matrix; @@ -1023,9 +1011,7 @@ void map_parser::parse_line_pattern_symbolizer(rule & rule, xml_node const & sym } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << msg; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << msg; } } } @@ -1089,9 +1075,7 @@ void map_parser::parse_polygon_pattern_symbolizer(rule & rule, } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << msg; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << msg; } } } @@ -1165,9 +1149,7 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << ss; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << ss; } } boost::array matrix; @@ -1237,9 +1219,7 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym) } else { -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Warning - " << msg; -#endif + MAPNIK_LOG_WARN(load_map) << "map_parser: " << msg; } } rule.append(shield_symbol); @@ -1560,11 +1540,10 @@ std::string map_parser::ensure_relative_to_xml(boost::optional opt_ boost::filesystem::path full = boost::filesystem::complete(xml_path.branch_path()/rel_path).normalize(); #endif -#ifdef MAPNIK_LOG - mapnik::log() << "map_parser: Modifying relative paths to be relative to xml..."; - mapnik::log() << "map_parser: -- Original base path=" << *opt_path; - mapnik::log() << "map_parser: -- Relative base path=" << full.string(); -#endif + MAPNIK_LOG_DEBUG(load_map) << "map_parser: Modifying relative paths to be relative to xml..."; + MAPNIK_LOG_DEBUG(load_map) << "map_parser: -- Original base path=" << *opt_path; + MAPNIK_LOG_DEBUG(load_map) << "map_parser: -- Relative base path=" << full.string(); + return full.string(); } } diff --git a/src/map.cpp b/src/map.cpp index aa22d1725..bd080b7e8 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -415,10 +415,10 @@ void Map::zoom_all() if (prj_trans.backward(layer_ext, PROJ_ENVELOPE_POINTS)) { success = true; -#ifdef MAPNIK_LOG - mapnik::log() << "map: Layer " << itr->name() << " original ext=" << itr->envelope(); - mapnik::log() << "map: Layer " << itr->name() << " transformed to map srs=" << layer_ext; -#endif + + MAPNIK_LOG_DEBUG(map) << "map: Layer " << itr->name() << " original ext=" << itr->envelope(); + MAPNIK_LOG_DEBUG(map) << "map: Layer " << itr->name() << " transformed to map srs=" << layer_ext; + if (first) { ext = layer_ext; @@ -586,9 +586,8 @@ featureset_ptr Map::query_point(unsigned index, double x, double y) const mapnik::datasource_ptr ds = layer.datasource(); if (ds) { -#ifdef MAPNIK_LOG - mapnik::log() << "map: Query at point tol=" << tol << "(" << x << "," << y << ")"; -#endif + MAPNIK_LOG_DEBUG(map) << "map: Query at point tol=" << tol << "(" << x << "," << y << ")"; + featureset_ptr fs = ds->features_at_point(mapnik::coord2d(x,y)); if (fs) return boost::make_shared >(fs, @@ -630,9 +629,8 @@ featureset_ptr Map::query_map_point(unsigned index, double x, double y) const mapnik::datasource_ptr ds = layer.datasource(); if (ds) { -#ifdef MAPNIK_LOG - mapnik::log() << "map: Query at point tol=" << tol << "(" << x << "," << y << ")"; -#endif + MAPNIK_LOG_DEBUG(map) << "map: Query at point tol=" << tol << "(" << x << "," << y << ")"; + featureset_ptr fs = ds->features_at_point(mapnik::coord2d(x,y)); if (fs) return boost::make_shared >(fs, diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp index e7a143f17..17d32e877 100644 --- a/src/memory_datasource.cpp +++ b/src/memory_datasource.cpp @@ -88,9 +88,7 @@ featureset_ptr memory_datasource::features_at_point(coord2d const& pt) const { box2d box = box2d(pt.x, pt.y, pt.x, pt.y); -#ifdef MAPNIK_LOG - mapnik::log() << "memory_datasource: Box=" << box << ", Point x=" << pt.x << ",y=" << pt.y; -#endif + MAPNIK_LOG_DEBUG(memory_datasource) << "memory_datasource: Box=" << box << ", Point x=" << pt.x << ",y=" << pt.y; return boost::make_shared(box,*this); } diff --git a/src/metawriter.cpp b/src/metawriter.cpp index 7df6df72a..d3d43c48f 100644 --- a/src/metawriter.cpp +++ b/src/metawriter.cpp @@ -89,9 +89,8 @@ metawriter_json_stream::~metawriter_json_stream() { if (count_ >= STARTED) { -#ifdef MAPNIK_LOG - std::cerr << "WARNING: GeoJSON metawriter not stopped before destroying it."; -#endif + MAPNIK_LOG_WARN(metawriter) << "WARNING: GeoJSON metawriter not stopped before destroying it."; + stop(); } if (trans_) delete trans_; @@ -327,9 +326,7 @@ void metawriter_json::start(metawriter_property_map const& properties) { filename_ = path_processor::evaluate(*fn_, properties); -#ifdef MAPNIK_LOG - mapnik::log() << "metawriter_json: Filename=" << filename_; -#endif + MAPNIK_LOG_DEBUG(metawriter) << "metawriter_json: Filename=" << filename_; metawriter_json_stream::start(properties); } @@ -346,14 +343,14 @@ void metawriter_json::write_header() void metawriter_json::stop() { metawriter_json_stream::stop(); - if (f_.is_open()) { + if (f_.is_open()) + { f_.close(); } -#ifdef MAPNIK_LOG - else if (count_ >= STARTED){ - mapnik::log() << "metawriter_json: File not open when stopping"; + else if (count_ >= STARTED) + { + MAPNIK_LOG_DEBUG(metawriter) << "metawriter_json: File not open when stopping"; } -#endif } void metawriter_json::set_filename(path_expression_ptr fn) diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp index 1e2b4c41d..ab211a0d7 100644 --- a/src/placement_finder.cpp +++ b/src/placement_finder.cpp @@ -534,7 +534,7 @@ void placement_finder::find_line_placements(PathT & shape_path) #ifdef MAPNIK_LOG if (! line_sizes_.empty()) { - std::cerr << "WARNING: Internal error. Text contains line breaks, but line placement is used. Please file a bug report!\n"; + MAPNIK_LOG_WARN(placement_finder) << "Internal error. Text contains line breaks, but line placement is used. Please file a bug report!"; } #endif diff --git a/src/png_reader.cpp b/src/png_reader.cpp index e3c956e8a..2afb0c3c3 100644 --- a/src/png_reader.cpp +++ b/src/png_reader.cpp @@ -31,10 +31,6 @@ extern "C" #include #include -#ifdef MAPNIK_LOG -#include -#endif - namespace mapnik { class png_reader : public image_reader, boost::noncopyable @@ -134,9 +130,7 @@ void png_reader::init() width_=width; height_=height; -#ifdef MAPNIK_LOG - mapnik::log() << "png_reader: bit_depth=" << bit_depth_ << ",color_type=" << color_type_; -#endif + MAPNIK_LOG_DEBUG(png_reader) << "png_reader: bit_depth=" << bit_depth_ << ",color_type=" << color_type_; png_destroy_read_struct(&png_ptr,&info_ptr,0); fclose(fp); diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp index 5a030c806..b4bdd5fda 100644 --- a/src/raster_colorizer.cpp +++ b/src/raster_colorizer.cpp @@ -266,19 +266,17 @@ color raster_colorizer::get_color(float value) const } -#ifdef MAPNIK_LOG /* - mapnik::log() << "raster_colorizer: get_color " << value; - mapnik::log() << "\tstopIdx: " << stopIdx; - mapnik::log() << "\tnextStopIdx: " << nextStopIdx; - mapnik::log() << "\tstopValue: " << stopValue; - mapnik::log() << "\tnextStopValue: " << nextStopValue; - mapnik::log() << "\tstopColor: " << stopColor.to_string(); - mapnik::log() << "\tnextStopColor: " << nextStopColor.to_string(); - mapnik::log() << "\tstopMode: " << stopMode.as_string(); - mapnik::log() << "\toutputColor: " << outputColor.to_string(); + MAPNIK_LOG_DEBUG(raster_colorizer) << "raster_colorizer: get_color " << value; + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopIdx: " << stopIdx; + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tnextStopIdx: " << nextStopIdx; + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopValue: " << stopValue; + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tnextStopValue: " << nextStopValue; + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopColor: " << stopColor.to_string(); + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tnextStopColor: " << nextStopColor.to_string(); + MAPNIK_LOG_DEBUG(raster_colorizer) << "\tstopMode: " << stopMode.as_string(); + MAPNIK_LOG_DEBUG(raster_colorizer) << "\toutputColor: " << outputColor.to_string(); */ -#endif return outputColor; } diff --git a/src/svg/svg_renderer.cpp b/src/svg/svg_renderer.cpp index 34e4695e8..839492f4c 100644 --- a/src/svg/svg_renderer.cpp +++ b/src/svg/svg_renderer.cpp @@ -26,9 +26,6 @@ #include // stl -#ifdef MAPNIK_LOG -#include -#endif #include namespace mapnik @@ -49,9 +46,7 @@ svg_renderer::~svg_renderer() {} template void svg_renderer::start_map_processing(Map const& map) { -#ifdef MAPNIK_LOG - mapnik::log() << "svg_renderer: Start map processing"; -#endif + MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: Start map processing"; // generate XML header. generator_.generate_header(); @@ -77,25 +72,19 @@ void svg_renderer::end_map_processing(Map const& map) // generate SVG root element closing tag. generator_.generate_closing_root(); -#ifdef MAPNIK_LOG - mapnik::log() << "svg_renderer: End map processing"; -#endif + MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: End map processing"; } template void svg_renderer::start_layer_processing(layer const& lay) { -#ifdef MAPNIK_LOG - mapnik::log() << "svg_renderer: Start layer processing=" << lay.name(); -#endif + MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: Start layer processing=" << lay.name(); } template void svg_renderer::end_layer_processing(layer const& lay) { -#ifdef MAPNIK_LOG - mapnik::log() << "svg_renderer: End layer processing=" << lay.name(); -#endif + MAPNIK_LOG_DEBUG(svg_renderer) << "svg_renderer: End layer processing=" << lay.name(); } template class svg_renderer >; diff --git a/src/svg_parser.cpp b/src/svg_parser.cpp index a813255f0..b9e52e543 100644 --- a/src/svg_parser.cpp +++ b/src/svg_parser.cpp @@ -229,7 +229,7 @@ void svg_parser::start_element(xmlTextReaderPtr reader) #ifdef MAPNIK_LOG else if (!xmlStrEqual(name, BAD_CAST "svg")) { - mapnik::log() << "svg_parser: Unhandled svg element=" << name; + MAPNIK_LOG_WARN(svg_parser) << "svg_parser: Unhandled svg element=" << name; } #endif } diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp index 618ebd99f..aee3720cd 100644 --- a/src/text_symbolizer.cpp +++ b/src/text_symbolizer.cpp @@ -130,9 +130,7 @@ text_symbolizer& text_symbolizer::operator=(text_symbolizer const& other) return *this; placement_options_ = other.placement_options_; /*TODO: Copy options? */ -#ifdef MAPNIK_LOG - mapnik::log() << "text_symbolizer: TODO - Metawriter (text_symbolizer::operator=)"; -#endif + MAPNIK_LOG_DEBUG(text_symbolizer) << "text_symbolizer: TODO - Metawriter (text_symbolizer::operator=)"; return *this; } diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp index 0eea66482..127dc5bd0 100644 --- a/src/tiff_reader.cpp +++ b/src/tiff_reader.cpp @@ -166,9 +166,7 @@ void tiff_reader::read_generic(unsigned /*x*/,unsigned /*y*/,image_data_32& /*im TIFF* tif = load_if_exists(file_name_); if (tif) { -#ifdef MAPNIK_LOG - mapnik::log() << "tiff_reader: TODO - tiff is not stripped or tiled"; -#endif + MAPNIK_LOG_DEBUG(tiff_reader) << "tiff_reader: TODO - tiff is not stripped or tiled"; TIFFClose(tif); }