[Olena-patches] Re: oln 10.146: Fix swilena. Fix oln_concrete_type.

from Niels Van Vliet &lt;niels(a)lrde.epita.fr&gt; * olena/oln/core/abstract/image.hh: Fix macro oln_concrete_type. * olena/tests/morpho/tests/gradient: New. +2004-04-12 Niels Van Vliet &lt;niels(a)lrde.epita.fr&gt; + * olena/oln/morpho/laplacian.inc: Add a FIXME. * olena/oln/morpho/watershed.hh: Add a FIXME. Index: tools/swilena/ChangeLog from Niels Van Vliet &lt;niels(a)lrde.epita.fr&gt; * tools/swilena/generate_morpho_instantiations.py: Remove maxima_killer minima_killer from swilena_morpho1d_* and swilena_morpho3d_*. Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Sun, 04 Apr 2004 16:48:06 +0200 odou_s (oln/t/25_image.hh 1.30 600) +++ olena/oln/core/abstract/image.hh Mon, 12 Apr 2004 12:19:23 +0200 van-vl_n (oln/t/25_image.hh 1.30 600) @@ -341,7 +341,7 @@ mlc_exact_type_(ImgType)::value_type # define oln_concrete_type(ImgType) \ -typename mute<ImgType>::ret +typename oln::mute<ImgType>::ret # define oln_exact_type(ImgType) \ mlc_exact_type(ImgType) Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 01:09:38 +0200 van-vl_n (oln/v/24_generate_m 1.7 700) +++ tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 11:32:41 +0200 van-vl_n (oln/v/24_generate_m 1.7 700) @@ -146,6 +146,7 @@ instantiate(idx, "hybrid_regional_minima", bin_img_type, img_type, neighb_type) # Extrema killers + if dim == 2: instantiate(idx, "fast_maxima_killer", img_type, neighb_type) instantiate(idx, "fast_minima_killer", img_type, neighb_type) # FIXME: This should work with other types. Index: olena/tests/morpho/tests/gradient --- olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:46 +0200 van-vl_n () +++ olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:35 +0200 van-vl_n (oln/r/1_gradient 644) @@ -0,0 +1,39 @@ +// -*- c++ -*- + +#include <oln/basics2d.hh> +#include <oln/morpho/gradient.hh> +#include <oln/level/compare.hh> +#include <ntg/all.hh> +#include "check.hh" +#include "data.hh" + + +#define OK_OR_FAIL \ + std::cout << "OK" << std::endl; \ + else \ + { \ + std::cout << "FAIL" << std::endl; \ + fail = true; \ + } + +template<class I> +bool are_not_eq(const oln::abstract::non_vectorial_image_with_dim<2, I> &im) +{ + return + !oln::level::is_equal(oln::morpho::fast::beucher_gradient(im, + oln::win_c8p()), + oln::morpho::beucher_gradient(im, oln::win_c8p())); +} + + +bool +check() +{ + bool fail = false; + + oln::image2d<ntg::int_u8> im8(oln::load(rdata("lena256.pgm"))); + if (are_not_eq(im8) == false) + OK_OR_FAIL; + + return fail; +}