- Olena-patches

olena-2.0-237-g46fe911 Add tests for lines_*_pattern routines.
by Guillaume Lazzara 06 Mar '13

06 Mar '13

* tests/primitive/extract/Makefile.am: New targets. * tests/primitive/extract/lines_h_pattern.cc, * tests/primitive/extract/lines_h_pattern.ref.pbm, * tests/primitive/extract/lines_v_pattern.cc, * tests/primitive/extract/lines_v_pattern.ref.pbm: New. --- scribo/ChangeLog | 11 ++++++++ scribo/tests/primitive/extract/Makefile.am | 6 +++- .../extract/lines_h_pattern.cc} | 25 +++++++++---------- .../primitive/extract/lines_h_pattern.ref.pbm | Bin 0 -> 5116 bytes .../extract/lines_v_pattern.cc} | 25 +++++++++---------- .../extract/lines_v_pattern.ref.pbm} | Bin 5050 -> 5116 bytes 6 files changed, 39 insertions(+), 28 deletions(-) copy scribo/tests/{binarization/otsu.cc => primitive/extract/lines_h_pattern.cc} (75%) create mode 100644 scribo/tests/primitive/extract/lines_h_pattern.ref.pbm copy scribo/tests/{binarization/otsu.cc => primitive/extract/lines_v_pattern.cc} (75%) copy scribo/tests/{img/lines_discontinued.pbm => primitive/extract/lines_v_pattern.ref.pbm} (91%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 905d53f..ebfef2f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2013-03-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Add tests for lines_*_pattern routines. + + * tests/primitive/extract/Makefile.am: New targets. + + * tests/primitive/extract/lines_h_pattern.cc, + * tests/primitive/extract/lines_h_pattern.ref.pbm, + * tests/primitive/extract/lines_v_pattern.cc, + * tests/primitive/extract/lines_v_pattern.ref.pbm: New. + +2013-03-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix wrong line reconstruction with lines_*_pattern routines. * scribo/primitive/extract/lines_h_pattern.hh, diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 307dcf5..047fdb8 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -22,11 +22,13 @@ EXTRA_DIST = \ alignment_2.ref.pbm \ alignment_3.ref.pbm \ alignment_4.ref.pbm \ - lines_discontinued.pbm + lines_v_pattern.ref.pbm check_PROGRAMS = lines_discontinued \ lines_h_discontinued \ - lines_v_discontinued + lines_v_discontinued \ + lines_v_pattern \ + lines_h_pattern if HAVE_MAGICKXX diff --git a/scribo/tests/binarization/otsu.cc b/scribo/tests/primitive/extract/lines_h_pattern.cc similarity index 75% copy from scribo/tests/binarization/otsu.cc copy to scribo/tests/primitive/extract/lines_h_pattern.cc index fd4c7f2..64c09f8 100644 --- a/scribo/tests/binarization/otsu.cc +++ b/scribo/tests/primitive/extract/lines_h_pattern.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,30 +23,29 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// \file #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> -#include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> #include <mln/io/pbm/load.hh> -#include <mln/io/pbm/save.hh> - -#include <scribo/binarization/otsu.hh> +#include <scribo/primitive/extract/lines_h_pattern.hh> #include "tests/data.hh" int main() { using namespace mln; + using namespace scribo; - image2d<value::int_u8> input; - io::pgm::load(input, MILENA_IMG_DIR "/lena.pgm"); - - image2d<bool> bin = scribo::binarization::otsu(input); + image2d<bool> input; + io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/otsu.ref.pbm"); + io::pbm::load(ref, + SCRIBO_TESTS_DIR "/primitive/extract/lines_h_pattern.ref.pbm"); + + image2d<bool> + vlines = primitive::extract::lines_h_pattern(input, 51, 3); - mln_assertion(bin == ref); + mln_assertion(vlines == ref); } diff --git a/scribo/tests/primitive/extract/lines_h_pattern.ref.pbm b/scribo/tests/primitive/extract/lines_h_pattern.ref.pbm new file mode 100644 index 0000000..5efb093 Binary files /dev/null and b/scribo/tests/primitive/extract/lines_h_pattern.ref.pbm differ diff --git a/scribo/tests/binarization/otsu.cc b/scribo/tests/primitive/extract/lines_v_pattern.cc similarity index 75% copy from scribo/tests/binarization/otsu.cc copy to scribo/tests/primitive/extract/lines_v_pattern.cc index fd4c7f2..c61c9b9 100644 --- a/scribo/tests/binarization/otsu.cc +++ b/scribo/tests/primitive/extract/lines_v_pattern.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,30 +23,29 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +// \file #include <mln/core/image/image2d.hh> #include <mln/data/compare.hh> -#include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> #include <mln/io/pbm/load.hh> -#include <mln/io/pbm/save.hh> - -#include <scribo/binarization/otsu.hh> +#include <scribo/primitive/extract/lines_v_pattern.hh> #include "tests/data.hh" int main() { using namespace mln; + using namespace scribo; - image2d<value::int_u8> input; - io::pgm::load(input, MILENA_IMG_DIR "/lena.pgm"); - - image2d<bool> bin = scribo::binarization::otsu(input); + image2d<bool> input; + io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); image2d<bool> ref; - io::pbm::load(ref, SCRIBO_TESTS_DIR "binarization/otsu.ref.pbm"); + io::pbm::load(ref, + SCRIBO_TESTS_DIR "/primitive/extract/lines_v_pattern.ref.pbm"); + + image2d<bool> + vlines = primitive::extract::lines_v_pattern(input, 51, 5); - mln_assertion(bin == ref); + mln_assertion(vlines == ref); } diff --git a/scribo/tests/img/lines_discontinued.pbm b/scribo/tests/primitive/extract/lines_v_pattern.ref.pbm similarity index 91% copy from scribo/tests/img/lines_discontinued.pbm copy to scribo/tests/primitive/extract/lines_v_pattern.ref.pbm index 799b2da..1ebd904 100644 Binary files a/scribo/tests/img/lines_discontinued.pbm and b/scribo/tests/primitive/extract/lines_v_pattern.ref.pbm differ -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-236-g6e2cefa
by git＠lrde.epita.fr 06 Mar '13

06 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 6e2cefa449cd91c115de3951a2db5046f2246ef5 (commit) from 4e4b11504e814bfeff1be05e3045599d2d758ae2 (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 ----------------------------------------------------------------- 6e2cefa Fix wrong line reconstruction with lines_*_pattern routines. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/scribo/primitive/extract/lines_h_pattern.hh | 12 +++++++----- scribo/scribo/primitive/extract/lines_v_pattern.hh | 11 +++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-236-g6e2cefa Fix wrong line reconstruction with lines_*_pattern routines.
by Guillaume Lazzara 06 Mar '13

06 Mar '13

* scribo/primitive/extract/lines_h_pattern.hh, * scribo/primitive/extract/lines_v_pattern.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/primitive/extract/lines_h_pattern.hh | 12 +++++++----- scribo/scribo/primitive/extract/lines_v_pattern.hh | 11 +++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cddcb15..905d53f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2013-03-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix wrong line reconstruction with lines_*_pattern routines. + + * scribo/primitive/extract/lines_h_pattern.hh, + * scribo/primitive/extract/lines_v_pattern.hh: Here. + +2013-03-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more tests for lines_*_discontinued routines. * tests/primitive/extract/Makefile.am: New targets. diff --git a/scribo/scribo/primitive/extract/lines_h_pattern.hh b/scribo/scribo/primitive/extract/lines_h_pattern.hh index 3cedf53..ecfea5f 100644 --- a/scribo/scribo/primitive/extract/lines_h_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_h_pattern.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -44,7 +44,6 @@ # include <scribo/primitive/internal/rd.hh> - namespace scribo { @@ -106,10 +105,13 @@ namespace scribo mln_concrete(I) output = lines_pattern(input, length, 1, win); + unsigned hl = length; + if (! (hl % 2)) + ++hl; + win::rectangle2d w(delta, hl); + mln_concrete(I) - output_dil = morpho::dilation(output, - win::rectangle2d(2 * delta + 1, - length + 2)); + output_dil = morpho::dilation(output, w); output = scribo::primitive::internal::rd(output, input * output_dil); diff --git a/scribo/scribo/primitive/extract/lines_v_pattern.hh b/scribo/scribo/primitive/extract/lines_v_pattern.hh index 2908c8b..df5ee4c 100644 --- a/scribo/scribo/primitive/extract/lines_v_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_v_pattern.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -88,10 +88,13 @@ namespace scribo mln_concrete(I) output = lines_pattern(input, length, 0, win); + unsigned vl = length; + if (! (vl % 2)) + ++vl; + win::rectangle2d w(vl, delta); + mln_concrete(I) - output_dil = morpho::dilation(output, - win::rectangle2d(2 * delta + 1, - length + 2)); + output_dil = morpho::dilation(output, w); output = scribo::primitive::internal::rd(output, input * output_dil); -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-235-g4e4b115
by git＠lrde.epita.fr 06 Mar '13

06 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 4e4b11504e814bfeff1be05e3045599d2d758ae2 (commit) from 01f60706dcad67fb488f43ee752f5a6a91790d82 (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 ----------------------------------------------------------------- 4e4b115 Add more tests for lines_*_discontinued routines. ----------------------------------------------------------------------- Summary of changes: 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%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

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