- Olena-patches

branch exp/TL created: olena-2.0-497-gee28c06
by git＠lrde.epita.fr 16 Apr '13

16 Apr '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 exp/TL has been created at ee28c0638e95109490ffb89e1b175802e6c82634 (commit) - Log ----------------------------------------------------------------- ee28c06 Merge branch 'exp/tmms' into exp/TL c7d481b Merge branch 'exp/tmms' into exp/TL b9d1611 Merge branch 'exp/tmms' into exp/TL ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-497-gee28c06 Merge branch 'exp/tmms' into exp/TL
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

This is a merge commit message of the following branches: Merge: c7d481b 65cb509 milena/mln/binarization/tmms_hysteresis.hh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/tmms created: olena-2.0-493-g65cb509
by git＠lrde.epita.fr 16 Apr '13

16 Apr '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 exp/tmms has been created at 65cb509e02b9da20679880798b8446cf23db1a0d (commit) - Log ----------------------------------------------------------------- 65cb509 mln/binarization/.hh: Fix pointer in tmms_hysteresis fast version. f5d258f mln/binarization/tmms_hysteresis: Fix call to macro mln_trait_image_speed. 1dea6e3 mln/binarization/tmms_hysteresis: Fix function prototypes. 78a0c1a mln/binarization/tmms_hysteresis: Fix pointer declarations. 51c1049 mln/binarization/tmms_hysteresis: Fix row declaration. 291cf06 mln/binarization/tmms_hysteresis: Fix functions names. 2294b8c mln/binarization/tmms_hysteresis.hh: Add missing template. e6fde5b Add tmms and tmms combined with hysteresis. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-561-gdfcf607 mln/binarization/.hh: Fix pointer in tmms_hysteresis fast version.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 9960af9..0e34f63 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -221,6 +221,11 @@ namespace mln else (*p_low_image) = (*p_high_image) = min_level; } + p_in_image++; + p_dilation++; + p_erosion++; + p_low_image++; + p_high_image++; } } -- 1.7.2.5

1 0

olena-2.0-493-g65cb509 mln/binarization/.hh: Fix pointer in tmms_hysteresis fast version.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 9960af9..0e34f63 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -221,6 +221,11 @@ namespace mln else (*p_low_image) = (*p_high_image) = min_level; } + p_in_image++; + p_dilation++; + p_erosion++; + p_low_image++; + p_high_image++; } } -- 1.7.2.5

1 0

olena-2.0-495-gc7d481b Merge branch 'exp/tmms' into exp/TL
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

This is a merge commit message of the following branches: Merge: b9d1611 f5d258f milena/mln/binarization/tmms_hysteresis.hh | 87 +++++++++++++++------------- 1 files changed, 46 insertions(+), 41 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-560-g49e9426 mln/binarization/tmms_hysteresis: Fix call to macro mln_trait_image_speed.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 8b5bcc5..9960af9 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -292,7 +292,8 @@ namespace mln return tmms_hysteresis_dispatch(ima, struct_element, c_min_low, c_min_high, min_level, med_level, max_level, pourcent, - mln_trait_image_speed(I)); + mln_trait_image_speed(I)() + ); } } //end of namespace namespace mln::binarization::internal -- 1.7.2.5

1 0

olena-2.0-492-gf5d258f mln/binarization/tmms_hysteresis: Fix call to macro mln_trait_image_speed.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 8b5bcc5..9960af9 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -292,7 +292,8 @@ namespace mln return tmms_hysteresis_dispatch(ima, struct_element, c_min_low, c_min_high, min_level, med_level, max_level, pourcent, - mln_trait_image_speed(I)); + mln_trait_image_speed(I)() + ); } } //end of namespace namespace mln::binarization::internal -- 1.7.2.5

1 0

olena: olena-2.0-559-gde7480f mln/binarization/tmms_hysteresis: Fix function prototypes.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 9ddf459..8b5bcc5 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -258,8 +258,9 @@ namespace mln template<typename I, typename W> mln_concrete(I) tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const I& c_min_low, const I& c_min_high, - const I& min_level, const I& med_level, const I& max_level, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, const mln_value(I)& med_level, + const mln_value(I)& max_level, const int pourcent, mln::trait::image::speed::any) { return mln::binarization::impl::generic::tmms_hysteresis(ima, @@ -270,8 +271,9 @@ namespace mln template<typename I, typename W> mln_concrete(I) tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const I& c_min_low, const I& c_min_high, - const I& min_level, const I& med_level, const I& max_level, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, const mln_value(I)& med_level, + const mln_value(I)& max_level, const int pourcent, mln::trait::image::speed::fastest) { return mln::binarization::impl::tmms_hysteresis_fastest(ima, -- 1.7.2.5

1 0

olena-2.0-491-g1dea6e3 mln/binarization/tmms_hysteresis: Fix function prototypes.
by Jonathan Fabrizio 16 Apr '13

16 Apr '13

--- milena/mln/binarization/tmms_hysteresis.hh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 9ddf459..8b5bcc5 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -258,8 +258,9 @@ namespace mln template<typename I, typename W> mln_concrete(I) tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const I& c_min_low, const I& c_min_high, - const I& min_level, const I& med_level, const I& max_level, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, const mln_value(I)& med_level, + const mln_value(I)& max_level, const int pourcent, mln::trait::image::speed::any) { return mln::binarization::impl::generic::tmms_hysteresis(ima, @@ -270,8 +271,9 @@ namespace mln template<typename I, typename W> mln_concrete(I) tmms_hysteresis_dispatch(const I& ima, const W& struct_element, - const I& c_min_low, const I& c_min_high, - const I& min_level, const I& med_level, const I& max_level, + const mln_value(I)& c_min_low, const mln_value(I)& c_min_high, + const mln_value(I)& min_level, const mln_value(I)& med_level, + const mln_value(I)& max_level, const int pourcent, mln::trait::image::speed::fastest) { return mln::binarization::impl::tmms_hysteresis_fastest(ima, -- 1.7.2.5

1 0