[Olena-patches] olena-2.0-105-g9352b4d Address more compiler warnings.

* mln/canvas/labeling/generic.hh, * mln/canvas/labeling/sorted.hh, * mln/canvas/labeling/video.hh, * apps/papers/levillain.09.ismm/classif-graph.cc: Remove unused variables. * mln/morpho/reconstruction/by_erosion/union_find.hh, * tests/accu/site_set/rectangularity.cc, * tests/core/other/var.cc, * tests/trait/op/plus.cc: Ignore unused variables. * mln/morpho/reconstruction/by_dilation/union_find.hh: Adjust style for uniformity purposes. --- milena/ChangeLog | 14 ++++++++++++++ .../apps/papers/levillain.09.ismm/classif-graph.cc | 4 +--- milena/mln/canvas/labeling/generic.hh | 5 +---- milena/mln/canvas/labeling/sorted.hh | 5 +---- milena/mln/canvas/labeling/video.hh | 5 +---- .../reconstruction/by_dilation/union_find.hh | 5 ++--- .../morpho/reconstruction/by_erosion/union_find.hh | 4 +++- milena/tests/accu/site_set/rectangularity.cc | 3 ++- milena/tests/core/other/var.cc | 8 +++++++- milena/tests/trait/op/plus.cc | 1 + 10 files changed, 33 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 01eefa4..34fc674 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2013-03-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Address more compiler warnings. + + * mln/canvas/labeling/generic.hh, + * mln/canvas/labeling/sorted.hh, + * mln/canvas/labeling/video.hh, + * apps/papers/levillain.09.ismm/classif-graph.cc: + Remove unused variables. + * mln/morpho/reconstruction/by_erosion/union_find.hh: + Ignore unused variables. + * mln/morpho/reconstruction/by_dilation/union_find.hh: + Style adjustment. + +2013-03-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix apps/morphers/Makefile.am. * apps/morphers/Makefile.am: Include diff --git a/milena/apps/papers/levillain.09.ismm/classif-graph.cc b/milena/apps/papers/levillain.09.ismm/classif-graph.cc index f832c11..277bda8 100644 --- a/milena/apps/papers/levillain.09.ismm/classif-graph.cc +++ b/milena/apps/papers/levillain.09.ismm/classif-graph.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -202,7 +202,6 @@ make_graph_image(const mln::image2d<bool>& seeds) for_all(e) { // Site associated to E. - site_t p = e; point2d p1 = e.first(); point2d p2 = e.second(); @@ -275,7 +274,6 @@ main(int argc, char* argv[]) for_all(e) { // Site associated to E. - util::site_pair<point2d> p = e; point2d p1 = e.first(); point2d p2 = e.second(); diff --git a/milena/mln/canvas/labeling/generic.hh b/milena/mln/canvas/labeling/generic.hh index b701e42..42511e3 100644 --- a/milena/mln/canvas/labeling/generic.hh +++ b/milena/mln/canvas/labeling/generic.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -100,7 +100,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // FIXME: Is-it useful? // Initialization. { @@ -157,7 +156,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); @@ -170,7 +168,6 @@ namespace mln else output(p) = output(parent(p)); } - status = true; } trace::exiting("canvas::labeling::impl::generic::labeling"); diff --git a/milena/mln/canvas/labeling/sorted.hh b/milena/mln/canvas/labeling/sorted.hh index 69f2181..b176139 100644 --- a/milena/mln/canvas/labeling/sorted.hh +++ b/milena/mln/canvas/labeling/sorted.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -96,7 +96,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // FIXME: Is-it useful? // Initialization. { @@ -167,7 +166,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); @@ -179,7 +177,6 @@ namespace mln else output.element(p) = output.element(parent.element(p)); } - status = true; } trace::exiting("canvas::impl::labeling::sorted_fastest"); diff --git a/milena/mln/canvas/labeling/video.hh b/milena/mln/canvas/labeling/video.hh index b46e930..9735772 100644 --- a/milena/mln/canvas/labeling/video.hh +++ b/milena/mln/canvas/labeling/video.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -87,7 +87,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // Initialization. { @@ -155,7 +154,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels for \ this label type: nlabels > \ max(label_type)."); @@ -172,7 +170,6 @@ namespace mln f.set_label_(p, lbl); } } - status = true; } f.finalize(); diff --git a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh index 35ec2ae..7582f43 100644 --- a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -225,11 +225,10 @@ namespace mln const Image<I>& f, const Image<J>& g, const Neighborhood<N>& nbh) { + // FIXME: Not yet implemented. (void) f; (void) g; (void) nbh; - - // FIXME: Not yet implemented. std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" "mln::morpho::reconstruction::by_dilation::internal::\n" diff --git a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh index b367f7b..ae65bae 100644 --- a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2013 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -224,6 +224,8 @@ namespace mln const Neighborhood<N>& nbh) { // FIXME: Not yet implemented. + (void) f; + (void) g; (void) nbh; std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" diff --git a/milena/tests/accu/site_set/rectangularity.cc b/milena/tests/accu/site_set/rectangularity.cc index 8919494..51b4c85 100644 --- a/milena/tests/accu/site_set/rectangularity.cc +++ b/milena/tests/accu/site_set/rectangularity.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -61,5 +61,6 @@ int main() { accu::site_set::rectangularity<point2d> a; accu::site_set::rectangularity<point2d> b = exact(a); + (void) b; } } diff --git a/milena/tests/core/other/var.cc b/milena/tests/core/other/var.cc index 4e6fa76..72d02d4 100644 --- a/milena/tests/core/other/var.cc +++ b/milena/tests/core/other/var.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -56,17 +56,23 @@ void test_template() { mln_PITER(p, ima.domain()); mln_NITER(n, neighb, p); + (void) n; mln_QITER(q, win, p); + (void) q; } { mln_FWD_PITER(p, ima.domain()); mln_FWD_NITER(n, neighb, p); + (void) n; mln_FWD_QITER(q, win, p); + (void) q; } { mln_BKD_PITER(p, ima.domain()); mln_BKD_NITER(n, neighb, p); + (void) n; mln_BKD_QITER(q, win, p); + (void) q; } util::array<point2d> arr; diff --git a/milena/tests/trait/op/plus.cc b/milena/tests/trait/op/plus.cc index 6639a43..aef8f75 100644 --- a/milena/tests/trait/op/plus.cc +++ b/milena/tests/trait/op/plus.cc @@ -116,6 +116,7 @@ int main() { mln_trait_op_plus_(int, float) tmp; tmp = 5.1f; + (void) tmp; } { my_image2d<float> ima; -- 1.7.2.5