November 2010 - Olena-patches

last-svn-commit-664-gbc7c479 Regen mk files in Milena.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 7 ++++++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a56d47d..549ea7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen mk files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. * mln/world/rgb/invert.hh, diff --git a/milena/headers.mk b/milena/headers.mk index f986150..3d897e3 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -49,6 +49,7 @@ mln/accu/site_set/rectangularity.hh \ mln/accu/stat/all.hh \ mln/accu/stat/deviation.hh \ mln/accu/stat/essential.hh \ +mln/accu/stat/histo3d_rgb.hh \ mln/accu/stat/max.hh \ mln/accu/stat/max_h.hh \ mln/accu/stat/mean.hh \ @@ -141,6 +142,7 @@ mln/canvas/morpho/all.hh \ mln/canvas/morpho/attribute_filter.hh \ mln/canvas/morpho/essential.hh \ mln/canvas/morpho/internal/find_root.hh \ +mln/clustering/kmean_rgb.hh \ mln/convert/all.hh \ mln/convert/essential.hh \ mln/convert/from_to.hh \ @@ -556,6 +558,7 @@ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ mln/fun/v2v/qt_rgb_to_int_u.hh \ +mln/fun/v2v/rgb8_to_rgbn.hh \ mln/fun/v2v/rgb_to_int_u.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ @@ -1284,7 +1287,9 @@ mln/world/inter_pixel/immerse.hh \ mln/world/inter_pixel/is_pixel.hh \ mln/world/inter_pixel/is_separator.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/separator_to_pixels.hh +mln/world/inter_pixel/separator_to_pixels.hh \ +mln/world/rgb/invert.hh \ +mln/world/rgb/invert.spe.hh #<<lrde nobase_include_HEADERS += \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c5dba4c..5baced7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -229,6 +229,7 @@ mln_canvas_morpho_all \ mln_canvas_morpho_attribute_filter \ mln_canvas_morpho_essential \ mln_canvas_morpho_internal_find_root \ +mln_clustering_kmean_rgb \ mln_convert_all \ mln_convert_essential \ mln_convert_from_to \ @@ -668,6 +669,7 @@ mln_fun_v2v_linear \ mln_fun_v2v_norm \ mln_fun_v2v_projection \ mln_fun_v2v_qt_rgb_to_int_u \ +mln_fun_v2v_rgb8_to_rgbn \ mln_fun_v2v_rgb_to_hsi \ mln_fun_v2v_rgb_to_hsl \ mln_fun_v2v_rgb_to_int_u \ @@ -1410,7 +1412,9 @@ mln_world_inter_pixel_immerse \ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ -mln_world_inter_pixel_separator_to_pixels +mln_world_inter_pixel_separator_to_pixels \ +mln_world_rgb_invert \ +mln_world_rgb_invert_spe mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1549,6 +1553,7 @@ mln_canvas_morpho_all_SOURCES = mln_canvas_morpho_all.cc mln_canvas_morpho_attribute_filter_SOURCES = mln_canvas_morpho_attribute_filter.cc mln_canvas_morpho_essential_SOURCES = mln_canvas_morpho_essential.cc mln_canvas_morpho_internal_find_root_SOURCES = mln_canvas_morpho_internal_find_root.cc +mln_clustering_kmean_rgb_SOURCES = mln_clustering_kmean_rgb.cc mln_convert_all_SOURCES = mln_convert_all.cc mln_convert_essential_SOURCES = mln_convert_essential.cc mln_convert_from_to_SOURCES = mln_convert_from_to.cc @@ -1988,6 +1993,7 @@ mln_fun_v2v_linear_SOURCES = mln_fun_v2v_linear.cc mln_fun_v2v_norm_SOURCES = mln_fun_v2v_norm.cc mln_fun_v2v_projection_SOURCES = mln_fun_v2v_projection.cc mln_fun_v2v_qt_rgb_to_int_u_SOURCES = mln_fun_v2v_qt_rgb_to_int_u.cc +mln_fun_v2v_rgb8_to_rgbn_SOURCES = mln_fun_v2v_rgb8_to_rgbn.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc mln_fun_v2v_rgb_to_int_u_SOURCES = mln_fun_v2v_rgb_to_int_u.cc @@ -2731,4 +2737,6 @@ mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc +mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc +mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

1 0

last-svn-commit-665-g0731c7c Regen mk files in Milena.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 7 ++++++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a56d47d..549ea7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen mk files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. * mln/world/rgb/invert.hh, diff --git a/milena/headers.mk b/milena/headers.mk index f986150..3d897e3 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -49,6 +49,7 @@ mln/accu/site_set/rectangularity.hh \ mln/accu/stat/all.hh \ mln/accu/stat/deviation.hh \ mln/accu/stat/essential.hh \ +mln/accu/stat/histo3d_rgb.hh \ mln/accu/stat/max.hh \ mln/accu/stat/max_h.hh \ mln/accu/stat/mean.hh \ @@ -141,6 +142,7 @@ mln/canvas/morpho/all.hh \ mln/canvas/morpho/attribute_filter.hh \ mln/canvas/morpho/essential.hh \ mln/canvas/morpho/internal/find_root.hh \ +mln/clustering/kmean_rgb.hh \ mln/convert/all.hh \ mln/convert/essential.hh \ mln/convert/from_to.hh \ @@ -556,6 +558,7 @@ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ mln/fun/v2v/qt_rgb_to_int_u.hh \ +mln/fun/v2v/rgb8_to_rgbn.hh \ mln/fun/v2v/rgb_to_int_u.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ @@ -1284,7 +1287,9 @@ mln/world/inter_pixel/immerse.hh \ mln/world/inter_pixel/is_pixel.hh \ mln/world/inter_pixel/is_separator.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/separator_to_pixels.hh +mln/world/inter_pixel/separator_to_pixels.hh \ +mln/world/rgb/invert.hh \ +mln/world/rgb/invert.spe.hh #<<lrde nobase_include_HEADERS += \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c5dba4c..5baced7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -229,6 +229,7 @@ mln_canvas_morpho_all \ mln_canvas_morpho_attribute_filter \ mln_canvas_morpho_essential \ mln_canvas_morpho_internal_find_root \ +mln_clustering_kmean_rgb \ mln_convert_all \ mln_convert_essential \ mln_convert_from_to \ @@ -668,6 +669,7 @@ mln_fun_v2v_linear \ mln_fun_v2v_norm \ mln_fun_v2v_projection \ mln_fun_v2v_qt_rgb_to_int_u \ +mln_fun_v2v_rgb8_to_rgbn \ mln_fun_v2v_rgb_to_hsi \ mln_fun_v2v_rgb_to_hsl \ mln_fun_v2v_rgb_to_int_u \ @@ -1410,7 +1412,9 @@ mln_world_inter_pixel_immerse \ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ -mln_world_inter_pixel_separator_to_pixels +mln_world_inter_pixel_separator_to_pixels \ +mln_world_rgb_invert \ +mln_world_rgb_invert_spe mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1549,6 +1553,7 @@ mln_canvas_morpho_all_SOURCES = mln_canvas_morpho_all.cc mln_canvas_morpho_attribute_filter_SOURCES = mln_canvas_morpho_attribute_filter.cc mln_canvas_morpho_essential_SOURCES = mln_canvas_morpho_essential.cc mln_canvas_morpho_internal_find_root_SOURCES = mln_canvas_morpho_internal_find_root.cc +mln_clustering_kmean_rgb_SOURCES = mln_clustering_kmean_rgb.cc mln_convert_all_SOURCES = mln_convert_all.cc mln_convert_essential_SOURCES = mln_convert_essential.cc mln_convert_from_to_SOURCES = mln_convert_from_to.cc @@ -1988,6 +1993,7 @@ mln_fun_v2v_linear_SOURCES = mln_fun_v2v_linear.cc mln_fun_v2v_norm_SOURCES = mln_fun_v2v_norm.cc mln_fun_v2v_projection_SOURCES = mln_fun_v2v_projection.cc mln_fun_v2v_qt_rgb_to_int_u_SOURCES = mln_fun_v2v_qt_rgb_to_int_u.cc +mln_fun_v2v_rgb8_to_rgbn_SOURCES = mln_fun_v2v_rgb8_to_rgbn.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc mln_fun_v2v_rgb_to_int_u_SOURCES = mln_fun_v2v_rgb_to_int_u.cc @@ -2731,4 +2737,6 @@ mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc +mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc +mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

1 0

last-svn-commit-663-g0da3ec2 Introduce world::rgb::invert.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/world/rgb/invert.hh, * mln/world/rgb/invert.spe.hh: New. --- milena/ChangeLog | 7 + milena/mln/world/rgb/invert.hh | 216 ++++++++++++++++++++++++++++++++++++ milena/mln/world/rgb/invert.spe.hh | 124 +++++++++++++++++++++ 3 files changed, 347 insertions(+), 0 deletions(-) create mode 100644 milena/mln/world/rgb/invert.hh create mode 100644 milena/mln/world/rgb/invert.spe.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fcb0afe..a56d47d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. + + * mln/world/rgb/invert.hh, + * mln/world/rgb/invert.spe.hh: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. * mln/arith/revert.hh, diff --git a/milena/mln/world/rgb/invert.hh b/milena/mln/world/rgb/invert.hh new file mode 100644 index 0000000..62ee5bf --- /dev/null +++ b/milena/mln/world/rgb/invert.hh @@ -0,0 +1,216 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_HH +# define MLN_WORLD_RGB_INVERT_HH + +/// \file +/// +/// Point-wise invert (min -> max and max -> min) of RGB images. +/// +/// \fixme Move somewhere else? + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> +# include <mln/value/rgb.hh> + +// Specializations are in: +# include <mln/world/rgb/invert.spe.hh> + + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + /// Point-wise reversion of image \p input. + /*! + * \param[in] input the input image. + * \result The result image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + mln_concrete(I) invert(const Image& input); + + + /// Point-wise in-place reversion of image \p input. + /*! + * \param[in,out] input The target image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + void invert_inplace(Image& input); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename O> + inline + void invert(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::generic::invert"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + mln_piter(I) p(input.domain()); + for_all(p) + output(p) = mln_min(V) + (mln_max(V) - input(p)); + + trace::exiting("world::rgb::impl::generic::invert"); + } + + } // end of namespace mln::world::rgb::impl::generic + + + } // end of namespace mln::world::rgb::impl + + + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + invert_dispatch(trait::image::speed::any, const mln_value(I)&, + const I& input, O& output) + { + // No implementation found. May be input is not a RGB image? + mlc_abort(I)::check(); + } + + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::any, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb(input, output); + } + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::fastest, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb_fastest(input, output); + } + + + template <typename I, typename O> + inline + void + invert_dispatch(const Image& input, Image<O>& output) + { + typedef mln_value(I) V; + invert_dispatch(mln_trait_image_speed(I)(), V(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::world::rgb::internal + + + + + // Facades. + + template <typename I> + inline + mln_concrete(I) invert(const Image& input) + { + trace::entering("world::rgb::invert"); + + mln_precondition(exact(input).is_valid()); + + mln_concrete(I) output; + initialize(output, input); + internal::invert_dispatch(input, output); + + trace::exiting("world::rgb::invert"); + return output; + } + + template <typename I> + inline + void invert_inplace(Image& input) + { + trace::entering("world::rgb::invert_inplace"); + + mln_precondition(exact(input).is_valid()); + + internal::invert_dispatch(input, input); + + trace::exiting("world::rgb::invert_inplace"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + + +#endif // ! MLN_WORLD_RGB_INVERT_HH diff --git a/milena/mln/world/rgb/invert.spe.hh b/milena/mln/world/rgb/invert.spe.hh new file mode 100644 index 0000000..978563a --- /dev/null +++ b/milena/mln/world/rgb/invert.spe.hh @@ -0,0 +1,124 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_SPE_HH +# define MLN_WORLD_RGB_INVERT_SPE_HH + +/// \file +/// +/// Specializations for mln::world::rgb::invert. + +# ifndef MLN_WORLD_RGB_INVERT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_WORLD_RGB_INVERT_HH + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + namespace impl + { + + template <typename I, typename O> + inline + void invert_rgb_fastest(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb_fastest"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_pixter(const I) ip(input); + mln_pixter(O) op(output); + for_all_2(ip, op) + { + op.val().red() = mln_min(Red) + (mln_max(Red) - ip.val().red()); + op.val().green() = mln_min(Green) + (mln_max(Green) - ip.val().green()); + op.val().blue() = mln_min(Blue) + (mln_max(Blue) - ip.val().blue()); + } + + trace::entering("world::rgb::impl::invert_rgb_fastest"); + } + + + template <typename I, typename O> + inline + void invert_rgb(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_piter(I) p(input.domain()); + for_all(p) + { + output(p).red() = mln_min(Red) + (mln_max(Red) - input(p).red()); + output(p).green() = mln_min(Green) + (mln_max(Green) - input(p).green()); + output(p).blue() = mln_min(Blue) + (mln_max(Blue) - input(p).blue()); + } + + trace::exiting("world::rgb::impl::invert_rgb"); + } + + + } // end of namespace mln::world::rgb::impl + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + +# endif // ! MLN_INCLUDE_ONLY + +#endif // ! MLN_WORLD_RGB_INVERT_SPE_HH -- 1.5.6.5

1 0

last-svn-commit-664-g1ab4203 Introduce world::rgb::invert.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/world/rgb/invert.hh, * mln/world/rgb/invert.spe.hh: New. --- milena/ChangeLog | 7 + milena/mln/world/rgb/invert.hh | 216 ++++++++++++++++++++++++++++++++++++ milena/mln/world/rgb/invert.spe.hh | 124 +++++++++++++++++++++ 3 files changed, 347 insertions(+), 0 deletions(-) create mode 100644 milena/mln/world/rgb/invert.hh create mode 100644 milena/mln/world/rgb/invert.spe.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fcb0afe..a56d47d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. + + * mln/world/rgb/invert.hh, + * mln/world/rgb/invert.spe.hh: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. * mln/arith/revert.hh, diff --git a/milena/mln/world/rgb/invert.hh b/milena/mln/world/rgb/invert.hh new file mode 100644 index 0000000..62ee5bf --- /dev/null +++ b/milena/mln/world/rgb/invert.hh @@ -0,0 +1,216 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_HH +# define MLN_WORLD_RGB_INVERT_HH + +/// \file +/// +/// Point-wise invert (min -> max and max -> min) of RGB images. +/// +/// \fixme Move somewhere else? + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> +# include <mln/value/rgb.hh> + +// Specializations are in: +# include <mln/world/rgb/invert.spe.hh> + + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + /// Point-wise reversion of image \p input. + /*! + * \param[in] input the input image. + * \result The result image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + mln_concrete(I) invert(const Image& input); + + + /// Point-wise in-place reversion of image \p input. + /*! + * \param[in,out] input The target image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + void invert_inplace(Image& input); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename O> + inline + void invert(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::generic::invert"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + mln_piter(I) p(input.domain()); + for_all(p) + output(p) = mln_min(V) + (mln_max(V) - input(p)); + + trace::exiting("world::rgb::impl::generic::invert"); + } + + } // end of namespace mln::world::rgb::impl::generic + + + } // end of namespace mln::world::rgb::impl + + + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + invert_dispatch(trait::image::speed::any, const mln_value(I)&, + const I& input, O& output) + { + // No implementation found. May be input is not a RGB image? + mlc_abort(I)::check(); + } + + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::any, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb(input, output); + } + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::fastest, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb_fastest(input, output); + } + + + template <typename I, typename O> + inline + void + invert_dispatch(const Image& input, Image<O>& output) + { + typedef mln_value(I) V; + invert_dispatch(mln_trait_image_speed(I)(), V(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::world::rgb::internal + + + + + // Facades. + + template <typename I> + inline + mln_concrete(I) invert(const Image& input) + { + trace::entering("world::rgb::invert"); + + mln_precondition(exact(input).is_valid()); + + mln_concrete(I) output; + initialize(output, input); + internal::invert_dispatch(input, output); + + trace::exiting("world::rgb::invert"); + return output; + } + + template <typename I> + inline + void invert_inplace(Image& input) + { + trace::entering("world::rgb::invert_inplace"); + + mln_precondition(exact(input).is_valid()); + + internal::invert_dispatch(input, input); + + trace::exiting("world::rgb::invert_inplace"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + + +#endif // ! MLN_WORLD_RGB_INVERT_HH diff --git a/milena/mln/world/rgb/invert.spe.hh b/milena/mln/world/rgb/invert.spe.hh new file mode 100644 index 0000000..978563a --- /dev/null +++ b/milena/mln/world/rgb/invert.spe.hh @@ -0,0 +1,124 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_SPE_HH +# define MLN_WORLD_RGB_INVERT_SPE_HH + +/// \file +/// +/// Specializations for mln::world::rgb::invert. + +# ifndef MLN_WORLD_RGB_INVERT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_WORLD_RGB_INVERT_HH + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + namespace impl + { + + template <typename I, typename O> + inline + void invert_rgb_fastest(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb_fastest"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_pixter(const I) ip(input); + mln_pixter(O) op(output); + for_all_2(ip, op) + { + op.val().red() = mln_min(Red) + (mln_max(Red) - ip.val().red()); + op.val().green() = mln_min(Green) + (mln_max(Green) - ip.val().green()); + op.val().blue() = mln_min(Blue) + (mln_max(Blue) - ip.val().blue()); + } + + trace::entering("world::rgb::impl::invert_rgb_fastest"); + } + + + template <typename I, typename O> + inline + void invert_rgb(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_piter(I) p(input.domain()); + for_all(p) + { + output(p).red() = mln_min(Red) + (mln_max(Red) - input(p).red()); + output(p).green() = mln_min(Green) + (mln_max(Green) - input(p).green()); + output(p).blue() = mln_min(Blue) + (mln_max(Blue) - input(p).blue()); + } + + trace::exiting("world::rgb::impl::invert_rgb"); + } + + + } // end of namespace mln::world::rgb::impl + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + +# endif // ! MLN_INCLUDE_ONLY + +#endif // ! MLN_WORLD_RGB_INVERT_SPE_HH -- 1.5.6.5

1 0

last-svn-commit-662-g9aa2ede Improve dispatch in arith::revert routine.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/arith/revert.hh, * mln/arith/revert.spe.hh: Add a standard dispatch. --- milena/ChangeLog | 7 +++++ milena/mln/arith/revert.hh | 56 ++++++++++++++++++++++++++++++++++++--- milena/mln/arith/revert.spe.hh | 28 ++++++++----------- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b72dafb..fcb0afe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. + + * mln/arith/revert.hh, + * mln/arith/revert.spe.hh: Add a standard dispatch. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate declarations. diff --git a/milena/mln/arith/revert.hh b/milena/mln/arith/revert.hh index 60f46af..2ac3710 100644 --- a/milena/mln/arith/revert.hh +++ b/milena/mln/arith/revert.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,8 @@ // FIXME: Rely instead on mln/fun/v2v/revert.hh. -// FIXME: Revert on int value 0 does not give 0 (since min != - max; idem for float etc.) +// FIXME: Revert on int value 0 does not give 0 (since min != - max; +// idem for float etc.) namespace mln @@ -88,10 +90,17 @@ namespace mln template <typename I, typename O> inline - void revert_(const I& input, O& output) + void revert(const Image& input_, Image<O>& output_) { trace::entering("arith::impl::generic::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); + typedef mln_value(I) V; mln_piter(I) p(input.domain()); for_all(p) @@ -105,6 +114,43 @@ namespace mln } // end of namespace mln::arith::impl + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::any, const I& input, O& output) + { + impl::generic::revert(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::fastest, const I& input, O& output) + { + impl::revert_fastest(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(const Image& input, Image<O>& output) + { + revert_dispatch(mln_trait_image_speed(I)(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::arith::internal + + + // Facades. template <typename I> @@ -117,7 +163,7 @@ namespace mln mln_concrete(I) output; initialize(output, input); - impl::revert_(mln_trait_image_speed(I)(), exact(input), output); + internal::revert_dispatch(exact(input), exact(output)); trace::exiting("arith::revert"); return output; @@ -131,7 +177,7 @@ namespace mln mln_precondition(exact(input).is_valid()); - impl::revert_(mln_trait_image_speed(I)(), exact(input), exact(input)); + internal::revert_dispatch(exact(input), exact(input)); trace::exiting("arith::revert_inplace"); } diff --git a/milena/mln/arith/revert.spe.hh b/milena/mln/arith/revert.spe.hh index 6fef77c..2df8bc0 100644 --- a/milena/mln/arith/revert.spe.hh +++ b/milena/mln/arith/revert.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,24 +50,19 @@ namespace mln namespace impl { - namespace generic - { - template <typename I, typename O> - void revert_(const I& input, O& output); - } - + // FIXME: This is a fast implementation not a fastest one! template <typename I, typename O> inline - void revert_(trait::image::speed::any, const I& input, O& output) + void revert_fastest(const Image& input_, Image<O>& output_) { - generic::revert_(input, output); - } + trace::entering("arith::impl::revert_fastest"); - template <typename I, typename O> - inline - void revert_(trait::image::speed::fastest, const I& input, O& output) - { - trace::entering("arith::impl::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); typedef mln_value(I) V; mln_pixter(const I) ip(input); @@ -74,7 +70,7 @@ namespace mln for_all_2(ip, op) op.val() = mln_min(V) + (mln_max(V) - ip.val()); - trace::entering("arith::impl::revert_"); + trace::entering("arith::impl::revert_fastest"); } } // end of namespace mln::arith::impl -- 1.5.6.5

1 0

last-svn-commit-663-gd6086ba Improve dispatch in arith::revert routine.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/arith/revert.hh, * mln/arith/revert.spe.hh: Add a standard dispatch. --- milena/ChangeLog | 7 +++++ milena/mln/arith/revert.hh | 56 ++++++++++++++++++++++++++++++++++++--- milena/mln/arith/revert.spe.hh | 28 ++++++++----------- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b72dafb..fcb0afe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. + + * mln/arith/revert.hh, + * mln/arith/revert.spe.hh: Add a standard dispatch. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate declarations. diff --git a/milena/mln/arith/revert.hh b/milena/mln/arith/revert.hh index 60f46af..2ac3710 100644 --- a/milena/mln/arith/revert.hh +++ b/milena/mln/arith/revert.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,8 @@ // FIXME: Rely instead on mln/fun/v2v/revert.hh. -// FIXME: Revert on int value 0 does not give 0 (since min != - max; idem for float etc.) +// FIXME: Revert on int value 0 does not give 0 (since min != - max; +// idem for float etc.) namespace mln @@ -88,10 +90,17 @@ namespace mln template <typename I, typename O> inline - void revert_(const I& input, O& output) + void revert(const Image& input_, Image<O>& output_) { trace::entering("arith::impl::generic::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); + typedef mln_value(I) V; mln_piter(I) p(input.domain()); for_all(p) @@ -105,6 +114,43 @@ namespace mln } // end of namespace mln::arith::impl + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::any, const I& input, O& output) + { + impl::generic::revert(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::fastest, const I& input, O& output) + { + impl::revert_fastest(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(const Image& input, Image<O>& output) + { + revert_dispatch(mln_trait_image_speed(I)(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::arith::internal + + + // Facades. template <typename I> @@ -117,7 +163,7 @@ namespace mln mln_concrete(I) output; initialize(output, input); - impl::revert_(mln_trait_image_speed(I)(), exact(input), output); + internal::revert_dispatch(exact(input), exact(output)); trace::exiting("arith::revert"); return output; @@ -131,7 +177,7 @@ namespace mln mln_precondition(exact(input).is_valid()); - impl::revert_(mln_trait_image_speed(I)(), exact(input), exact(input)); + internal::revert_dispatch(exact(input), exact(input)); trace::exiting("arith::revert_inplace"); } diff --git a/milena/mln/arith/revert.spe.hh b/milena/mln/arith/revert.spe.hh index 6fef77c..2df8bc0 100644 --- a/milena/mln/arith/revert.spe.hh +++ b/milena/mln/arith/revert.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,24 +50,19 @@ namespace mln namespace impl { - namespace generic - { - template <typename I, typename O> - void revert_(const I& input, O& output); - } - + // FIXME: This is a fast implementation not a fastest one! template <typename I, typename O> inline - void revert_(trait::image::speed::any, const I& input, O& output) + void revert_fastest(const Image& input_, Image<O>& output_) { - generic::revert_(input, output); - } + trace::entering("arith::impl::revert_fastest"); - template <typename I, typename O> - inline - void revert_(trait::image::speed::fastest, const I& input, O& output) - { - trace::entering("arith::impl::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); typedef mln_value(I) V; mln_pixter(const I) ip(input); @@ -74,7 +70,7 @@ namespace mln for_all_2(ip, op) op.val() = mln_min(V) + (mln_max(V) - ip.val()); - trace::entering("arith::impl::revert_"); + trace::entering("arith::impl::revert_fastest"); } } // end of namespace mln::arith::impl -- 1.5.6.5

1 0

last-svn-commit-661-g0ad1284 mln/data/paste_without_localization.hh: Remove duplicate declarations.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/data/paste_without_localization.hh | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ec2995..b72dafb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate + declarations. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox. diff --git a/milena/mln/data/paste_without_localization.hh b/milena/mln/data/paste_without_localization.hh index 0ee824c..667e7f1 100644 --- a/milena/mln/data/paste_without_localization.hh +++ b/milena/mln/data/paste_without_localization.hh @@ -329,19 +329,6 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_dispatch( - mln::trait::image::value_storage::any, - mln::trait::image::value_storage::any, - const Image& input, - Image<J>& output) - { - impl::generic::paste_without_localization(input, output); - } - - - - template <typename I, typename J> - inline void paste_without_localization_dispatch(const Image& input, Image<J>& output) { -- 1.5.6.5

1 0

last-svn-commit-662-g33bbebf mln/data/paste_without_localization.hh: Remove duplicate declarations.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/data/paste_without_localization.hh | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ec2995..b72dafb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate + declarations. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox. diff --git a/milena/mln/data/paste_without_localization.hh b/milena/mln/data/paste_without_localization.hh index 0ee824c..667e7f1 100644 --- a/milena/mln/data/paste_without_localization.hh +++ b/milena/mln/data/paste_without_localization.hh @@ -329,19 +329,6 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_dispatch( - mln::trait::image::value_storage::any, - mln::trait::image::value_storage::any, - const Image& input, - Image<J>& output) - { - impl::generic::paste_without_localization(input, output); - } - - - - template <typename I, typename J> - inline void paste_without_localization_dispatch(const Image& input, Image<J>& output) { -- 1.5.6.5

1 0

last-svn-commit-660-g5d58ddc mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ .../green => milena}/mln/accu/stat/histo3d_rgb.hh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) copy {scribo/sandbox/green => milena}/mln/accu/stat/histo3d_rgb.hh (99%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 66d79f3..6ec2995 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from + Yann's sandbox. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. diff --git a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh b/milena/mln/accu/stat/histo3d_rgb.hh similarity index 99% copy from scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh copy to milena/mln/accu/stat/histo3d_rgb.hh index cdfea4d..24f6b46 100644 --- a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh +++ b/milena/mln/accu/stat/histo3d_rgb.hh @@ -180,6 +180,7 @@ namespace mln histo3d_rgb(); /// \} + /// Manipulators. /// \{ /// \brief Initialize the histogram with zero value. -- 1.5.6.5

1 0

last-svn-commit-661-gaa2b96f mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ .../green => milena}/mln/accu/stat/histo3d_rgb.hh | 0 2 files changed, 5 insertions(+), 0 deletions(-) copy {scribo/sandbox/green => milena}/mln/accu/stat/histo3d_rgb.hh (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 66d79f3..6ec2995 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from + Yann's sandbox. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. diff --git a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh b/milena/mln/accu/stat/histo3d_rgb.hh similarity index 100% copy from scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh copy to milena/mln/accu/stat/histo3d_rgb.hh -- 1.5.6.5

1 0