[Olena-patches] 4493: Small changes.

* mln/geom/translate.hh: Add a missing header. * mln/linear/gaussian.hh: Fix compilation warnings. * mln/io/plot/save.hh, * mln/value/hsl.hh: Add fixmes according to Yann's comments. --- milena/ChangeLog | 11 +++++++++++ milena/mln/geom/translate.hh | 2 ++ milena/mln/io/plot/save.hh | 6 ++++-- milena/mln/linear/gaussian.hh | 16 ++++++++-------- milena/mln/value/hsl.hh | 2 ++ 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba5ebd3..7e852dc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-09-21 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Small changes. + + * mln/geom/translate.hh: Add a missing header. + + * mln/linear/gaussian.hh: Fix compilation warnings. + + * mln/io/plot/save.hh, + * mln/value/hsl.hh: Add fixmes according to Yann's comments. + 2009-09-15 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; * mln/linear/gaussian.hh: Make linear::gaussian more generic. diff --git a/milena/mln/geom/translate.hh b/milena/mln/geom/translate.hh index 334edc8..ea3c65f 100644 --- a/milena/mln/geom/translate.hh +++ b/milena/mln/geom/translate.hh @@ -44,6 +44,8 @@ # include <mln/literal/zero.hh> +# include <mln/geom/bbox.hh> + namespace mln { diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index 3541b55..1a01267 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -66,9 +66,11 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> + + // FIXME: Make it generic. + template <typename T> inline - void save(const image1d<I>& ima, const std::string& filename) + void save(const image1d<T>& ima, const std::string& filename) { trace::entering("mln::io::plot::save"); diff --git a/milena/mln/linear/gaussian.hh b/milena/mln/linear/gaussian.hh index 50cb8bb..9c64fe2 100644 --- a/milena/mln/linear/gaussian.hh +++ b/milena/mln/linear/gaussian.hh @@ -398,7 +398,7 @@ namespace mln if (dir == 0) { // Apply on rows. - for (unsigned j = geom::min_col(img); j <= geom::max_col(img); ++j) + for (def::coord j = geom::min_col(img); j <= geom::max_col(img); ++j) recursivefilter_<mln_value(I)>(img, coef, point2d(static_cast<def::coord>(geom::min_row(img) - img.border()), static_cast<def::coord>(j)), @@ -412,7 +412,7 @@ namespace mln if (dir == 1) { // Apply on columns. - for (unsigned i = geom::min_row(img); i <= geom::max_row(img); ++i) + for (def::coord i = geom::min_row(img); i <= geom::max_row(img); ++i) recursivefilter_<mln_value(I)>(img, coef, point2d(static_cast<def::coord>(i), static_cast<def::coord>(geom::min_col(img) - img.border())), @@ -436,8 +436,8 @@ namespace mln if (dir == 0) { // Apply on slices. - for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) - for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) + for (def::coord j = geom::min_row(img); j <= geom::max_row(img); ++j) + for (def::coord k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(-img.border()), static_cast<def::coord>(j), @@ -455,8 +455,8 @@ namespace mln if (dir == 1) { // Apply on rows. - for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) - for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) + for (def::coord i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (def::coord k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(-img.border()), @@ -473,8 +473,8 @@ namespace mln if (dir == 2) { // Apply on columns. - for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) - for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) + for (def::coord i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (def::coord j = geom::min_row(img); j <= geom::max_row(img); ++j) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(j), diff --git a/milena/mln/value/hsl.hh b/milena/mln/value/hsl.hh index f27bcbb..0901904 100644 --- a/milena/mln/value/hsl.hh +++ b/milena/mln/value/hsl.hh @@ -199,6 +199,8 @@ namespace mln L lum_; }; + + // FIXME: Use float01_8/float01_16 ? typedef hsl_<float, float, float> hsl_f; typedef hsl_<double, double, double> hsl_d; -- 1.5.6.5