Commit a1301988 authored by Roland Levillain's avatar Roland Levillain

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.
parent 66af4244
2014-07-03 Roland Levillain <roland@lrde.epita.fr>
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 <roland@lrde.epita.fr> 2014-07-02 Roland Levillain <roland@lrde.epita.fr>
Update Scribo's NEWS file. Update Scribo's NEWS file.
......
...@@ -398,6 +398,11 @@ namespace scribo ...@@ -398,6 +398,11 @@ namespace scribo
logger_::log_image(Level dbg_level, logger_::log_image(Level dbg_level,
const Image<I>& ima, const char *name) 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 # ifndef SCRIBO_NDEBUG
if (level_ < dbg_level) if (level_ < dbg_level)
return; return;
......
// Copyright (C) 2009, 2010, 2011 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2014 EPITA Research and Development
// Laboratory (LRDE) // Laboratory (LRDE).
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -137,7 +137,7 @@ namespace scribo ...@@ -137,7 +137,7 @@ namespace scribo
mln_concrete(I) mln_concrete(I)
objects_thick(const Image<I>& input_, objects_thick(const Image<I>& input_,
const Neighborhood<N>& nbh_, const Neighborhood<N>& nbh_,
const V& label_type, const V& /* label_type */,
unsigned max_thickness) unsigned max_thickness)
{ {
mln_trace("scribo::filter::objects_thick"); mln_trace("scribo::filter::objects_thick");
......
// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory // Copyright (C) 2009, 2011, 2014 EPITA Research and Development
// (LRDE) // Laboratory (LRDE).
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -84,7 +84,7 @@ namespace scribo ...@@ -84,7 +84,7 @@ namespace scribo
mln::util::couple<mln::util::array<box<mln_site(I)> >, mln::util::couple<mln::util::array<box<mln_site(I)> >,
mln::util::array<box<mln_site(I)> > > mln::util::array<box<mln_site(I)> > >
cells(const Image<I>& input_, 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"); mln_trace("scribo::primitive::cells");
......
// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and // Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 EPITA Research and
// Development Laboratory (LRDE) // Development Laboratory (LRDE).
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -146,7 +146,7 @@ namespace scribo ...@@ -146,7 +146,7 @@ namespace scribo
template <typename I, typename N, typename V> template <typename I, typename N, typename V>
component_set<mln_ch_value(I,V)> component_set<mln_ch_value(I,V)>
lines_h_single(const Image<I>& input_, 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, unsigned min_line_length,
float w_h_ratio) float w_h_ratio)
{ {
......
// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2012, 2014 EPITA Research and
// Laboratory (LRDE) // Development Laboratory (LRDE).
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -143,7 +143,7 @@ namespace scribo ...@@ -143,7 +143,7 @@ namespace scribo
template <typename I, typename N, typename V> template <typename I, typename N, typename V>
component_set<mln_ch_value(I,V)> component_set<mln_ch_value(I,V)>
lines_v_single(const Image<I>& input_, 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, unsigned min_line_length,
float h_w_ratio) float h_w_ratio)
{ {
......
...@@ -139,8 +139,8 @@ namespace scribo ...@@ -139,8 +139,8 @@ namespace scribo
template <typename P, typename V, typename G, typename F, typename FP> template <typename P, typename V, typename G, typename F, typename FP>
edge_image<void,bool,G> edge_image<void,bool,G>
graph_edges(const vertex_image<P,V,G>& v_ima, graph_edges(const vertex_image<P,V,G>& v_ima,
const Function<F>& edge_values, const Function<F>& /* edge_values */,
const Function<FP>& predicate) const Function<FP>& /* predicate */)
{ {
typedef edge_image<void,bool,util::graph> e_filter_t; typedef edge_image<void,bool,util::graph> e_filter_t;
e_filter_t e_filter = mln::make::edge_image(v_ima, dist()); e_filter_t e_filter = mln::make::edge_image(v_ima, dist());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment