[Olena-patches] [PATCH 16/31] Fix missing updates about debug colorize.

* mln/debug/all.hh, * tests/morpho/meyer_wst_long.cc: Fix missing updates about debug colorize. * mln/registration/icp.hh: Likewise; unused so remove. --- milena/ChangeLog | 9 +++++++++ milena/mln/debug/all.hh | 8 ++++---- milena/mln/registration/icp.hh | 1 - milena/tests/morpho/meyer_wst_long.cc | 7 ++++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a68e195..f9eea0c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-05-07 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; + Fix missing updates about debug colorize. + + * mln/debug/all.hh, + * tests/morpho/meyer_wst_long.cc: + Fix missing updates about debug colorize. + * mln/registration/icp.hh: Likewise; unused so remove. + +2009-05-07 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; + Mix missing updates in mln::set. * mln/set/all.hh: Update. diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index dd1fda8..814c95b 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -40,14 +40,14 @@ namespace mln /// Namespace of routines that help to debug. namespace debug { + /// Implementation namespace of debug namespace. namespace impl {} - } + } } -# include <mln/debug/colorize.hh> # include <mln/debug/format.hh> # include <mln/debug/draw_graph.hh> # include <mln/debug/histo.hh> diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 057242f..540efba 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -62,7 +62,6 @@ # include <mln/io/ppm/save.hh> # include <mln/io/pbm/save.hh> -# include <mln/debug/colorize.hh> # include <mln/debug/histo.hh> # include <mln/accu/histo.hh> diff --git a/milena/tests/morpho/meyer_wst_long.cc b/milena/tests/morpho/meyer_wst_long.cc index ecfe614..ba76290 100644 --- a/milena/tests/morpho/meyer_wst_long.cc +++ b/milena/tests/morpho/meyer_wst_long.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -50,7 +51,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/debug/colorize.hh> +#include <mln/labeling/colorize.hh> #include "tests/data.hh" @@ -73,5 +74,5 @@ int main() image2d<L> ws = morpho::meyer_wst(clo, c4(), nbasins); // Save the image in color. - io::ppm::save(debug::colorize(value::rgb8(), ws, nbasins), "out.ppm"); + io::ppm::save(labeling::colorize(value::rgb8(), ws, nbasins), "out.ppm"); } -- 1.6.1.2