[Olena-patches] olena-2.0-218-g096f327 Fix a warning.

* mln/canvas/labeling/sorted.hh, * mln/canvas/labeling/video.hh: Remove unused attribute. --- milena/ChangeLog | 7 +++++++ milena/mln/canvas/labeling/sorted.hh | 6 ++---- milena/mln/canvas/labeling/video.hh | 5 +---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 024e441..2078514 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a warning. + + * mln/canvas/labeling/sorted.hh, + * mln/canvas/labeling/video.hh: Remove unused attribute. + 2012-09-28 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/debug/draw_graph.hh: Add a new overload and fix comments. diff --git a/milena/mln/canvas/labeling/sorted.hh b/milena/mln/canvas/labeling/sorted.hh index 69f2181..6eb2ab0 100644 --- a/milena/mln/canvas/labeling/sorted.hh +++ b/milena/mln/canvas/labeling/sorted.hh @@ -1,4 +1,5 @@ -// 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 +97,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // FIXME: Is-it useful? // Initialization. { @@ -167,7 +167,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 +178,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(); -- 1.7.2.5