URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-17 Guillaume Duhamel <guillaume.duhamel@lrde.epita.fr> Update typo and win_chamfer. Update win_chamfer. * mln/make/win_chamfer.hh, * tests/chamfer.cc, * tests/color_pretty.cc, * tests/seed2tiling.cc, * tests/show.cc: Update win_chamfer. Upudate typo. * mln/value/internal/all.hh: New typo. --- mln/make/win_chamfer.hh | 7 ++++--- mln/value/internal/all.hh | 41 +++++++++++++++++++++++++++++++++++++++++ tests/chamfer.cc | 6 +++--- tests/color_pretty.cc | 2 +- tests/seed2tiling.cc | 2 +- tests/show.cc | 2 +- 6 files changed, 51 insertions(+), 9 deletions(-) Index: trunk/milena/tests/chamfer.cc =================================================================== --- trunk/milena/tests/chamfer.cc (revision 1355) +++ trunk/milena/tests/chamfer.cc (revision 1356) @@ -54,7 +54,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); } @@ -62,7 +62,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 3> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 3> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); } @@ -70,7 +70,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_5x5_int<4, 6, 9> (); + const w_window2d_int& w_win = make::mk_chamfer_5x5_int<4, 6, 9> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); image2d<unsigned>::fwd_piter p(out.domain()); for_all(p) Index: trunk/milena/tests/seed2tiling.cc =================================================================== --- trunk/milena/tests/seed2tiling.cc (revision 1355) +++ trunk/milena/tests/seed2tiling.cc (revision 1356) @@ -75,7 +75,7 @@ image2d<int_u8> inte2(input.domain()); image2d<int_u8> out(input.domain()); - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2,3> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2,3> (); unsigned n; labeling::foreground(input, c4(), lab, n); Index: trunk/milena/tests/show.cc =================================================================== --- trunk/milena/tests/show.cc (revision 1355) +++ trunk/milena/tests/show.cc (revision 1356) @@ -58,7 +58,7 @@ // 0 2 0 // 2 p 2 // 0 2 0 - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); // Call chamfer for a distance image. image2d<unsigned> tmp = geom::chamfer(input, w_win, max); Index: trunk/milena/tests/color_pretty.cc =================================================================== --- trunk/milena/tests/color_pretty.cc (revision 1355) +++ trunk/milena/tests/color_pretty.cc (revision 1356) @@ -56,7 +56,7 @@ // 0 2 0 // 2 p 2 // 0 2 0 - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); // Call chamfer for a distance image. image2d<unsigned> tmp = geom::chamfer(input, w_win, max); Index: trunk/milena/mln/value/internal/all.hh =================================================================== --- trunk/milena/mln/value/internal/all.hh (revision 0) +++ trunk/milena/mln/value/internal/all.hh (revision 1356) @@ -0,0 +1,41 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_VALUE_INTERNAL_ALL_HH +# define MLN_VALUE_INTERNAL_ALL_HH + +/*! \file mln/value/internal/all.hh + * + * \brief FIXME + */ + +# include <mln/value/internal/encoding.hh> +# include <mln/value/internal/integer.hh> +# include <mln/value/internal/iterable_set.hh> +# include <mln/value/internal/value_like.hh> + +#endif // ! MLN_VALUE_INTERNAL_ALL_HH Index: trunk/milena/mln/make/win_chamfer.hh =================================================================== --- trunk/milena/mln/make/win_chamfer.hh (revision 1355) +++ trunk/milena/mln/make/win_chamfer.hh (revision 1356) @@ -43,7 +43,8 @@ namespace mln { - namespace win_chamfer + + namespace make { template<int d10, int d11> @@ -103,8 +104,8 @@ return (make::w_window2d(ws)); } - } // end of mln::win_chamfer + } // end of namespace mln::make -} // end of mln +} // end of namespace mln #endif // ! MLN_MAKE_WIN_CHAMFER_HH