September 2009 - Olena-patches

4482: Add new filters in Scribo.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* filter/common/objects_photo.hh, * filter/object_groups_v_thickness.hh: New. --- scribo/ChangeLog | 7 ++ scribo/filter/common/objects_photo.hh | 98 ++++++++++++++++++++++++++++ scribo/filter/object_groups_v_thickness.hh | 97 +++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 0 deletions(-) create mode 100644 scribo/filter/common/objects_photo.hh create mode 100644 scribo/filter/object_groups_v_thickness.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 53bec20..15ea49e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new filters in Scribo. + + * filter/common/objects_photo.hh, + * filter/object_groups_v_thickness.hh: New. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * estim/object_groups_v_thickness.hh: New routine. Estimate object group thickness. diff --git a/scribo/filter/common/objects_photo.hh b/scribo/filter/common/objects_photo.hh new file mode 100644 index 0000000..53da0a8 --- /dev/null +++ b/scribo/filter/common/objects_photo.hh @@ -0,0 +1,98 @@ +// Copyright (C) 2009 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 SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH +# define SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH + +/// \file +/// +/// \brief Common objects filters to use in photos. + + +# include <scribo/core/object_image.hh> + +# include <scribo/filter/objects_small.hh> +# include <scribo/filter/objects_thin.hh> +# include <scribo/filter/objects_thick.hh> + + +namespace scribo +{ + + namespace filter + { + + namespace common + { + + + /*! \brief Common objects filters to use in photos. + + \param[in] objects An object image. + + \return A filtered object image. + */ + template <typename L> + object_image(L) + objects_photo(const object_image(L)& objects); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + object_image(L) + objects_photo(const object_image(L)& objects) + { + trace::entering("scribo::filter::common::objects_photo"); + + mln_precondition(objects.is_valid()); + + + object_image(L) filtered_objects + = scribo::filter::objects_small(objects, 6); + + filtered_objects + = scribo::filter::objects_thin(filtered_objects, 1); + +// filtered_objects +// = scribo::filter::objects_thick(filtered_objects, +// math::min(input.ncols(), +// input.nrows()) / 5); + + trace::exiting("scribo::filter::common::objects_photo"); + return filtered_objects; + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::filter::common + + } // end of namespace scribo::filter + +} // end of namespace scribo + + +#endif // ! SCRIBO_FILTER_COMMON_OBJECTS_PHOTO_HH diff --git a/scribo/filter/object_groups_v_thickness.hh b/scribo/filter/object_groups_v_thickness.hh new file mode 100644 index 0000000..f16f1db --- /dev/null +++ b/scribo/filter/object_groups_v_thickness.hh @@ -0,0 +1,97 @@ +// Copyright (C) 2009 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 SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH +# define SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH + +/// \file +/// +/// \brief Filter groups having their object mean thickness too low. + + +# include <mln/util/array.hh> + +# include <scribo/core/object_groups.hh> +# include <scribo/estim/object_groups_v_thickness.hh> + + +namespace scribo +{ + + namespace filter + { + + using namespace mln; + + + /*! \brief Filter groups having their object mean thickness too low. + + \param[in] groups Object group information. + \param[in] thickness Object group mean thickness must be greater + or equal to this value. + + \return Filtered object group information. + + */ + template <typename L> + object_groups<L> + object_groups_v_thickness(const object_groups<L>& groups, float thickness); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + object_groups<L> + object_groups_v_thickness(const object_groups<L>& groups, float thickness) + { + trace::entering("scribo::filter::object_groups_v_thickness"); + + mln_precondition(groups.is_valid()); + mln_precondition(thickness >= 0); + + mln::util::array<float> + group_thickness = estim::object_groups_v_thickness(groups); + + object_groups<L> output(groups); + output(0) = 0; + for (unsigned i = 1; i < output.size(); ++i) + if (group_thickness[groups[i]] < thickness) + output(i) = 0; + + trace::exiting("scribo::filter::object_groups_v_thickness"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::filter + +} // end of namespace scribo + + +#endif // ! SCRIBO_FILTER_OBJECT_GROUPS_V_THICKNESS_HH -- 1.5.6.5

1 0

4481: estim/object_groups_v_thickness.hh: New routine. Estimate object group thickness.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- scribo/ChangeLog | 5 ++ scribo/estim/object_groups_v_thickness.hh | 102 +++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 scribo/estim/object_groups_v_thickness.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e8bbe11..53bec20 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * estim/object_groups_v_thickness.hh: New routine. Estimate + object group thickness. + 2009-08-31 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix compilation issues in Scribo. diff --git a/scribo/estim/object_groups_v_thickness.hh b/scribo/estim/object_groups_v_thickness.hh new file mode 100644 index 0000000..6453a1a --- /dev/null +++ b/scribo/estim/object_groups_v_thickness.hh @@ -0,0 +1,102 @@ +// Copyright (C) 2009 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 SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH +# define SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH + + +/// \file +/// +/// \brief Estimate the mean object thickness for each group. + + +# include <mln/util/array.hh> +# include <scribo/core/object_groups.hh> +# include <scribo/core/macros.hh> + + +namespace scribo +{ + + namespace estim + { + + using namespace mln; + + /*! \brief Estimate the mean object thickness for each group. + + \param[in] groups Object groups information. + + \return An array of mean object thickness. + + */ + template <typename L> + mln::util::array<float> + object_groups_v_thickness(const object_groups<L>& groups); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + util::array<float> + object_groups_v_thickness(const object_groups<L>& groups) + { + trace::entering("scribo::estim::object_groups_v_thickness"); + + mln_precondition(groups.is_valid()); + + const object_image(L)& objects = groups.object_image_(); + + //FIXME: remove when object_groups will store the number of + //elements per group. + mln::util::array<unsigned> group_card(groups.size(), 0.0); + + mln::util::array<float> output(groups.size(), 0.0); + for_all_components(i, objects.bboxes()) + { + output[groups[i]] += objects.bbox(i).pmax().row() + - objects.bbox(i).pmin().row(); + ++group_card[groups[i]]; + } + + output(0) = 0; + for_all_components(i, output) + output(i) /= static_cast<float>(group_card[i]); + + trace::exiting("scribo::estim::object_groups_v_thickness"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::estim + +} // end of namespace scribo + +#endif // ! SCRIBO_ESTIM_OBJECT_GROUPS_V_THICKNESS_HH -- 1.5.6.5

1 0

4480: Make hq*x algorithms more generic and handle image extensions.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* fabien/mln/upsampling/hq2x.hh, * fabien/mln/upsampling/hq3x.hh, * fabien/mln/upsampling/hq4x.hh: Add support for image domains not starting from (0,0). Initialize image extension correctly --- milena/sandbox/ChangeLog | 30 +++++++++++++++++-------- milena/sandbox/fabien/mln/upsampling/hq2x.hh | 20 ++++++++++++----- milena/sandbox/fabien/mln/upsampling/hq3x.hh | 20 ++++++++++++----- milena/sandbox/fabien/mln/upsampling/hq4x.hh | 20 ++++++++++++----- 4 files changed, 62 insertions(+), 28 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index d76c826..caf71c7 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Make hq*x algorithms more generic and handle image extensions. + + * fabien/mln/upsampling/hq2x.hh, + * fabien/mln/upsampling/hq3x.hh, + * fabien/mln/upsampling/hq4x.hh: Add support for image domains not + starting from (0,0). + Initialize image extension correctly. + 2009-09-13 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Save work in progress for histo and hsl. Everything is updated. @@ -274,7 +284,7 @@ Finish the experiment for Laurent. * levillain/constrained-connectivity.cc: Complete the processing - chain. + chain. Add a copyright header. Translate the documentation into English. s/ima/input/g. @@ -394,7 +404,7 @@ (print_color), (fill_image_with_4colors), (is_equivalent), - (test_init_point), + (test_init_point), (is_equal), (is_center_initialized), (test_init_center) : New test functions. @@ -411,7 +421,7 @@ 2009-08-17 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Improve documentation. - + * green/histo1d/histo1d.hh : Improve documentation aspect. 2009-08-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -425,7 +435,7 @@ Some tries with segmentation using graph (still segfault).. * edwin/exec/score.hh: New. * edwin/exec/zi.cc, - * edwin/exec/zi.hh: + * edwin/exec/zi.hh: Use min-tree based method instead of WST to group components. 2009-08-17 Guillaume Lazzara <lazzara(a)lrde.epita.fr> @@ -505,7 +515,7 @@ * green/LearnMilena: Remove. * green/Otsu: Remove. * green/Stats: Remove. - + 2009-08-04 Yann Jacquelet <jacquelet(a)lrde.epita.fr> Integrate LRDE code writting rules in the Stats code. @@ -513,7 +523,7 @@ * green/Stats/Makefile.am : Remove Makefile. * green/Stats/Stats.cc : Remove source. * green/Stats : Remove directory. - + * green/stats : New directory. * green/stats/Makefile.am : New Makefile. * green/stats/stats.cc : New source. @@ -525,7 +535,7 @@ * green/LearnMilena/Makefile.am : Remove Makefile. * green/LearnMilena/LearnMilena.cc : Remove source. * green/LearnMilena : Remove directory. - + * green/learn_milena : New directory. * green/learn_milena/Makefile.am : New Makefile. * green/learn_milena/learn_milena.cc : New source. @@ -537,7 +547,7 @@ * green/HelloMilena/Makefile.am : Remove Makefile. * green/HelloMilena/HelloMilena.cc : Remove source. * green/HelloMilena : Remove directory. - + * green/hello_milena : New directory. * green/hello_milena/Makefile.am : New Makefile. * green/hello_milena/hello_milena.cc : New source. @@ -550,7 +560,7 @@ * green/HelloWorld/HelloWorld.cc : Remove source. * green/HelloWorld/Print.cc : Remove source. * green/HelloWorld : Remove directory. - + * green/hello_world : New directory. * green/hello_world/Makefile.am : New Makefile. * green/hello_world/hello_world.cc : New source. @@ -631,7 +641,7 @@ * icdar/2009/pscomp: New directory. * icdar/2009/pscomp/iz.cc: New. - Compute an IZ image along with distances between objects. + Compute an IZ image along with distances between objects. * icdar/2009/pscomp/rect_filter.cc: New. Algebraic filtering with a combinaison of bounding box width and height. diff --git a/milena/sandbox/fabien/mln/upsampling/hq2x.hh b/milena/sandbox/fabien/mln/upsampling/hq2x.hh index e4d10d0..78ed271 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq2x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq2x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq2x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -224,7 +229,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -232,9 +237,9 @@ namespace mln { trace::entering("upsampling::impl::hq2x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 2, ncols * 2); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 4, + input.domain().pmax() * 4); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -264,9 +269,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -2965,6 +2970,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq2x_(exact(input)); trace::exiting("upsampling::hq2x"); diff --git a/milena/sandbox/fabien/mln/upsampling/hq3x.hh b/milena/sandbox/fabien/mln/upsampling/hq3x.hh index 603aec8..15c1e65 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq3x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq3x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq3x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -210,7 +215,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -218,9 +223,9 @@ namespace mln { trace::entering("upsampling::impl::hq3x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 3, ncols * 3); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 3, + input.domain().pmax() * 3); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -250,9 +255,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -3923,6 +3928,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq3x_(exact(input)); trace::exiting("upsampling::hq3x"); diff --git a/milena/sandbox/fabien/mln/upsampling/hq4x.hh b/milena/sandbox/fabien/mln/upsampling/hq4x.hh index d42fbe3..c77ef6a 100644 --- a/milena/sandbox/fabien/mln/upsampling/hq4x.hh +++ b/milena/sandbox/fabien/mln/upsampling/hq4x.hh @@ -24,6 +24,11 @@ /// Reference can be found at: /// http://web.archive.org/web/20070624082212/www.hiend3d.com/hq4x.html +# include <mln/extension/adjust_duplicate.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> # include <mln/value/rgb8.hh> @@ -330,7 +335,7 @@ namespace mln } - //FIXME: In Milena, nrows != row max + template <typename T> inline mln_concrete(image2d<T>) @@ -338,9 +343,9 @@ namespace mln { trace::entering("upsampling::impl::hq4x_"); - int nrows = geom::nrows(input); - int ncols = geom::ncols(input); - mln_concrete(image2d<T>) output(nrows * 4, ncols * 4); + mln_domain(image2d<T>) bbox(input.domain().pmin() * 4, + input.domain().pmax() * 4); + mln_concrete(image2d<T>) output(bbox); int LUT16to32[65536]; int RGBtoYUV[65536]; @@ -370,9 +375,9 @@ namespace mln // // w5 is the current point. - for (int j = 0; j < ncols; j++) + for (int j = geom::min_col(input); j <= geom::max_col(input); j++) { - for (int i = 0; i < nrows; i++) + for (int i = geom::min_row(input); i <= geom::max_row(input); i++) { w[1] = rgb8toShort(input.at_(i - 1, j - 1)); w[2] = rgb8toShort(input.at_(i - 1, j)); @@ -5403,6 +5408,9 @@ namespace mln mln_concrete(I) output; + // Preparing extension. + extension::adjust_duplicate(input, 1); + output = impl::hq4x_(exact(input)); trace::exiting("upsampling::hq4x"); -- 1.5.6.5

1 0

4479: mln/linear/gaussian.hh: Make linear::gaussian more generic.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- milena/ChangeLog | 4 ++++ milena/mln/linear/gaussian.hh | 33 ++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7e12744..ba5ebd3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * mln/linear/gaussian.hh: Make linear::gaussian more generic. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add geom::translate. * mln/geom/all.hh: Add new include. diff --git a/milena/mln/linear/gaussian.hh b/milena/mln/linear/gaussian.hh index 9fa96b1..50cb8bb 100644 --- a/milena/mln/linear/gaussian.hh +++ b/milena/mln/linear/gaussian.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009 EPITA +// Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,6 +44,12 @@ # include <mln/extension/adjust_fill.hh> # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_sli.hh> +# include <mln/geom/max_sli.hh> # include <mln/geom/ninds.hh> # include <mln/geom/nslis.hh> # include <mln/data/paste.hh> @@ -391,11 +398,11 @@ namespace mln if (dir == 0) { // Apply on rows. - for (unsigned j = 0; j < geom::ncols(img); ++j) + for (unsigned j = geom::min_col(img); j <= geom::max_col(img); ++j) recursivefilter_<mln_value(I)>(img, coef, - point2d(static_cast<def::coord>(-img.border()), + point2d(static_cast<def::coord>(geom::min_row(img) - img.border()), static_cast<def::coord>(j)), - point2d(static_cast<def::coord>(geom::nrows(img) - 1 + + point2d(static_cast<def::coord>(geom::max_row(img) + img.border()), static_cast<def::coord>(j)), geom::nrows(img) + 2 * img.border(), @@ -405,12 +412,12 @@ namespace mln if (dir == 1) { // Apply on columns. - for (unsigned i = 0; i < geom::nrows(img); ++i) + for (unsigned 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>(-img.border())), + static_cast<def::coord>(geom::min_col(img) - img.border())), point2d(static_cast<def::coord>(i), - static_cast<def::coord>(geom::ncols(img) - 1 + + static_cast<def::coord>(geom::max_col(img) + img.border())), geom::ncols(img) + 2 * img.border(), dpoint2d(0, 1)); @@ -429,8 +436,8 @@ namespace mln if (dir == 0) { // Apply on slices. - for (unsigned j = 0; j < geom::nrows(img); ++j) - for (unsigned k = 0; k < geom::ncols(img); ++k) + 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) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(-img.border()), static_cast<def::coord>(j), @@ -448,8 +455,8 @@ namespace mln if (dir == 1) { // Apply on rows. - for (unsigned i = 0; i < geom::nslis(img); ++i) - for (unsigned k = 0; k < geom::ncols(img); ++k) + 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) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(-img.border()), @@ -466,8 +473,8 @@ namespace mln if (dir == 2) { // Apply on columns. - for (unsigned i = 0; i < geom::nslis(img); ++i) - for (unsigned j = 0; j < geom::nrows(img); ++i) + 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) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(j), -- 1.5.6.5

1 0

4478: Add geom::translate.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* mln/geom/all.hh: Add new include. * mln/geom/translate.hh: New routine. * tests/geom/Makefile.am, * tests/geom/translate.cc: New test. --- milena/ChangeLog | 11 ++ milena/mln/geom/all.hh | 1 + milena/mln/geom/translate.hh | 159 ++++++++++++++++++++ milena/tests/geom/Makefile.am | 5 +- .../{mln/geom/all.hh => tests/geom/translate.cc} | 66 +++----- 5 files changed, 199 insertions(+), 43 deletions(-) create mode 100644 milena/mln/geom/translate.hh copy milena/{mln/geom/all.hh => tests/geom/translate.cc} (50%) diff --git a/milena/ChangeLog b/milena/ChangeLog index d2fb43a..7e12744 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add geom::translate. + + * mln/geom/all.hh: Add new include. + + * mln/geom/translate.hh: New routine. + + * tests/geom/Makefile.am, + * tests/geom/translate.cc: New test. + 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Disable tiled2d image support (still experimental). diff --git a/milena/mln/geom/all.hh b/milena/mln/geom/all.hh index f2d1fd3..813d164 100644 --- a/milena/mln/geom/all.hh +++ b/milena/mln/geom/all.hh @@ -68,6 +68,7 @@ namespace mln # include <mln/geom/size1d.hh> # include <mln/geom/size2d.hh> # include <mln/geom/size3d.hh> +# include <mln/geom/translate.hh> #endif // ! MLN_GEOM_ALL_HH diff --git a/milena/mln/geom/translate.hh b/milena/mln/geom/translate.hh new file mode 100644 index 0000000..334edc8 --- /dev/null +++ b/milena/mln/geom/translate.hh @@ -0,0 +1,159 @@ +// Copyright (C) 2009 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. + +/// \file +/// +/// Translate an image. + +#ifndef MLN_GEOM_TRANSLATE_HH +# define MLN_GEOM_TRANSLATE_HH + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/site_set.hh> +# include <mln/core/concept/box.hh> + +# include <mln/core/routine/extend.hh> + +# include <mln/core/image/imorph/tr_image.hh> + +# include <mln/data/paste.hh> + +# include <mln/fun/x2x/translation.hh> + +# include <mln/literal/zero.hh> + + +namespace mln +{ + + namespace geom + { + + /// Perform a translation from the center of an image. + /// + /// \param[in] input An image. + /// \param[in] ref The translation vector. + /// \param[in] extension Function, image or value which will be used + /// as extension. This extension allows to map + /// values to sites which where not part + /// of the domain before the translation. + /// \param[in] output_domain The domain of the output image. An + /// invalid domain, causes the routine + /// to use the translated input_ domain. + /// + /// \return An image with the same domain as \p input. + // + template <typename I, typename V, typename Ext, typename S> + mln_concrete(I) + translate(const Image& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension, const Site_Set<S>& output_domain); + + + /// \overload + template <typename I, typename V, typename Ext> + mln_concrete(I) + translate(const Image& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension); + + + /// \overload + /// Use literal::zero as default value for the extension. + template <typename I, typename V> + mln_concrete(I) + translate(const Image& input, + const algebra::vec<mln_site_(I)::dim, V>& ref); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename V, typename Ext, typename S> + mln_concrete(I) + translate(const Image& input_, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension_, const Site_Set<S>& output_domain_) + { + trace::entering("geom::translate"); + + const I& input = exact(input_); + const S& output_domain = exact(output_domain_); + const mln_exact(Ext)& extension = exact(extension_); + mlc_converts_to(mln_exact(Ext), mln_value(I))::check(); + + mln_precondition(input.is_valid()); + mln_precondition(output_domain.is_valid()); + + point2d c = geom::bbox(input).center(); + typedef fun::x2x::translation<2,double> trans_t; + trans_t + t(ref); + + tr_image<S,I,trans_t> tr_ima(output_domain, input, t); + + mln_concrete(I) output; + initialize(output, tr_ima); + + data::paste(extend(tr_ima, extension), output); + + trace::exiting("geom::translate"); + return output; + } + + + template <typename I, typename V, typename Ext> + mln_concrete(I) + translate(const Image& input, + const algebra::vec<mln_site_(I)::dim, V>& ref, + const Ext& extension) + { + // Old versions of GCC (including Apple GCC 4.0.1) do not parse + // correctly `mln_box(I)()'. Hence, we need to typedef + // `mln_box(I)' first. + typedef mln_domain(I) domain_t; + return translate(input, ref, extension, domain_t()); + } + + + template <typename I, typename V> + mln_concrete(I) + translate(const Image& input, + const algebra::vec<mln_site_(I)::dim, V>& ref) + { + return translate(input, ref, literal::zero); + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::geom + +} // end of namespace mln + + +#endif // ! MLN_GEOM_TRANSLATE_HH diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 8572a6b..16600dd 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -37,7 +37,8 @@ nslis \ pmin_pmax \ rotate \ seed2tiling \ -seed2tiling_roundness +seed2tiling_roundness \ +translate bbox_SOURCES = bbox.cc @@ -58,6 +59,6 @@ pmin_pmax_SOURCES = pmin_pmax.cc rotate_SOURCES = rotate.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc - +translate_SOURCES = translate.cc TESTS = $(check_PROGRAMS) diff --git a/milena/mln/geom/all.hh b/milena/tests/geom/translate.cc similarity index 50% copy from milena/mln/geom/all.hh copy to milena/tests/geom/translate.cc index f2d1fd3..2efd753 100644 --- a/milena/mln/geom/all.hh +++ b/milena/tests/geom/translate.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,50 +23,35 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_GEOM_ALL_HH -# define MLN_GEOM_ALL_HH +# include <mln/core/image/image2d.hh> +# include <mln/geom/translate.hh> +# include <mln/make/image.hh> +# include <mln/data/compare.hh> -/// \file -/// -/// File that includes all geometry related things. +#include <mln/debug/println.hh> - -namespace mln +int main() { + using namespace mln; - /// Namespace of all things related to geometry. - namespace geom - { - /// Implementation namespace of geom namespace. - namespace impl {} - } + bool values[][5] = { { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 }, + { 0, 0, 1, 0, 0 } }; -} + image2d<bool> ima = make::image(values); -# include <mln/geom/bbox.hh> -# include <mln/geom/chamfer.hh> -# include <mln/geom/complex_geometry.hh> -# include <mln/geom/delta.hh> -# include <mln/geom/max_col.hh> -# include <mln/geom/max_ind.hh> -# include <mln/geom/max_row.hh> -# include <mln/geom/max_sli.hh> -# include <mln/geom/min_col.hh> -# include <mln/geom/min_ind.hh> -# include <mln/geom/min_row.hh> -# include <mln/geom/min_sli.hh> -# include <mln/geom/ncols.hh> -# include <mln/geom/ninds.hh> -# include <mln/geom/nrows.hh> -# include <mln/geom/nsites.hh> -# include <mln/geom/nslis.hh> -# include <mln/geom/pmin_pmax.hh> -# include <mln/geom/rotate.hh> -# include <mln/geom/seeds2tiling.hh> -# include <mln/geom/seeds2tiling_roundness.hh> -# include <mln/geom/size1d.hh> -# include <mln/geom/size2d.hh> -# include <mln/geom/size3d.hh> + box2d b = make::box2d(-2, -2, 2, 2); + image2d<bool> + ima_rot = geom::translate(ima, + -1 * ima.domain().center().to_vec(), + literal::zero, b); + mln_piter_(image2d<bool>) + p1(ima.domain()), + p2(ima_rot.domain()); -#endif // ! MLN_GEOM_ALL_HH + for_all_2(p1,p2) + mln_assertion(ima(p1) == ima_rot(p2)); +} -- 1.5.6.5

1 0

Re: [Olena-patches] r4432: Implement HQ2x upscaling algorithm
by Alexandre Duret-Lutz 14 Sep '09

14 Sep '09

>>> "FF" == Fabien Freling <fabien.freling(a)lrde.epita.fr> writes: FF> URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox FF> ChangeLog: FF> 2009-09-04 Fabien Freling <fabien.freling(a)lrde.epita.fr> FF> Implement HQ2x upscaling algorithm. FF> * fabien/mln/upsampling/hq2x.hh: Implement HQ2x algorithm. FF> * fabien/mln/upsampling/hq3x.hh: Remove dead code. FF> * fabien/tests/upsampling/Makefile: Add `hq2x' target. FF> * fabien/tests/upsampling/hq2x.cc: New test file for HQ2x. Je suis assez choqué. Ce code est une adaptation d'un code de Maxim Stepin sous LGPL 2.1 : on reconnaît clairement la logique du code original, même si les accès à l'image ont changé. Cependant 1) le nom de l'auteur n'apparaît nul part 2) son copyright a été modifié en (c) LRDE 3) la license a été changée en GPL 2 + exception. Le dépôt SVN de milena est public. Tu ne peux pas prendre le code de quelqu'un et le redistribuer sous une autre license comme ça ! Et indépendamment du problème de copyright/license, quand on implémente un algo précis, c'est une bonne idée d'en donner les références (article, page web, ...) dans l'entête. FF> --- trunk/milena/sandbox/fabien/mln/upsampling/hq2x.hh (revision 0) FF> +++ trunk/milena/sandbox/fabien/mln/upsampling/hq2x.hh (revision 4432) FF> @@ -0,0 +1,2988 @@ FF> +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) FF> +// FF> +// This file is part of Olena. FF> +// FF> +// Olena is free software: you can redistribute it and/or modify it under FF> +// the terms of the GNU General Public License as published by the Free FF> +// Software Foundation, version 2 of the License. FF> +// FF> +// Olena is distributed in the hope that it will be useful, FF> +// but WITHOUT ANY WARRANTY; without even the implied warranty of FF> +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU FF> +// General Public License for more details. FF> +// FF> +// You should have received a copy of the GNU General Public License FF> +// along with Olena. If not, see <http://www.gnu.org/licenses/>. FF> +// FF> +// As a special exception, you may use this file as part of a free FF> +// software project without restriction. Specifically, if other files FF> +// instantiate templates or use macros or inline functions from this FF> +// file, or you compile this file and link it with other files to produce FF> +// an executable, this file does not by itself cause the resulting FF> +// executable to be covered by the GNU General Public License. This FF> +// exception does not however invalidate any other reasons why the FF> +// executable file might be covered by the GNU General Public License. -- Alexandre Duret-Lutz

3 3

milena r4477: Disable tiled2d image support (still experimental)
by Fabien Freling 14 Sep '09

14 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Disable tiled2d image support (still experimental). * mln/io/magick/save.hh: Disable tiled2d image support. --- save.hh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: trunk/milena/mln/io/magick/save.hh =================================================================== --- trunk/milena/mln/io/magick/save.hh (revision 4476) +++ trunk/milena/mln/io/magick/save.hh (revision 4477) @@ -63,9 +63,9 @@ * \param[out] ima A reference to the image to save. * \param[in] filename The output. */ - template <typename T> + /*template <typename T> void save(Image< tiled2d<T> >& ima, - const std::string& filename); + const std::string& filename);*/ # ifndef MLN_INCLUDE_ONLY @@ -73,7 +73,6 @@ inline Magick::Color get_color(bool value) { - std::cout << "bool color!" << std::endl; return Magick::ColorMono(value); } @@ -126,7 +125,7 @@ trace::exiting("mln::io::magick::save"); } - template <typename T> + /*template <typename T> void save(Image< tiled2d<T> >& ima_, const std::string& filename) { trace::entering("mln::io::magick::save"); @@ -136,7 +135,7 @@ ima.buffer().write(filename); trace::exiting("mln::io::magick::save"); - } + }*/ # endif // ! MLN_INCLUDE_ONLY

1 0

milena r4476: Update RGB to HSL test, correct luminance values with fractions
by Fabien Freling 14 Sep '09

14 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update RGB to HSL test, correct luminance values with fractions. * tests/fun/v2v/rgb_to_hsl.cc: Update luminance values with fractions. --- rgb_to_hsl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/milena/tests/fun/v2v/rgb_to_hsl.cc =================================================================== --- trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4475) +++ trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4476) @@ -44,7 +44,7 @@ { rgb8(128,128,128), rgb8(90,90, 90) } }; hsl_f ref[][2] = { { hsl_f(0,0,0), hsl_f(0,0,1.0) }, - { hsl_f(0,0,0.5), hsl_f(0,0,0.35) } }; + { hsl_f(0,0,128.0 / 255.0), hsl_f(0,0,90.0 / 255.0) } }; int main() {

1 0

milena r4475: Disable tiled2d image support (still experimental)
by Fabien Freling 14 Sep '09

14 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-14 Fabien Freling <fabien.freling(a)lrde.epita.fr> Disable tiled2d image support (still experimental). * mln/io/magick/load.hh: Disable tiled2d image support. * tests/fun/v2v/rgb_to_hsl.cc: Update test for luminance value. --- mln/io/magick/load.hh | 8 ++++---- tests/fun/v2v/rgb_to_hsl.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Index: trunk/milena/mln/io/magick/load.hh =================================================================== --- trunk/milena/mln/io/magick/load.hh (revision 4474) +++ trunk/milena/mln/io/magick/load.hh (revision 4475) @@ -61,8 +61,8 @@ * data. * \param[in] filename The source. */ - template <typename T> - void load(Image<tiled2d<T> >& ima, const std::string& filename); + /*template <typename T> + void load(Image<tiled2d<T> >& ima, const std::string& filename);*/ # ifndef MLN_INCLUDE_ONLY @@ -163,7 +163,7 @@ } - template<typename T> + /*template<typename T> inline void load(Image<tiled2d<T> >& ima_, const std::string& filename) { @@ -175,7 +175,7 @@ ima = result; trace::exiting("mln::io::magick::load"); - } + }*/ Index: trunk/milena/tests/fun/v2v/rgb_to_hsl.cc =================================================================== --- trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4474) +++ trunk/milena/tests/fun/v2v/rgb_to_hsl.cc (revision 4475) @@ -43,8 +43,8 @@ rgb8 dat[][2] = { { rgb8(0,0,0), rgb8(255,255,255) }, { rgb8(128,128,128), rgb8(90,90, 90) } }; -hsl_f ref[][2] = { { hsl_f(0,0,0), hsl_f(0,0,255) }, - { hsl_f(0,0,128), hsl_f(0,0,90) } }; +hsl_f ref[][2] = { { hsl_f(0,0,0), hsl_f(0,0,1.0) }, + { hsl_f(0,0,0.5), hsl_f(0,0,0.35) } }; int main() {

1 0

[PATCH 2/2] neighb2d.i: Aesthetic changes.
by Roland Levillain 14 Sep '09

14 Sep '09

--- swilena/ChangeLog | 4 ++++ swilena/neighb2d.i | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 82b1467..efa4e9b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,9 @@ 2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> + * neighb2d.i: Aesthetic changes. + +2009-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Fix Swilena w.r.t. mln::internal::neighb_base. * neighb2d.i: Wrap base class internal::neighb_base<W, neighb<W> >. diff --git a/swilena/neighb2d.i b/swilena/neighb2d.i index ebe2bbc..1dba3dd 100644 --- a/swilena/neighb2d.i +++ b/swilena/neighb2d.i @@ -49,10 +49,10 @@ // Swig tries to wrap everything by default; prevent it from wrapping // invalid methods (1D and 3D insertions for a neighb2d). -%ignore mln::neighb< mln::window < mln::dpoint<mln::grid::square,mln::def::coord > > > +%ignore mln::neighb< mln::window< mln::dpoint< mln::grid::square,mln::def::coord > > > ::insert(const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&); -%ignore mln::neighb< mln::window < mln::dpoint<mln::grid::square, mln::def::coord > > > +%ignore mln::neighb< mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > ::insert(const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&, const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&, const typename mln::dpoint<mln::grid::square,mln::def::coord>::coord&); @@ -65,21 +65,21 @@ > >; %template() mln::internal::neighborhood_extra_impl< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > >, + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > > + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; %template() mln::internal::neighborhood_impl< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > >, + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > > + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; %template() mln::internal::neighborhood_base< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > >, + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > >, mln::neighb< - mln::window < mln::dpoint<mln::grid::square, mln::def::coord > > + mln::window< mln::dpoint< mln::grid::square, mln::def::coord > > > >; %template() mln::internal::neighb_base< @@ -90,4 +90,4 @@ >; // Instantiate mln::neighb2d. %template(neighb2d) -mln::neighb< mln::window < mln::dpoint<mln::grid::square, mln::def::coord > > >; +mln::neighb< mln::window < mln::dpoint< mln::grid::square, mln::def::coord > > >; -- 1.6.4.2

1 0