* scribo/debug/logger.hh (scribo::debug::internal::logger_::log_image) [!SCRIBO_NDEBUG]: Avoid warnings about unused arguments in non-debug mode. * scribo/filter/objects_thick.hh (scribo::filter::objects_thick) * scribo/primitive/extract/cells.hh (scribo::primitive::extract::cells) * scribo/primitive/extract/lines_h_single.hh (scribo::primitive::extract::lines_h_single) * scribo/primitive/extract/lines_v_single.hh (scribo::primitive::extract::lines_v_single) * src/primitive/group/group_from_rag.cc (scribo::filter::graph_edges): Avoid warnings about unused arguments. --- scribo/ChangeLog | 18 ++++++++++++++++++ scribo/scribo/debug/logger.hh | 5 +++++ scribo/scribo/filter/objects_thick.hh | 6 +++--- scribo/scribo/primitive/extract/cells.hh | 6 +++--- scribo/scribo/primitive/extract/lines_h_single.hh | 6 +++--- scribo/scribo/primitive/extract/lines_v_single.hh | 6 +++--- scribo/src/primitive/group/group_from_rag.cc | 4 ++-- 7 files changed, 37 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 033dce2..d9609a5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,21 @@ +2014-07-03 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Address more compiler warnings in Scribo. + + * scribo/debug/logger.hh + (scribo::debug::internal::logger_::log_image) [!SCRIBO_NDEBUG]: + Avoid warnings about unused arguments in non-debug mode. + * scribo/filter/objects_thick.hh (scribo::filter::objects_thick) + * scribo/primitive/extract/cells.hh + (scribo::primitive::extract::cells) + * scribo/primitive/extract/lines_h_single.hh + (scribo::primitive::extract::lines_h_single) + * scribo/primitive/extract/lines_v_single.hh + (scribo::primitive::extract::lines_v_single) + * src/primitive/group/group_from_rag.cc + (scribo::filter::graph_edges): + Avoid warnings about unused arguments. + 2014-07-02 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Update Scribo's NEWS file. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 25e5ade..e82c282 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -398,6 +398,11 @@ namespace scribo logger_::log_image(Level dbg_level, const Image<I>& ima, const char *name) { + // Avoid warnings about unused arguments in non-debug mode. + (void) dbg_level; + (void) ima; + (void) name; + # ifndef SCRIBO_NDEBUG if (level_ < dbg_level) return; diff --git a/scribo/scribo/filter/objects_thick.hh b/scribo/scribo/filter/objects_thick.hh index c3e238c..45f8bc0 100644 --- a/scribo/scribo/filter/objects_thick.hh +++ b/scribo/scribo/filter/objects_thick.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -137,7 +137,7 @@ namespace scribo mln_concrete(I) objects_thick(const Image<I>& input_, const Neighborhood<N>& nbh_, - const V& label_type, + const V& /* label_type */, unsigned max_thickness) { mln_trace("scribo::filter::objects_thick"); diff --git a/scribo/scribo/primitive/extract/cells.hh b/scribo/scribo/primitive/extract/cells.hh index beca189..d878a67 100644 --- a/scribo/scribo/primitive/extract/cells.hh +++ b/scribo/scribo/primitive/extract/cells.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -84,7 +84,7 @@ namespace scribo mln::util::couple<mln::util::array<box<mln_site(I)> >, mln::util::array<box<mln_site(I)> > > cells(const Image<I>& input_, - const Neighborhood<N>& nbh_, const V& label_type) + const Neighborhood<N>& nbh_, const V& /* label_type */) { mln_trace("scribo::primitive::cells"); diff --git a/scribo/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh index ab262ab..6e93b4e 100644 --- a/scribo/scribo/primitive/extract/lines_h_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_single.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and -// Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -146,7 +146,7 @@ namespace scribo template <typename I, typename N, typename V> component_set<mln_ch_value(I,V)> lines_h_single(const Image<I>& input_, - const Neighborhood<N>& nbh_, const V& nlines, + const Neighborhood<N>& nbh_, const V& /* nlines */, unsigned min_line_length, float w_h_ratio) { diff --git a/scribo/scribo/primitive/extract/lines_v_single.hh b/scribo/scribo/primitive/extract/lines_v_single.hh index c2ab1ca..321e880 100644 --- a/scribo/scribo/primitive/extract/lines_v_single.hh +++ b/scribo/scribo/primitive/extract/lines_v_single.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2014 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -143,7 +143,7 @@ namespace scribo template <typename I, typename N, typename V> component_set<mln_ch_value(I,V)> lines_v_single(const Image<I>& input_, - const Neighborhood<N>& nbh_, const V& nlines, + const Neighborhood<N>& nbh_, const V& /* nlines */, unsigned min_line_length, float h_w_ratio) { diff --git a/scribo/src/primitive/group/group_from_rag.cc b/scribo/src/primitive/group/group_from_rag.cc index 86ea1b1..4064fc8 100644 --- a/scribo/src/primitive/group/group_from_rag.cc +++ b/scribo/src/primitive/group/group_from_rag.cc @@ -139,8 +139,8 @@ namespace scribo template <typename P, typename V, typename G, typename F, typename FP> edge_image<void,bool,G> graph_edges(const vertex_image<P,V,G>& v_ima, - const Function<F>& edge_values, - const Function<FP>& predicate) + const Function<F>& /* edge_values */, + const Function<FP>& /* predicate */) { typedef edge_image<void,bool,util::graph> e_filter_t; e_filter_t e_filter = mln::make::edge_image(v_ima, dist()); -- 1.7.10.4