[Olena-patches] 2866: Make level/median* tests compile.

* mln/canvas/browsing/dir_struct_elt_incr_update.hh: use def::coord. * mln/level/naive/median.hh, * mln/level/median.hh: update initialization of accu::median. * mln/trace/entering.hh, * mln/trace/exiting.hh, * mln/util/timer.hh: Fix doc. * tests/level/median_.cc: Fix test. * doc/tutorial/samples/out.ppm: should not be there. Removed. --- milena/ChangeLog | 17 +++++++++++++++++ milena/doc/tutorial/samples/out.ppm | Bin 145320 -> 0 bytes .../canvas/browsing/dir_struct_elt_incr_update.hh | 3 +-- milena/mln/level/median.hh | 4 ++-- milena/mln/level/naive/median.hh | 18 +++++++++--------- milena/mln/trace/entering.hh | 8 ++++---- milena/mln/trace/exiting.hh | 8 ++++---- milena/mln/util/timer.hh | 15 ++++++--------- milena/tests/level/median_.cc | 2 +- 9 files changed, 44 insertions(+), 31 deletions(-) delete mode 100644 milena/doc/tutorial/samples/out.ppm diff --git a/milena/ChangeLog b/milena/ChangeLog index 5a6dbc7..67bfc63 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2008-11-13 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Make level/median* tests compile. + + * mln/canvas/browsing/dir_struct_elt_incr_update.hh: use def::coord. + + * mln/level/naive/median.hh, + * mln/level/median.hh: update initialization of accu::median. + + * mln/trace/entering.hh, + * mln/trace/exiting.hh, + * mln/util/timer.hh: Fix doc. + + * tests/level/median_.cc: Fix test. + + * doc/tutorial/samples/out.ppm: should not be there. Removed. + 2008-11-13 Nicolas Ballas &lt;ballas(a)lrde.epita.fr&gt; Temporary fix in complex_image properties. diff --git a/milena/doc/tutorial/samples/out.ppm b/milena/doc/tutorial/samples/out.ppm deleted file mode 100644 index 7a33c29f788c3048de656608515af2b838ac61da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145320 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 diff --git a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh index 164c060..a5cc7fd 100644 --- a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh +++ b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh @@ -118,8 +118,7 @@ namespace mln mln_psite(I) pt, pu; - typedef mln_coord(I)& coord_ref; - coord_ref + def::coord& ct = pt[f.dir], cu = pu[f.dir], p_dir = f.p[f.dir]; diff --git a/milena/mln/level/median.hh b/milena/mln/level/median.hh index e224964..771c064 100644 --- a/milena/mln/level/median.hh +++ b/milena/mln/level/median.hh @@ -188,7 +188,7 @@ namespace mln struct median_dir_t { typedef I_ I; - enum { dim = I::point::dim }; + enum { dim = I::site::dim }; // i/o const I& input; @@ -210,7 +210,7 @@ namespace mln output(exact(output)), // aux data p(), - med(input.values_eligible()) + med() { } diff --git a/milena/mln/level/naive/median.hh b/milena/mln/level/naive/median.hh index e2034b9..f6a71b9 100644 --- a/milena/mln/level/naive/median.hh +++ b/milena/mln/level/naive/median.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -28,10 +29,9 @@ #ifndef MLN_LEVEL_NAIVE_MEDIAN_HH # define MLN_LEVEL_NAIVE_MEDIAN_HH -/*! \file mln/level/naive/median.hh - * - * \brief Naive version of median filtering. - */ +/// \file mln/level/naive/median.hh +/// +/// Naive version of median filtering. # include <mln/core/concept/image.hh> # include <mln/core/alias/window2d.hh> @@ -47,9 +47,9 @@ namespace mln namespace naive { - /*! Compute in \p output the median filter of image \p input by - * the window \p win. - * + /// Compute in \p output the median filter of image \p input by + /// the window \p win. + /*! * \param[in] input The image to be filtered. * \param[in] win The window. * \param[in,out] output The output image. @@ -79,7 +79,7 @@ namespace mln { mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); - accu::median_h<mln_vset(I)> med(input.values()); + accu::median_h<mln_value(I)> med; for_all(p) { diff --git a/milena/mln/trace/entering.hh b/milena/mln/trace/entering.hh index 20fc58d..dc8f707 100644 --- a/milena/mln/trace/entering.hh +++ b/milena/mln/trace/entering.hh @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 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 @@ -28,10 +29,9 @@ #ifndef MLN_TRACE_ENTERING_HH # define MLN_TRACE_ENTERING_HH -/*! \file mln/trace/entering.hh - * - * \brief Definition of the trace entering procedure. - */ +/// \file mln/trace/entering.hh +/// +/// Definition of the trace entering procedure. # include <string> # include <iostream> diff --git a/milena/mln/trace/exiting.hh b/milena/mln/trace/exiting.hh index 9b7e9f5..ad342a3 100644 --- a/milena/mln/trace/exiting.hh +++ b/milena/mln/trace/exiting.hh @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 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 @@ -28,10 +29,9 @@ #ifndef MLN_TRACE_EXITING_HH # define MLN_TRACE_EXITING_HH -/*! \file mln/trace/exiting.hh - * - * \brief Definition of the trace exiting procedure. - */ +/// \file mln/trace/exiting.hh +/// +/// Definition of the trace exiting procedure. # include <string> # include <iostream> diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 23aabd8..49b0b2e 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 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 @@ -28,10 +28,9 @@ #ifndef MLN_UTIL_TIMER_HH # define MLN_UTIL_TIMER_HH -/*! \file mln/util/timer.hh - * - * \brief Definition of a timer. - */ +/// \file mln/util/timer.hh +/// +/// Definition of a timer. # include <mln/core/concept/proxy.hh> # include <ctime> @@ -43,9 +42,7 @@ namespace mln namespace util { - /*! \brief Timer structure. - * - */ + /// Timer structure. class timer : public Proxy< timer >, public internal::proxy_impl<float, timer> { @@ -162,7 +159,7 @@ namespace mln time_ + float(std::clock()) / CLOCKS_PER_SEC - start_ : time_; } - + inline float timer::subj_() diff --git a/milena/tests/level/median_.cc b/milena/tests/level/median_.cc index 0821a44..3d97c7c 100644 --- a/milena/tests/level/median_.cc +++ b/milena/tests/level/median_.cc @@ -34,7 +34,7 @@ int main() { - win::rectangle2d rect(20, 20); + win::rectangle2d rect(21, 21); border::thickness = 6; image2d<int_u8> lena; -- 1.5.6.5