[Olena-patches] 3470: Small fixes (again).

* mln/level/approx/median.hh: call diameter() instead of length() on win::ball. * mln/level/convert.hh: fix a return type. * mln/morpho/closing/essential.hh, * mln/morpho/essential.hh, * mln/morpho/opening/essential.hh: Fix includes. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/level/approx/median.hh | 2 +- milena/mln/level/convert.hh | 2 +- milena/mln/morpho/closing/essential.hh | 5 +++-- milena/mln/morpho/essential.hh | 2 -- milena/mln/morpho/opening/essential.hh | 5 +++-- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6e55f81..16c404d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2009-03-03 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Small fixes (again). + + * mln/level/approx/median.hh: call diameter() instead of length() on + win::ball. + + * mln/level/convert.hh: fix a return type. + + * mln/morpho/closing/essential.hh, + * mln/morpho/essential.hh, + * mln/morpho/opening/essential.hh: Fix includes. + +2009-03-03 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Small fixes related to morpho. * mln/morpho/closing/area.hh: update copyright. diff --git a/milena/mln/level/approx/median.hh b/milena/mln/level/approx/median.hh index 5bf1a9e..d950ccb 100644 --- a/milena/mln/level/approx/median.hh +++ b/milena/mln/level/approx/median.hh @@ -136,7 +136,7 @@ namespace mln { trace::entering("level::approx::median"); - const unsigned len = win.length() / 3 + 1; + const unsigned len = win.diameter() / 3 + 1; mln_concrete(I) output; win::diag2d win1(len); diff --git a/milena/mln/level/convert.hh b/milena/mln/level/convert.hh index 39da091..e3149ff 100644 --- a/milena/mln/level/convert.hh +++ b/milena/mln/level/convert.hh @@ -99,7 +99,7 @@ namespace mln template <typename V, typename I> inline - mln_concrete(I) + mln_ch_value(I,V) convert_identity(const V& v, const Image<I>& input) { trace::entering("level::impl::convert_identity"); diff --git a/milena/mln/morpho/closing/essential.hh b/milena/mln/morpho/closing/essential.hh index a478a2c..a0f8055 100644 --- a/milena/mln/morpho/closing/essential.hh +++ b/milena/mln/morpho/closing/essential.hh @@ -34,10 +34,11 @@ /// File that includes essential closing attributes. #include <mln/morpho/closing/algebraic.hh> -#include <mln/morpho/closing/leveling.hh> #include <mln/morpho/closing/area.hh> -#include <mln/morpho/closing/volume.hh> #include <mln/morpho/closing/height.hh> +#include <mln/morpho/closing/leveling.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/closing/volume.hh> #endif // ! MLN_MORPHO_CLOSING_ESSENTIAL_HH diff --git a/milena/mln/morpho/essential.hh b/milena/mln/morpho/essential.hh index d16fcce..8034b86 100644 --- a/milena/mln/morpho/essential.hh +++ b/milena/mln/morpho/essential.hh @@ -33,7 +33,6 @@ /// File that includes essential morpho-related routines. -# include <mln/morpho/closing.hh> # include <mln/morpho/dilation.hh> # include <mln/morpho/erosion.hh> # include <mln/morpho/gradient.hh> @@ -41,7 +40,6 @@ # include <mln/morpho/includes.hh> # include <mln/morpho/laplacian.hh> # include <mln/morpho/meyer_wst.hh> -# include <mln/morpho/opening.hh> # include <mln/morpho/rank_filter.hh> # include <mln/morpho/top_hat.hh> diff --git a/milena/mln/morpho/opening/essential.hh b/milena/mln/morpho/opening/essential.hh index 45fbdae..77bcf16 100644 --- a/milena/mln/morpho/opening/essential.hh +++ b/milena/mln/morpho/opening/essential.hh @@ -34,10 +34,11 @@ /// File that includes essential opening attributes. #include <mln/morpho/opening/algebraic.hh> -#include <mln/morpho/opening/leveling.hh> #include <mln/morpho/opening/area.hh> -#include <mln/morpho/opening/volume.hh> #include <mln/morpho/opening/height.hh> +#include <mln/morpho/opening/leveling.hh> +#include <mln/morpho/opening/structural.hh> +#include <mln/morpho/opening/volume.hh> #endif // ! MLN_MORPHO_OPENING_ESSENTIAL_HH -- 1.5.6.5