March 2013 - Olena-patches

olena-2.0-235-g4e4b115 Add more tests for lines_*_discontinued routines.
by Guillaume Lazzara 06 Mar '13

06 Mar '13

* tests/primitive/extract/Makefile.am: New targets. * tests/primitive/extract/lines_h_discontinued.cc, * tests/primitive/extract/lines_v_discontinued.cc: New. --- scribo/ChangeLog | 9 ++++++ scribo/tests/primitive/extract/Makefile.am | 7 +++- ...nes_discontinued.cc => lines_h_discontinued.cc} | 28 ++----------------- ...nes_discontinued.cc => lines_v_discontinued.cc} | 25 ++--------------- 4 files changed, 20 insertions(+), 49 deletions(-) copy scribo/tests/primitive/extract/{lines_discontinued.cc => lines_h_discontinued.cc} (69%) copy scribo/tests/primitive/extract/{lines_discontinued.cc => lines_v_discontinued.cc} (76%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 60c197c..cddcb15 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-03-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more tests for lines_*_discontinued routines. + + * tests/primitive/extract/Makefile.am: New targets. + + * tests/primitive/extract/lines_h_discontinued.cc, + * tests/primitive/extract/lines_v_discontinued.cc: New. + 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> Add a new test for lines_discontinued. diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 36de362..307dcf5 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -23,7 +24,9 @@ EXTRA_DIST = \ alignment_4.ref.pbm \ lines_discontinued.pbm -check_PROGRAMS = lines_discontinued +check_PROGRAMS = lines_discontinued \ + lines_h_discontinued \ + lines_v_discontinued if HAVE_MAGICKXX diff --git a/scribo/tests/primitive/extract/lines_discontinued.cc b/scribo/tests/primitive/extract/lines_h_discontinued.cc similarity index 69% copy from scribo/tests/primitive/extract/lines_discontinued.cc copy to scribo/tests/primitive/extract/lines_h_discontinued.cc index c8f4013..73d457d 100644 --- a/scribo/tests/primitive/extract/lines_discontinued.cc +++ b/scribo/tests/primitive/extract/lines_h_discontinued.cc @@ -31,7 +31,7 @@ #include <mln/io/pbm/load.hh> #include <mln/value/label_8.hh> #include <mln/make/box2d.hh> -#include <scribo/primitive/extract/lines_discontinued.hh> +#include <scribo/primitive/extract/lines_h_discontinued.hh> #include "tests/data.hh" @@ -49,11 +49,10 @@ int main() // Horizontal { - win::hline2d win(51); V nlines; component_set - comps = primitive::extract::lines_discontinued(input, c4(), nlines, - win, 3); + comps = primitive::extract::lines_h_discontinued(input, c4(), nlines, + 51, 3); mln_assertion(comps.nelements() == 2); @@ -66,26 +65,5 @@ int main() mln_assertion(comps(2).card() == 240); } - // Vertical - { - win::vline2d win(51); - V nlines; - component_set - comps = primitive::extract::lines_discontinued(input, c4(), nlines, - win, 3); - - mln_assertion(comps.nelements() == 3); - mln_assertion(comps(1).bbox() == make::box2d(8, 23, 186, 26)); - mln_assertion(comps(1).mass_center() == point2d(97, 25)); - mln_assertion(comps(1).card() == 716); - - mln_assertion(comps(2).bbox() == make::box2d(42, 98, 162, 100)); - mln_assertion(comps(2).mass_center() == point2d(102, 99)); - mln_assertion(comps(2).card() == 363); - - mln_assertion(comps(3).bbox() == make::box2d(57, 137, 173, 144)); - mln_assertion(comps(3).mass_center() == point2d(115, 141)); - mln_assertion(comps(3).card() == 936); - } } diff --git a/scribo/tests/primitive/extract/lines_discontinued.cc b/scribo/tests/primitive/extract/lines_v_discontinued.cc similarity index 76% copy from scribo/tests/primitive/extract/lines_discontinued.cc copy to scribo/tests/primitive/extract/lines_v_discontinued.cc index c8f4013..9b1e7b0 100644 --- a/scribo/tests/primitive/extract/lines_discontinued.cc +++ b/scribo/tests/primitive/extract/lines_v_discontinued.cc @@ -31,7 +31,7 @@ #include <mln/io/pbm/load.hh> #include <mln/value/label_8.hh> #include <mln/make/box2d.hh> -#include <scribo/primitive/extract/lines_discontinued.hh> +#include <scribo/primitive/extract/lines_v_discontinued.hh> #include "tests/data.hh" @@ -47,32 +47,13 @@ int main() typedef value::label_8 V; typedef image2d<V> I; - // Horizontal - { - win::hline2d win(51); - V nlines; - component_set - comps = primitive::extract::lines_discontinued(input, c4(), nlines, - win, 3); - - mln_assertion(comps.nelements() == 2); - - mln_assertion(comps(1).bbox() == make::box2d(21, 37, 24, 176)); - mln_assertion(comps(1).mass_center() == point2d(23, 107)); - mln_assertion(comps(1).card() == 560); - - mln_assertion(comps(2).bbox() == make::box2d(94, 32, 97, 91)); - mln_assertion(comps(2).mass_center() == point2d(96, 62)); - mln_assertion(comps(2).card() == 240); - } - // Vertical { win::vline2d win(51); V nlines; component_set - comps = primitive::extract::lines_discontinued(input, c4(), nlines, - win, 3); + comps = primitive::extract::lines_v_discontinued(input, c4(), nlines, + 51, 3); mln_assertion(comps.nelements() == 3); -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-234-g01f6070
by git＠lrde.epita.fr 05 Mar '13

05 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 01f60706dcad67fb488f43ee752f5a6a91790d82 (commit) from f884a769ff40c57eec2c7423e01ffb9ea9d22312 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 01f6070 Add a new test for lines_discontinued. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 ++ scribo/tests/img/lines_discontinued.pbm | Bin 0 -> 5050 bytes scribo/tests/primitive/extract/Makefile.am | 5 +- .../tests/primitive/extract/lines_discontinued.cc | 91 ++++++++++++++++++++ 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 scribo/tests/img/lines_discontinued.pbm create mode 100644 scribo/tests/primitive/extract/lines_discontinued.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-234-g01f6070 Add a new test for lines_discontinued.
by Guillaume Lazzara 05 Mar '13

05 Mar '13

* tests/img/lines_discontinued.pbm, * tests/primitive/extract/lines_discontinued.cc: New. * tests/primitive/extract/Makefile.am: Add new target. --- scribo/ChangeLog | 9 ++ scribo/tests/img/lines_discontinued.pbm | Bin 0 -> 5050 bytes scribo/tests/primitive/extract/Makefile.am | 5 +- .../tests/primitive/extract/lines_discontinued.cc | 91 ++++++++++++++++++++ 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 scribo/tests/img/lines_discontinued.pbm create mode 100644 scribo/tests/primitive/extract/lines_discontinued.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a1a9184..60c197c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for lines_discontinued. + + * tests/img/lines_discontinued.pbm, + * tests/primitive/extract/lines_discontinued.cc: New. + + * tests/primitive/extract/Makefile.am: Add new target. + +2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/lines_discontinued.hh: Add a missing call to exact(). diff --git a/scribo/tests/img/lines_discontinued.pbm b/scribo/tests/img/lines_discontinued.pbm new file mode 100644 index 0000000..799b2da Binary files /dev/null and b/scribo/tests/img/lines_discontinued.pbm differ diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 2d8c094..36de362 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -20,9 +20,10 @@ EXTRA_DIST = \ alignment_1.ref.pbm \ alignment_2.ref.pbm \ alignment_3.ref.pbm \ - alignment_4.ref.pbm + alignment_4.ref.pbm \ + lines_discontinued.pbm -check_PROGRAMS = +check_PROGRAMS = lines_discontinued if HAVE_MAGICKXX diff --git a/scribo/tests/primitive/extract/lines_discontinued.cc b/scribo/tests/primitive/extract/lines_discontinued.cc new file mode 100644 index 0000000..c8f4013 --- /dev/null +++ b/scribo/tests/primitive/extract/lines_discontinued.cc @@ -0,0 +1,91 @@ +// Copyright (C) 2013 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 + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/win/hline2d.hh> +#include <mln/io/pbm/load.hh> +#include <mln/value/label_8.hh> +#include <mln/make/box2d.hh> +#include <scribo/primitive/extract/lines_discontinued.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + using namespace scribo; + + image2d<bool> input; + io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); + + typedef value::label_8 V; + typedef image2d<V> I; + + // Horizontal + { + win::hline2d win(51); + V nlines; + component_set + comps = primitive::extract::lines_discontinued(input, c4(), nlines, + win, 3); + + mln_assertion(comps.nelements() == 2); + + mln_assertion(comps(1).bbox() == make::box2d(21, 37, 24, 176)); + mln_assertion(comps(1).mass_center() == point2d(23, 107)); + mln_assertion(comps(1).card() == 560); + + mln_assertion(comps(2).bbox() == make::box2d(94, 32, 97, 91)); + mln_assertion(comps(2).mass_center() == point2d(96, 62)); + mln_assertion(comps(2).card() == 240); + } + + // Vertical + { + win::vline2d win(51); + V nlines; + component_set + comps = primitive::extract::lines_discontinued(input, c4(), nlines, + win, 3); + + mln_assertion(comps.nelements() == 3); + + mln_assertion(comps(1).bbox() == make::box2d(8, 23, 186, 26)); + mln_assertion(comps(1).mass_center() == point2d(97, 25)); + mln_assertion(comps(1).card() == 716); + + mln_assertion(comps(2).bbox() == make::box2d(42, 98, 162, 100)); + mln_assertion(comps(2).mass_center() == point2d(102, 99)); + mln_assertion(comps(2).card() == 363); + + mln_assertion(comps(3).bbox() == make::box2d(57, 137, 173, 144)); + mln_assertion(comps(3).mass_center() == point2d(115, 141)); + mln_assertion(comps(3).card() == 936); + } +} -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-233-gf884a76
by git＠lrde.epita.fr 05 Mar '13

05 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via f884a769ff40c57eec2c7423e01ffb9ea9d22312 (commit) from 5963d6b5e6fa29923976624777964b2c66c13087 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- f884a76 scribo/primitive/extract/lines_discontinued.hh: Add a missing call to exact(). ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 5 +++++ .../scribo/primitive/extract/lines_discontinued.hh | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-233-gf884a76 scribo/primitive/extract/lines_discontinued.hh: Add a missing call to exact().
by Guillaume Lazzara 05 Mar '13

05 Mar '13

--- scribo/ChangeLog | 5 +++++ .../scribo/primitive/extract/lines_discontinued.hh | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7c92acf..a1a9184 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/lines_discontinued.hh: Add a missing + call to exact(). + +2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/lines_discontinued.hh: Fix invalid line reconstruction. diff --git a/scribo/scribo/primitive/extract/lines_discontinued.hh b/scribo/scribo/primitive/extract/lines_discontinued.hh index b2192ba..a6e976d 100644 --- a/scribo/scribo/primitive/extract/lines_discontinued.hh +++ b/scribo/scribo/primitive/extract/lines_discontinued.hh @@ -90,15 +90,17 @@ namespace scribo void lines_discontinued_tests(const Image& input, const Neighborhood<N>& nbh, V& nlines, - const Window<W>& win, unsigned rank_k) + const Window<W>& win_, unsigned rank_k) { mlc_equal(mln_value(I),bool)::check(); mlc_bool(mln_site_(I)::dim == 2)::check(); mlc_is_a(V, mln::value::Symbolic)::check(); + const W& win = exact(win_); + mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); + mln_precondition(win.is_valid()); mln_precondition(win.length() > 2 * (rank_k + 1)); -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-232-g5963d6b
by git＠lrde.epita.fr 05 Mar '13

05 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 5963d6b5e6fa29923976624777964b2c66c13087 (commit) via f0c488c54c924186a00003c899bf67d73ef577f9 (commit) via e97be13ff50026610cc3b970d80221f819dacfc2 (commit) from 7e065e0e5f6be35574c5ea8c1260be79f5be1c49 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5963d6b scribo/primitive/extract/lines_discontinued.hh: Fix invalid line reconstruction. f0c488c scribo/subsampling/bilinear.hh: Update documentation. e97be13 scribo/io/img/save.hh: Add an optional reduction factor. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 13 ++++++++++ scribo/scribo/io/img/save.hh | 25 ++++++++++++++++---- .../scribo/primitive/extract/lines_discontinued.hh | 18 ++++++++----- scribo/scribo/subsampling/bilinear.hh | 11 ++++++-- 4 files changed, 52 insertions(+), 15 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-232-g5963d6b scribo/primitive/extract/lines_discontinued.hh: Fix invalid line reconstruction.
by Guillaume Lazzara 05 Mar '13

05 Mar '13

--- scribo/ChangeLog | 5 +++++ .../scribo/primitive/extract/lines_discontinued.hh | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e1ac05c..7c92acf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/lines_discontinued.hh: Fix invalid line + reconstruction. + +2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/subsampling/bilinear.hh: Update documentation. 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/primitive/extract/lines_discontinued.hh b/scribo/scribo/primitive/extract/lines_discontinued.hh index 63953ac..b2192ba 100644 --- a/scribo/scribo/primitive/extract/lines_discontinued.hh +++ b/scribo/scribo/primitive/extract/lines_discontinued.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,6 +68,8 @@ namespace scribo * \param[in] rank_k Rank used for filtering. * * \return An image in which lines are labeled. + * + * \pre win.length() > 2 * (rank_k + 1) */ template <typename I, typename N, typename V, typename W> component_set<mln_ch_value(I,V)> @@ -98,6 +100,8 @@ namespace scribo mln_precondition(exact(nbh).is_valid()); mln_precondition(exact(win).is_valid()); + mln_precondition(win.length() > 2 * (rank_k + 1)); + (void) input; (void) nbh; (void) win; @@ -124,11 +128,11 @@ namespace scribo const N& nbh = exact(nbh_); const W& win = exact(win_); - int dil; - if (!(rank_k % 2)) - dil = win.length() / 2 + 2 * rank_k + 2; - else - dil = win.length() / 2 + 2 * rank_k + 3; + int dil = win.length() - 2 * (rank_k + 1); + mln_assertion(dil > 0); + + if (! (dil % 2)) // Make sure the window have an odd size. + dil += 1; mln_ch_value(I,bool) filter = morpho::dilation(morpho::rank_filter(input, win, rank_k), W(dil)); -- 1.7.2.5

1 0

olena-2.0-231-gf0c488c scribo/subsampling/bilinear.hh: Update documentation.
by Guillaume Lazzara 05 Mar '13

05 Mar '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/subsampling/bilinear.hh | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a15c6c4..e1ac05c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/subsampling/bilinear.hh: Update documentation. + +2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/io/img/save.hh: Add an optional reduction factor. 2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/subsampling/bilinear.hh b/scribo/scribo/subsampling/bilinear.hh index a0705c7..67ff008 100644 --- a/scribo/scribo/subsampling/bilinear.hh +++ b/scribo/scribo/subsampling/bilinear.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,9 +47,14 @@ namespace scribo using namespace mln; + /// \brief Bilinear subsampling. + /*! + \input[in] input An image. + \input[in] sub_ratio The subsampling size ratio. + */ template <typename I> mln_concrete(I) - bilinear(const Image& input_, int sub_ratio); + bilinear(const Image& input, int sub_ratio); # ifndef MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

olena-2.0-230-ge97be13 scribo/io/img/save.hh: Add an optional reduction factor.
by Guillaume Lazzara 05 Mar '13

05 Mar '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/io/img/save.hh | 25 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c4bdcfc..a15c6c4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-03-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/io/img/save.hh: Add an optional reduction factor. + 2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Update. diff --git a/scribo/scribo/io/img/save.hh b/scribo/scribo/io/img/save.hh index 76c583b..13da5b1 100644 --- a/scribo/scribo/io/img/save.hh +++ b/scribo/scribo/io/img/save.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -41,6 +41,7 @@ # include <mln/value/rgb8.hh> # include <mln/io/magick/save.hh> # include <mln/data/transform.hh> +# include <mln/subsampling/antialiased.hh> # include <scribo/core/document.hh> @@ -99,6 +100,10 @@ namespace scribo namespace internal { + // FIXME: should be moved as parameter of io::img::save. This + // requires to update some functors. + unsigned reduction_factor = 1; + struct highlight_mask : Function_v2v<highlight_mask> { @@ -160,9 +165,15 @@ namespace scribo save_debug_without_image(const document<L>& doc) { mln_precondition(doc.is_valid()); - mln::image2d<value::rgb8> output(doc.image().domain()); + + const box2d& ima_domain = doc.image().domain(); + box2d domain = make::box2d(ima_domain.pmin() / reduction_factor, + ima_domain.pmax() / reduction_factor); + mln::image2d<value::rgb8> output(domain); data::fill(output, literal::black); - scribo::io::img::internal::debug_img_visitor<L> f(output, 1); + + scribo::io::img::internal::debug_img_visitor<L> f(output, + reduction_factor); doc.accept(f); return output; } @@ -175,7 +186,11 @@ namespace scribo internal::highlight_mask highlight(0.5f); mln::image2d<value::rgb8> output = data::transform(doc.image(), highlight); - scribo::io::img::internal::debug_img_visitor<L> f(output, 1); + if (reduction_factor > 1) + output = mln::subsampling::antialiased(output, reduction_factor); + + scribo::io::img::internal::debug_img_visitor<L> f(output, + reduction_factor); doc.accept(f); return output; } -- 1.7.2.5

1 0

branch cleanup deleted: olena-2.0-40-gd4b9819
by git＠lrde.epita.fr 05 Mar '13

05 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch cleanup has been deleted was d4b9819e60f71e7f6e56f4fa48a9246ad5720225 ----------------------------------------------------------------------- d4b9819e60f71e7f6e56f4fa48a9246ad5720225 Fix Swilena's build. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0