September 2008 - Olena-patches

cleanup-2008 r2312: make seed2tiling_roundness test compile
by Guillaume Lazzara 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> make seed2tiling_roundness test compile. * milena/mln/convert/to_image.hh: use operator(point1d p) instead of operator(int index). * milena/mln/display/color_pretty.hh: add missing header. * milena/mln/geom/chamfer.hh: Use pw::cst(bool) with operator |. --- convert/to_image.hh | 2 +- display/color_pretty.hh | 1 - geom/chamfer.hh | 13 +++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) Index: branches/cleanup-2008/milena/mln/convert/to_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2311) +++ branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2312) @@ -198,7 +198,7 @@ v_max = h.vset()[h.vset().nvalues() - 1]; image1d<std::size_t> ima(make::box1d(v_min, v_max)); for(unsigned i = 0; i < h.vset().nvalues(); ++i) - ima(i) = h[i]; + ima(point1d(i)) = h[i]; return ima; } Index: branches/cleanup-2008/milena/mln/geom/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2311) +++ branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2312) @@ -38,8 +38,13 @@ # include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/inplace.hh> +# include <mln/core/image/image_if.hh> # include <mln/canvas/chamfer.hh> +//FIXME: to be removed when ima | bool will be supported. +// See init(). +# include <mln/pw/all.hh> + namespace mln { @@ -58,7 +63,7 @@ namespace impl { - // \internal Functors. + // Functors. template <typename I_, typename W_> struct chamfer_t @@ -78,8 +83,8 @@ inline void init() { initialize(output, exact(input)); - level::fill(inplace(output | (input | true).domain()), 0); - level::fill(inplace(output | (input | false).domain()), max); } + level::fill(inplace(output | (input | pw::cst(true)).domain()), 0); + level::fill(inplace(output | (input | pw::cst(false)).domain()), max); } inline bool handles(const P& p) const { return input(p) == false; } @@ -93,7 +98,7 @@ {} }; - /// \internal Routines. + /// Routines. template <typename I, typename W> inline Index: branches/cleanup-2008/milena/mln/display/color_pretty.hh =================================================================== --- branches/cleanup-2008/milena/mln/display/color_pretty.hh (revision 2311) +++ branches/cleanup-2008/milena/mln/display/color_pretty.hh (revision 2312) @@ -35,7 +35,6 @@ */ # include <mln/trait/image_from_mesh.hh> -# include <mln/core/image_if_value.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh>

1 0

cleanup-2008 r2311: Make w_window compile
by Guillaume Lazzara 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Make w_window compile. * milena/mln/core/site_set/p_priority.hh: Add missing comparison operator. * milena/mln/core/w_window.hh, * milena/mln/core/concept/weighted_window.hh: Update typedefs. --- concept/weighted_window.hh | 31 ++++++++++++++++--------------- site_set/p_priority.hh | 3 ++- w_window.hh | 25 +++++++++++++++---------- 3 files changed, 33 insertions(+), 26 deletions(-) Index: branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh (revision 2310) +++ branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh (revision 2311) @@ -39,6 +39,7 @@ # include <mln/core/site_set/p_double.hh> # include <mln/core/internal/site_set_base.hh> # include <mln/util/set.hh> +# include <mln/util/ord.hh> namespace mln @@ -177,7 +178,7 @@ protected: util::set p_; - std::map<P,Q> q_; + std::map<P, Q, util::ord > q_; unsigned n_; // Run invariance tests and return the result. Index: branches/cleanup-2008/milena/mln/core/w_window.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/w_window.hh (revision 2310) +++ branches/cleanup-2008/milena/mln/core/w_window.hh (revision 2311) @@ -38,6 +38,8 @@ # include <mln/core/window.hh> # include <mln/core/concept/weighted_window.hh> # include <mln/core/dpsites_piter.hh> +# include <mln/value/ops.hh> +# include <mln/util/ord.hh> namespace mln { @@ -56,11 +58,14 @@ template <typename D, typename W> struct w_window : public Weighted_Window< w_window<D,W> > { - /// Site associated type. - typedef mln_point(D) point; + /// DPsite associated type. + typedef D dpsite; + + /// Psite associated type. + typedef mln_psite(D) psite; - /// Dpsite associated type. - typedef D dpoint; + /// Site associated type. + typedef mln_site(D) site; /// Weight associated type. typedef W weight; @@ -70,10 +75,10 @@ /// Site_Iterator type to browse (forward) the points of a generic w_window. - typedef with_w_< dpsites_fwd_piter<D>, W > fwd_qiter; + typedef with_w_< dpsites_fwd_piter< w_window<D, W> >, W > fwd_qiter; /// Site_Iterator type to browse (backward) the points of a generic w_window. - typedef with_w_< dpsites_bkd_piter<D>, W > bkd_qiter; + typedef with_w_< dpsites_bkd_piter< w_window<D, W> >, W > bkd_qiter; /// Constructor without argument. @@ -98,7 +103,7 @@ unsigned size() const; /// Give access to the vector of delta-points. - const std::vector<D>& vect() const; + const std::vector<D>& std_vector() const; /// Give the corresponding window. const mln::window<D>& win() const; @@ -208,9 +213,9 @@ template <typename D, typename W> inline const std::vector<D>& - w_window<D,W>::vect() const + w_window<D,W>::std_vector() const { - return win_.vect(); + return win_.std_vector(); } template <typename D, typename W> @@ -244,7 +249,7 @@ return *this; // memorization: d_i -> w_i - std::map<D, W> memo_wei_; + std::map<D, W, util::ord<D> > memo_wei_; for (unsigned i = 0; i < win_.size(); ++i) memo_wei_[win_.dp(i)] = wei_[i]; Index: branches/cleanup-2008/milena/mln/core/concept/weighted_window.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/concept/weighted_window.hh (revision 2310) +++ branches/cleanup-2008/milena/mln/core/concept/weighted_window.hh (revision 2311) @@ -41,7 +41,7 @@ { // Fwd decl. - template <typename E> struct Weighted_Window; + template <typename W> struct Weighted_Window; // Weighted_Window category flag type. template <> @@ -57,8 +57,8 @@ * \see mln::doc::Weighted_Window for a complete documentation of * this class contents. */ - template <typename E> - struct Weighted_Window : public Object<E> + template <typename W> + struct Weighted_Window : public Object<W> { typedef Weighted_Window<void> category; @@ -66,8 +66,9 @@ typedef fwd_qiter; typedef bkd_piter; - typedef point; - typedef dpoint; + typedef dpsite; + typedef psite; + typedef site; typedef weight; typedef window; @@ -109,22 +110,22 @@ # ifndef MLN_INCLUDE_ONLY - template <typename E> + template <typename W> inline - Weighted_Window<E>::Weighted_Window() + Weighted_Window<W>::Weighted_Window() { - typedef mln_point(E) point; - typedef mln_dpoint(E) dpoint; - typedef mln_weight(E) weight; - typedef mln_window(E) window; + //typedef mln_psite(E) point; + //typedef mln_dpsite(E) dpoint; + typedef mln_weight(W) weight; + typedef mln_window(W) window; - typedef mln_fwd_qiter(E) fwd_qiter; - typedef mln_bkd_qiter(E) bkd_qiter; + typedef mln_fwd_qiter(W) fwd_qiter; + typedef mln_bkd_qiter(W) bkd_qiter; - E& (E::*m1)() = & E::sym; + W& (W::*m1)() = & W::sym; m1 = 0; - const window& (E::*m2)() const = & E::win; + const window& (W::*m2)() const = & W::win; m2 = 0; }

1 0

cleanup-2008 r2310: Rename owns_() to has()
by Guillaume Lazzara 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Rename owns_() to has(). * milena/mln/core/image/lazy_image.hh, * milena/mln/morpho/dilation.hh: here. --- core/image/lazy_image.hh | 12 ++++++------ morpho/dilation.hh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) Index: branches/cleanup-2008/milena/mln/core/image/lazy_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/lazy_image.hh (revision 2309) +++ branches/cleanup-2008/milena/mln/core/image/lazy_image.hh (revision 2310) @@ -49,7 +49,7 @@ namespace internal { - /// \internal Data structure for \c mln::lazy_image. + /// Data structure for \c mln::lazy_image. template <typename I, typename F, typename B> struct data< lazy_image<I,F,B> > { @@ -128,7 +128,7 @@ const box2d& domain() const; /// Test if a pixel value is accessible at \p p. - bool owns_(const mln_psite(I)&) const; + bool has(const mln_psite(I)&) const; /// Read-only access of pixel value at point site \p p. mln_result(F) operator()(const mln_psite(I)& p) const; @@ -164,9 +164,9 @@ template <typename I, typename F, typename B> inline - bool lazy_image<I,F,B>::owns_(const mln_psite(I)& p) const + bool lazy_image<I,F,B>::has(const mln_psite(I)& p) const { - return this->data_->ima_.owns_(p); + return this->data_->ima_.has(p); } template <typename I, typename F, typename B> @@ -174,7 +174,7 @@ mln_result(F) lazy_image<I,F,B>::operator()(const mln_psite(I)& p) const { - mln_assertion(this->owns_(p)); + mln_assertion(this->has(p)); if (this->data_->is_known(p)) return this->data_->ima_(p); this->data_->ima_(p) = this->data_->fun(p); @@ -188,7 +188,7 @@ typename lazy_image<I,F,B>::lvalue lazy_image<I,F,B>::operator()(const mln_psite(I)& p) { - mln_assertion(this->owns_(p)); + mln_assertion(this->has(p)); if (this->data_->is_known(p)) return this->data_->ima_(p); this->data_->ima_(p) = this->data_->fun(p); Index: branches/cleanup-2008/milena/mln/morpho/dilation.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/dilation.hh (revision 2309) +++ branches/cleanup-2008/milena/mln/morpho/dilation.hh (revision 2310) @@ -99,7 +99,7 @@ for_all(p) { max.init(); - for_all(q) if (input.owns_(q)) + for_all(q) if (input.has(q)) max.take(input(q)); output(p) = max.to_result(); } @@ -122,7 +122,7 @@ mln_qiter(W) q(win, p); for_all(p) if (!input(p)) - for_all(q) if (input.owns_(q)) + for_all(q) if (input.has(q)) if (input(q)) { output(p) = true;

1 0

cleanup-2008 r2309: Do not exclude the concept directory from doc generation
by Guillaume Lazzara 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Do not exclude the concept directory from doc generation. * milena/doc/Doxyfile.in: do it. --- Doxyfile.in | 1 - 1 file changed, 1 deletion(-) Index: branches/cleanup-2008/milena/doc/Doxyfile.in =================================================================== --- branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2308) +++ branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2309) @@ -80,7 +80,6 @@ *.hcc RECURSIVE = YES EXCLUDE = @top_srcdir@/milena/sandbox \ - @top_srcdir@/milena/mln/core/concept \ @top_srcdir@/milena/mln/core/concept/proxy.hxx EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh

1 0

2308: Fix handling of arguments in mln::morpho::meyer_wst.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Fix duplicate conversion of argument `nbh_' to its exact type. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/meyer_wst.hh | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 16c2b93..90d6159 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix handling of arguments in mln::morpho::meyer_wst. + + * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Fix duplicate + conversion of argument `nbh_' to its exact type. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update tools/area_flooding. * tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. diff --git a/milena/mln/morpho/meyer_wst.hh b/milena/mln/morpho/meyer_wst.hh index 558c4d3..22021eb 100644 --- a/milena/mln/morpho/meyer_wst.hh +++ b/milena/mln/morpho/meyer_wst.hh @@ -107,11 +107,10 @@ namespace mln meyer_wst(const Image& input_, const Neighborhood<N>& nbh_, L& nbasins) { - I input = exact(input_); - N nbh = exact(nbh_); - /* FIXME: Ensure the input image has scalar values. */ - const N& nbh = exact(nbh_); + + const I input = exact(input_); + const N nbh = exact(nbh_); typedef L marker; const marker unmarked = literal::zero; -- 1.6.0.1

1 1

2307: Update tools/area_flooding.
by Roland Levillain 17 Sep '08

17 Sep '08

* tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. --- milena/ChangeLog | 6 ++++++ milena/tools/area_flooding.cc | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ad04ece..16c2b93 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update tools/area_flooding. + + * tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Re-enable some tests on line graph entities. * tests/core/image/line_graph_image.cc: Remove useless #include's. diff --git a/milena/tools/area_flooding.cc b/milena/tools/area_flooding.cc index 1ebef04..f10c7e0 100644 --- a/milena/tools/area_flooding.cc +++ b/milena/tools/area_flooding.cc @@ -110,7 +110,7 @@ int main(int argc, char* argv[]) `-----------*/ /* FIXME: I'm not sure this is the way it should be done. Anyway, - we should implemented this as a canvas. */ + we should implement this as a canvas. */ typedef line_graph_elt_neighborhood<point2d> nbh_t; nbh_t nbh; @@ -163,8 +163,10 @@ int main(int argc, char* argv[]) for_all(p) if (wshed(p) != wshed_label) { - wshed2d(p.to_psite().first()) = wshed(p); - wshed2d(p.to_psite().second()) = wshed(p); + // FIXME: Equip the iterator with first() and second() + // accessors? + wshed2d(p.unproxy_().first()) = wshed(p); + wshed2d(p.unproxy_().second()) = wshed(p); } // For each basin, compute the average gray level. -- 1.6.0.1

1 0

2306: Re-enable some tests on line graph entities.
by Roland Levillain 17 Sep '08

17 Sep '08

* tests/core/image/line_graph_image.cc: Remove useless #include's. Move morpho-related tests... * tests/morpho/line_graph_image_morpho.cc: ...here. * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable line_graph_image. (line_graph_image_SOURCES): Re-enable. * tests/morpho/Makefile.am (check_PROGRAMS): Add line_graph_image_morpho. (line_graph_image_morpho_SOURCES): New. --- milena/ChangeLog | 14 ++++++++ milena/tests/core/image/Makefile.am | 4 +- milena/tests/core/image/line_graph_image.cc | 21 ------------ milena/tests/morpho/Makefile.am | 2 + .../line_graph_image_morpho.cc} | 35 +------------------- 5 files changed, 19 insertions(+), 57 deletions(-) copy milena/tests/{core/image/line_graph_image.cc => morpho/line_graph_image_morpho.cc} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b9944a..ad04ece 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Re-enable some tests on line graph entities. + + * tests/core/image/line_graph_image.cc: Remove useless #include's. + Move morpho-related tests... + * tests/morpho/line_graph_image_morpho.cc: ...here. + * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable + line_graph_image. + (line_graph_image_SOURCES): Re-enable. + * tests/morpho/Makefile.am (check_PROGRAMS): Add + line_graph_image_morpho. + (line_graph_image_morpho_SOURCES): New. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update morpho::meyer_wst. * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 28024e7..5c7e6ac 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -17,7 +17,7 @@ check_PROGRAMS = \ image3d \ image_if \ ## interpolated \ -## line_graph_image \ + line_graph_image \ mono_obased_rle_image \ mono_rle_image \ obased_rle_image \ @@ -45,7 +45,7 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc image_if_SOURCES = image_if.cc ##interpolated_SOURCES = interpolated.cc -##line_graph_image_SOURCES = line_graph_image.cc +line_graph_image_SOURCES = line_graph_image.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/core/image/line_graph_image.cc index c57f3ab..2e7fbe4 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/core/image/line_graph_image.cc @@ -37,10 +37,6 @@ #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -137,21 +133,4 @@ int main() << std::endl; } std::cout << std::endl; - - /*--------------------------. - | Processing graph images. | - `--------------------------*/ - - line_graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - // Manual iteration over the domain of IMA_DIL. - mln_piter_(ima_t) p_dil(ima_dil.domain()); - for_all (p_dil) - std::cout << "ima_dil (" << p_dil << ") = " << ima_dil(p_dil) << std::endl; - std::cout << std::endl; - - line_graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - // Manual iteration over the domain of IMA_ERO. - mln_piter_(ima_t) p_ero(ima_ero.domain()); - for_all (p_ero) - std::cout << "ima_ero (" << p_ero << ") = " << ima_ero(p_ero) << std::endl; } diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index b913846..8955692 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -20,6 +20,7 @@ check_PROGRAMS = \ ## lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ ## line_graph_image_wst \ + line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ @@ -51,6 +52,7 @@ hit_or_miss_SOURCES = hit_or_miss.cc laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc +line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/morpho/line_graph_image_morpho.cc similarity index 81% copy from milena/tests/core/image/line_graph_image.cc copy to milena/tests/morpho/line_graph_image_morpho.cc index c57f3ab..2306513 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -35,12 +35,9 @@ #include <mln/core/image/line_graph_elt_window.hh> #include <mln/core/image/line_graph_window_piter.hh> +#include <mln/morpho/erosion.hh> #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -89,13 +86,6 @@ int main() p_line_graph<point2d> plg(g); - // Check adjacencies of edge 1. - mln_assertion( plg.adjacent(1, 0)); - mln_assertion(!plg.adjacent(1, 1)); - mln_assertion( plg.adjacent(1, 2)); - mln_assertion(!plg.adjacent(1, 3)); - mln_assertion( plg.adjacent(1, 4)); - /*-------------------. | Line graph image. | `-------------------*/ @@ -115,29 +105,6 @@ int main() typedef line_graph_image<point2d, int> ima_t; ima_t ima(plg, vertex_values, edge_values); - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" < win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "sites adjacent to " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" - << std::endl; - } - std::cout << std::endl; - /*--------------------------. | Processing graph images. | `--------------------------*/ -- 1.6.0.1

1 0

2305: Update morpho::meyer_wst.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the exact types of the arguments. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/meyer_wst.hh | 5 ++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e225c93..5b9944a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update morpho::meyer_wst. + + * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the + exact types of the arguments. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Improve the handling of a possibly unused variable in line_gradient. * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. diff --git a/milena/mln/morpho/meyer_wst.hh b/milena/mln/morpho/meyer_wst.hh index c566a60..558c4d3 100644 --- a/milena/mln/morpho/meyer_wst.hh +++ b/milena/mln/morpho/meyer_wst.hh @@ -104,9 +104,12 @@ namespace mln template <typename L, typename I, typename N> mln_ch_value(I, L) - meyer_wst(const Image& input, const Neighborhood<N>& nbh_, + meyer_wst(const Image& input_, const Neighborhood<N>& nbh_, L& nbasins) { + I input = exact(input_); + N nbh = exact(nbh_); + /* FIXME: Ensure the input image has scalar values. */ const N& nbh = exact(nbh_); -- 1.6.0.1

1 0

2304: Improve the handling of a possibly unused variable in line_gradient.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. --- milena/ChangeLog | 6 ++++++ milena/mln/morpho/line_gradient.hh | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 329f88a..e225c93 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Improve the handling of a possibly unused variable in line_gradient. + + * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in morpho::line_gradient. * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index c802d9a..f9b32b2 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -100,13 +100,10 @@ namespace mln for_all (q) if (ima.domain().has(q)) { - // Avoid a warning about an undefined variable when the - // NDEBUG is not defined. -#ifdef NDEBUG - g.add_edge(points[p], points[q]); -#else // !NDEBUG util::edge_id id = g.add_edge(points[p], points[q]); -#endif //!NDEBUG + // Avoid a warning about an undefined variable when NDEBUG + // is not defined. + (void) id; // The computed value is a norm of the gradient between P and Q. edge_values.push_back(math::abs(ima(p) - ima(q))); mln_assertion(id != mln_max(util::edge_id::equiv)); -- 1.6.0.1

1 0

2303: Fix a bug in morpho::line_gradient.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Iterate on the domain, not the extensible domain. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/line_gradient.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b74ec4..329f88a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in morpho::line_gradient. + + * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): + Iterate on the domain, not the extensible domain. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Use util::ord in morpho::line_gradient instead of ad hoc code. * mln/morpho/line_gradient.hh diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index fb42d13..c802d9a 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -98,7 +98,7 @@ namespace mln mln_fwd_qiter_(window2d) q(next_c4_win, p); for_all (p) for_all (q) - if (ima.has(q)) + if (ima.domain().has(q)) { // Avoid a warning about an undefined variable when the // NDEBUG is not defined. -- 1.6.0.1

1 0