- Olena-patches

last-svn-commit-967-g13db8ed tests/border/mirror.cc: Revamp test.
by Guillaume Lazzara 07 Sep '11

07 Sep '11

--- milena/ChangeLog | 4 ++ milena/tests/border/mirror.cc | 74 ++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 12311da..6dd4556 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/border/mirror.cc: Revamp test. + 2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in Milena. diff --git a/milena/tests/border/mirror.cc b/milena/tests/border/mirror.cc index 226490d..e49e4b0 100644 --- a/milena/tests/border/mirror.cc +++ b/milena/tests/border/mirror.cc @@ -51,51 +51,35 @@ main (void) } - image2d<int> ima(2, 3, 2); + // Image2d + { + image2d<unsigned> input(2, 2, 4); + debug::iota(input, 0); + border::mirror(input); + debug::println_with_border(input); + } + + + // Image2d + { + unsigned ref_data[6][7] = { + { 1, 1, 4, 5, 6, 3, 3 }, + { 1, 1, 1, 2, 3, 3, 3 }, + { 2, 1, 1, 2, 3, 3, 2 }, + { 5, 4, 4, 5, 6, 6, 5 }, + { 4, 4, 4, 5, 6, 6, 6 }, + { 4, 4, 1, 2, 3, 6, 6 } + }; + - debug::iota(ima); - border::mirror(ima); + image2d<unsigned> ref = make::image(ref_data); + image2d<unsigned> input(2, 3, 2); + image2d<unsigned> res(6, 7, 0); + debug::iota(input, 0); + border::mirror(input); - mln_assertion(opt::element(ima, 0) == 1); - mln_assertion(opt::element(ima, 1) == 1); - mln_assertion(opt::element(ima, 2) == 4); - mln_assertion(opt::element(ima, 3) == 5); - mln_assertion(opt::element(ima, 4) == 6); - mln_assertion(opt::element(ima, 5) == 3); - mln_assertion(opt::element(ima, 6) == 3); - mln_assertion(opt::element(ima, 7) == 1); - mln_assertion(opt::element(ima, 8) == 1); - mln_assertion(opt::element(ima, 9) == 1); - mln_assertion(opt::element(ima, 10) == 2); - mln_assertion(opt::element(ima, 11) == 3); - mln_assertion(opt::element(ima, 12) == 3); - mln_assertion(opt::element(ima, 13) == 3); - mln_assertion(opt::element(ima, 14) == 2); - mln_assertion(opt::element(ima, 15) == 1); - mln_assertion(opt::element(ima, 16) == 1); - mln_assertion(opt::element(ima, 17) == 2); - mln_assertion(opt::element(ima, 18) == 3); - mln_assertion(opt::element(ima, 19) == 3); - mln_assertion(opt::element(ima, 20) == 2); - mln_assertion(opt::element(ima, 21) == 5); - mln_assertion(opt::element(ima, 22) == 4); - mln_assertion(opt::element(ima, 23) == 4); - mln_assertion(opt::element(ima, 24) == 5); - mln_assertion(opt::element(ima, 25) == 6); - mln_assertion(opt::element(ima, 26) == 6); - mln_assertion(opt::element(ima, 27) == 5); - mln_assertion(opt::element(ima, 28) == 4); - mln_assertion(opt::element(ima, 29) == 4); - mln_assertion(opt::element(ima, 30) == 4); - mln_assertion(opt::element(ima, 31) == 5); - mln_assertion(opt::element(ima, 32) == 6); - mln_assertion(opt::element(ima, 33) == 6); - mln_assertion(opt::element(ima, 34) == 6); - mln_assertion(opt::element(ima, 35) == 4); - mln_assertion(opt::element(ima, 36) == 4); - mln_assertion(opt::element(ima, 37) == 1); - mln_assertion(opt::element(ima, 38) == 2); - mln_assertion(opt::element(ima, 39) == 3); - mln_assertion(opt::element(ima, 40) == 6); - mln_assertion(opt::element(ima, 41) == 6); + data::paste_without_localization(extended_to(input, input.vbbox()), res); + + mln_assertion(res == ref); + } } -- 1.7.2.5

1 0

last-svn-commit-540-gc4bb3f8 mln/io/dicom/load.hh: Fix invalid data while loading large image.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

--- milena/ChangeLog | 5 +++++ milena/mln/io/dicom/load.hh | 32 +++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77e5cc3..98f7f77 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-05-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Fix invalid data while loading large + image. + 2010-12-10 Roland Levillain <roland(a)lrde.epita.fr> Ensure non implemented reconstructions on sets abort at run time. diff --git a/milena/mln/io/dicom/load.hh b/milena/mln/io/dicom/load.hh index f250a16..fb6996b 100644 --- a/milena/mln/io/dicom/load.hh +++ b/milena/mln/io/dicom/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -139,14 +140,21 @@ namespace mln algebra::vec<mln_site_(I)::dim, unsigned int> vmin; algebra::vec<mln_site_(I)::dim, unsigned int> vmax; algebra::vec<mln_site_(I)::dim, unsigned int> vdims; - for (int i = 0; i < ndims; ++i) + int j = ndims - 1; + for (int i = 0; i < ndims; ++i, --j) { vmin[i] = 0; vmax[i] = dims[i] - 1; if (i == 0) - vdims[i] = 1; + vdims[j] = 1; else - vdims[i] = dims[i - 1] * vdims[i - 1]; + vdims[j] = dims[i - 1] * vdims[j + 1]; + } + + if (ndims > 1) + { + std::swap(vmin[0], vmin[1]); + std::swap(vmax[0], vmax[1]); } mln_site(I) pmin(vmin); @@ -155,25 +163,23 @@ namespace mln initialize(ima, result); mln_piter(I) p(ima.domain()); unsigned int index = 0; + for_all(p) { index = 0; for (int i = 0; i < ndims; ++i) { - index += p.to_site().to_vec()[i] * vdims[i]; + index += p[i] * vdims[i]; } - ima(p) = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; + mln_value(I) v = (unsigned char) dataBuffer[(index * bytes_allocated) * samples_per_pixel]; // FIXME: RGB support, HighBit if HB == 1 - for (int j = 0; j < bytes_allocated; ++j) + for (unsigned int j = 0; j < bytes_allocated; ++j) { - ima(p) += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; + v += ((unsigned char) dataBuffer[(index * bytes_allocated + j) * samples_per_pixel]) * 256 * j; } - /*std::cout << "[ x = " << p.to_site().to_vec()[0] - << " | y = " << p.to_site().to_vec()[1] - << " | z = " << p.to_site().to_vec()[2] - << " ] => " << ima(p) - << std::endl;*/ + + ima(p) = v; } delete(dataBuffer); -- 1.5.6.5

2 1

branch unstable/scribo updated: last-svn-commit-966-gb072c63
by lazzara＠lrde.epita.fr 06 Sep '11

06 Sep '11

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 b072c6336956c5ab43f4b46f3d20959b3110c529 (commit) from 747e25c262ed65754226837035703790670b9969 (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 ----------------------------------------------------------------- b072c63 tests/img/several_objects.pgm: Add a new test image. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/img/several_objects.pgm | Bin 0 -> 308 bytes 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 scribo/tests/img/several_objects.pgm hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-966-gb072c63 tests/img/several_objects.pgm: Add a new test image.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

--- scribo/ChangeLog | 4 ++++ scribo/tests/img/several_objects.pgm | Bin 0 -> 308 bytes 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 scribo/tests/img/several_objects.pgm diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3472f2c..060bd2a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/img/several_objects.pgm: Add a new test image. + +2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. * scribo/debug/option_check.hh, diff --git a/scribo/tests/img/several_objects.pgm b/scribo/tests/img/several_objects.pgm new file mode 100644 index 0000000000000000000000000000000000000000..44ec148e61592f0e61c6384510bb0c3439558e3d GIT binary patch literal 308 zcmWGA<x*B~4svx2@ei_6aQE~LPzdnzRdCD9DM>9-2um$0&dkqKFw`^TGBi^#G~+Td kHRWQ!3z+fB;+AA&WJHz(a!~}(`3$Ji$XY38GvPM@0Mq~tZU6uP literal 0 HcmV?d00001 -- 1.7.2.5

1 0

branch unstable/scribo updated: last-svn-commit-965-g747e25c
by lazzara＠lrde.epita.fr 06 Sep '11

06 Sep '11

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 discards 33d0eb2944157526a4e72af100a8ffebcff22e4b (commit) discards a046910585664ff3d165502289aa3fbbd4a170f5 (commit) discards ab2583704057c1d6295075b5b38cff6bccb34af9 (commit) discards 9f32e44c2cd5c2a86876d80cc96006fce9c15aaf (commit) discards 810d1584d6ef795173a5ef4bdf2412b1b43bace1 (commit) discards 7d6dcc263573fcc224be43560c67280ffb1915bc (commit) discards b0f7350085bdceec275c79df6219f2f0f076249c (commit) via 747e25c262ed65754226837035703790670b9969 (commit) via fd644948ef21b0b88493f6350a0aa04308e876cf (commit) via 7c8d8eda94fa1f420e305258654f71c8fd333538 (commit) via 61c62c6d880f2a114f2b481c14e9c23c5af6429c (commit) via 0ba8b5ae1e267b088aa2cdff8e844bdec56958e0 (commit) via dea3d62281f86d9dff6b232dcd177bfbb3356df0 (commit) via 61b22955f2cfbaa5e4742ae45a019ff1f3c2d845 (commit) via a93cf00933a19cdf43a55ba7aed5a9e46bec8364 (commit) via f46fc5c9dc1ea30d5203c7dfb58b06d000f62dcd (commit) via 5846e89444ff10b0db5bc6a11b6002bc93c590fa (commit) via a84a70d11bb5a39d79af1b0e219cfc1cbbe429bd (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (33d0eb2944157526a4e72af100a8ffebcff22e4b) \ N -- N -- N (747e25c262ed65754226837035703790670b9969) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 747e25c Small fixes in Scribo. fd64494 Small fixes in Milena. 7c8d8ed mln/morpho/skeleton_constrained.hh: Fix algorithm. 61c62c6 Fix Makefiles in Scribo. 0ba8b5a configure.ac: Remove references to deprecated Makefiles. dea3d62 Regen generated files in Milena. 61b2295 Regen generated files in Scribo. a93cf00 mln/debug/println_with_border.spe.hh: Improve output for 3D images. f46fc5c Add vbbox() method. 5846e89 build-aux/texi2dvi: Fix a regular expression. a84a70d NEWS: List changes for the next release. ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 2 +- milena/ChangeLog | 20 ++++++++++++++++++++ milena/mln/draw/site_set.hh | 6 +++--- milena/mln/morpho/skeleton_constrained.hh | 22 +++++++++++++--------- milena/mln/topo/is_simple_2d.hh | 1 + milena/mln/topo/skeleton/is_simple_point.hh | 3 ++- milena/tests/topo/skeleton/is_simple_point.cc | 9 ++++++++- scribo/ChangeLog | 18 ++++++++++++++++++ scribo/scribo/debug/option_check.hh | 3 +++ scribo/scribo/debug/option_parser.hh | 1 + scribo/scribo/estim/components_features.hh | 8 +++++++- scribo/src/primitive/Makefile.am | 6 ++++-- scribo/tests/primitive/extract/Makefile.am | 8 ++++---- 14 files changed, 86 insertions(+), 23 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-961-g0ba8b5a configure.ac: Remove references to deprecated Makefiles.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

--- ChangeLog | 4 ++++ configure.ac | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c029f64..d6dfc6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Remove references to deprecated Makefiles. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/texi2dvi: Fix a regular expression. 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 66643a4..2563153 100644 --- a/configure.ac +++ b/configure.ac @@ -351,8 +351,6 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/estim/Makefile scribo/tests/filter/Makefile - scribo/tests/io/Makefile - scribo/tests/io/xml/Makefile scribo/tests/preprocessing/Makefile scribo/tests/primitive/Makefile scribo/tests/primitive/extract/Makefile -- 1.7.2.5

1 0

last-svn-commit-965-g747e25c Small fixes in Scribo.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

* scribo/debug/option_check.hh, * scribo/debug/option_parser.hh: Add missing includes. * scribo/estim/components_features.hh: Add preconditions. --- scribo/ChangeLog | 9 +++++++++ scribo/scribo/debug/option_check.hh | 3 +++ scribo/scribo/debug/option_parser.hh | 1 + scribo/scribo/estim/components_features.hh | 8 +++++++- 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 37b4d0d..3472f2c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Scribo. + + * scribo/debug/option_check.hh, + * scribo/debug/option_parser.hh: Add missing includes. + + * scribo/estim/components_features.hh: Add preconditions. + 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> Fix Makefiles in Scribo. diff --git a/scribo/scribo/debug/option_check.hh b/scribo/scribo/debug/option_check.hh index a466b4b..4a0acd1 100644 --- a/scribo/scribo/debug/option_check.hh +++ b/scribo/scribo/debug/option_check.hh @@ -26,7 +26,10 @@ #ifndef SCRIBO_DEBUG_OPTION_CHECK_HH # define SCRIBO_DEBUG_OPTION_CHECK_HH +# include <string.h> +# include <cstdlib> # include <vector> +# include <iostream> # include <mln/core/contract.hh> namespace scribo diff --git a/scribo/scribo/debug/option_parser.hh b/scribo/scribo/debug/option_parser.hh index 4299723..9795a78 100644 --- a/scribo/scribo/debug/option_parser.hh +++ b/scribo/scribo/debug/option_parser.hh @@ -26,6 +26,7 @@ #ifndef SCRIBO_DEBUG_OPTION_PARSER_HH # define SCRIBO_DEBUG_OPTION_PARSER_HH +# include <map> # include <scribo/debug/option_check.hh> namespace scribo diff --git a/scribo/scribo/estim/components_features.hh b/scribo/scribo/estim/components_features.hh index b85dd00..4db21e2 100644 --- a/scribo/scribo/estim/components_features.hh +++ b/scribo/scribo/estim/components_features.hh @@ -77,11 +77,17 @@ namespace scribo template <typename I, typename J, typename L> component_set<L> - components_features(const Image<I>& input, const Image<J>& bin_input, + components_features(const Image<I>& input_, const Image<J>& bin_input_, const component_set<L>& components) { trace::entering("scribo::estim::components_features"); + const I& input = exact(input_); + const J& bin_input = exact(bin_input_); + + mln_precondition(input.is_valid()); + mln_precondition(bin_input.is_valid()); + component_set<L> output = components.duplicate(); component_features_data features; -- 1.7.2.5

1 0

last-svn-commit-964-gfd64494 Small fixes in Milena.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

* mln/draw/site_set.hh: Remove call to exact(). * mln/morpho/skeleton_constrained.hh: Add a missing const in fast implementation. * mln/topo/is_simple_2d.hh: Add a comment. * mln/topo/skeleton/is_simple_point.hh: Fix a wrong neighborhood type. * tests/topo/skeleton/is_simple_point.cc: Fix compilation. --- milena/ChangeLog | 16 ++++++++++++++++ milena/mln/draw/site_set.hh | 6 +++--- milena/mln/morpho/skeleton_constrained.hh | 2 +- milena/mln/topo/is_simple_2d.hh | 1 + milena/mln/topo/skeleton/is_simple_point.hh | 3 ++- milena/tests/topo/skeleton/is_simple_point.cc | 9 ++++++++- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5f2a930..12311da 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Milena. + + * mln/draw/site_set.hh: Remove call to exact(). + + * mln/morpho/skeleton_constrained.hh: Add a missing const in fast + implementation. + + * mln/topo/is_simple_2d.hh: Add a comment. + + * mln/topo/skeleton/is_simple_point.hh: Fix a wrong neighborhood + type. + + * tests/topo/skeleton/is_simple_point.cc: Fix compilation. + +2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/morpho/skeleton_constrained.hh: Fix algorithm. 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/draw/site_set.hh b/milena/mln/draw/site_set.hh index 1738b16..1f0ab78 100644 --- a/milena/mln/draw/site_set.hh +++ b/milena/mln/draw/site_set.hh @@ -67,12 +67,12 @@ namespace mln const mln_value(I)& v, unsigned output_ratio) { - mln_precondition(exact(ima).is_valid()); - mln_precondition(exact(ima).domain() >= exact(s)); - I& ima = exact(ima_); const S& s = exact(s_); + mln_precondition(ima.is_valid()); + mln_precondition(ima.domain() >= s); + mln_piter(S) p(s); for_all(p) ima(p / output_ratio) = v; diff --git a/milena/mln/morpho/skeleton_constrained.hh b/milena/mln/morpho/skeleton_constrained.hh index 3ada77e..37bce02 100644 --- a/milena/mln/morpho/skeleton_constrained.hh +++ b/milena/mln/morpho/skeleton_constrained.hh @@ -193,7 +193,7 @@ namespace mln output = duplicate(input); extension::adjust_fill(output, nbh, false); - mln_pixter(I) p_in(input); + mln_pixter(const I) p_in(input); for_all(p_in) if (p_in.val() == false && is_simple.check__(input, p_in)) // <-- is_simple.check diff --git a/milena/mln/topo/is_simple_2d.hh b/milena/mln/topo/is_simple_2d.hh index dd38df1..a5e67cb 100644 --- a/milena/mln/topo/is_simple_2d.hh +++ b/milena/mln/topo/is_simple_2d.hh @@ -161,6 +161,7 @@ namespace mln unsigned res = 0; + // Note: fwd here but bkd in is_simple_point.hh... mln_fwd_niter(N2) n(c8(), p); for_all(n) { diff --git a/milena/mln/topo/skeleton/is_simple_point.hh b/milena/mln/topo/skeleton/is_simple_point.hh index 9b9185e..9fa665c 100644 --- a/milena/mln/topo/skeleton/is_simple_point.hh +++ b/milena/mln/topo/skeleton/is_simple_point.hh @@ -159,7 +159,8 @@ namespace mln { unsigned res = 0; - mln_bkd_niter(N) n(c8(), p); + // Note: bkd here but fwd in is_simple_2d.hh... + mln_bkd_niter(N2) n(c8(), p); for_all(n) { res = (res << 1); diff --git a/milena/tests/topo/skeleton/is_simple_point.cc b/milena/tests/topo/skeleton/is_simple_point.cc index d5ff1e1..f559bb4 100644 --- a/milena/tests/topo/skeleton/is_simple_point.cc +++ b/milena/tests/topo/skeleton/is_simple_point.cc @@ -27,6 +27,7 @@ #include <mln/make/image2d.hh> #include <mln/topo/skeleton/is_simple_point.hh> #include <mln/make/image.hh> +#include <mln/make/dual_neighb.hh> static const unsigned ref[] = { 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0 }; @@ -40,8 +41,14 @@ int main() typedef image2d<bool> I; I ima = make::image(vals); + typedef + neighb<win::multiple_size<2u, window<dpoint<grid::square, short int> >, + pw::value_<image2d<bool> > > > + nbh_t; + nbh_t nbh = make::dual_neighb(ima, c8(), c4()); + unsigned i = 0; - topo::skeleton::is_simple_point<neighb2d> is_simple(c8()); + topo::skeleton::is_simple_point<nbh_t> is_simple(nbh); // Test generic version. { -- 1.7.2.5

1 0

last-svn-commit-963-g7c8d8ed mln/morpho/skeleton_constrained.hh: Fix algorithm.
by Guillaume Lazzara 06 Sep '11

06 Sep '11

--- milena/ChangeLog | 4 ++++ milena/mln/morpho/skeleton_constrained.hh | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dff1510..5f2a930 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-09-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/morpho/skeleton_constrained.hh: Fix algorithm. + 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> Regen generated files in Milena. diff --git a/milena/mln/morpho/skeleton_constrained.hh b/milena/mln/morpho/skeleton_constrained.hh index 6197509..3ada77e 100644 --- a/milena/mln/morpho/skeleton_constrained.hh +++ b/milena/mln/morpho/skeleton_constrained.hh @@ -32,6 +32,7 @@ /// Compute a skeleton under constraints. /// /// \todo Add an extension handling policy for the user to set it. +/// \fixme The fast version does not give the exact result! # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -93,6 +94,8 @@ namespace mln mlc_is(V, bool)::check(); extension::adjust_duplicate(input, nbh); + extension::adjust_duplicate(constraint, nbh); + extension::adjust_duplicate(priority, nbh); // FIXME: Tests! @@ -107,9 +110,9 @@ namespace mln output = duplicate(input); extension::adjust_duplicate(output, nbh); - mln_piter(I) p(output.domain()); + mln_piter(I) p(input.domain()); for_all(p) - if (output(p) == false && + if (input(p) == false && is_simple.check(input, p)) // <-- is_simple.check // p is a simple point of the background. { @@ -120,7 +123,8 @@ namespace mln // Propagation. { P p; - mln_niter(N) n(nbh.foreground(), p); + + mln_niter(N) n(nbh, p); while (! q.is_empty()) { p = q.pop_front(); @@ -189,13 +193,13 @@ namespace mln output = duplicate(input); extension::adjust_fill(output, nbh, false); - mln_pixter(I) p_out(output); - for_all(p_out) - if (p_out.val() == false && - is_simple.check__(input, p_out)) // <-- is_simple.check - // p is a simple point of the background. + mln_pixter(I) p_in(input); + for_all(p_in) + if (p_in.val() == false && + is_simple.check__(input, p_in)) // <-- is_simple.check + // p is a simple point of the background. { - q.push(priority.element(p_out.offset()), p_out); + q.push(priority.element(p_in.offset()), p_in); } } -- 1.7.2.5

1 0

last-svn-commit-962-g61c62c6 Fix Makefiles in Scribo.
by Guillaume Lazzara 02 Sep '11

02 Sep '11

* src/primitive/Makefile.am: Add a missing subdir. * tests/primitive/extract/Makefile.am (EXTRA_DIST): Fix invalid file names. --- scribo/ChangeLog | 9 +++++++++ scribo/src/primitive/Makefile.am | 6 ++++-- scribo/tests/primitive/extract/Makefile.am | 8 ++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e9ad5eb..37b4d0d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Makefiles in Scribo. + + * src/primitive/Makefile.am: Add a missing subdir. + + * tests/primitive/extract/Makefile.am (EXTRA_DIST): Fix invalid + file names. + +2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files in Scribo. * headers.mk, diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am index 7e46a66..14751bf 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -19,4 +20,5 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ extract \ find \ - group + group \ + remove diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index b622b15..0a9df60 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -17,10 +17,10 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ - alignment_1.ref.png \ - alignment_2.ref.png \ - alignment_3.ref.png \ - alignment_4.ref.png + alignment_1.ref.pbm \ + alignment_2.ref.pbm \ + alignment_3.ref.pbm \ + alignment_4.ref.pbm check_PROGRAMS = -- 1.7.2.5

1 0