Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-823-gf8f7d6e scribo/primitive/link/internal/link_functor_base.hh: Stop neighbor lookup when a separator is found.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ .../primitive/link/internal/link_functor_base.hh | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index baca941..df923b8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/primitive/link/internal/link_functor_base.hh: Stop + neighbor lookup when a separator is found. + 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> Fix namespace ambiguities. diff --git a/scribo/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh index d214c91..5b4fefa 100644 --- a/scribo/scribo/primitive/link/internal/link_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/link_functor_base.hh @@ -232,9 +232,14 @@ namespace scribo { (void) start_point; mln_value(L) v = this->labeled_image_(p); - bool is_separator = this->components_.separators()(p); - if (is_separator) + // We found that we are passing through a separator. We stop + // looking up for a neighbor by returning true. + // + // Since we don't want to link with a separator, + // verify_link_criterion will invalidate this link. + // + if (this->components_.has_separators() && this->components_.separators()(p)) return true; return v != literal::zero // Not the background -- 1.5.6.5

13 years, 10 months

branch next-build-test updated: last-svn-commit-821-g6c07eb0

by lazzara＠lrde.epita.fr

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 next-build-test has been updated via 6c07eb07cb2b526fcc5f6f1e3e9129a909059907 (commit) from 3c5ade3ef4ade56a212f140ccfaf964f6c045c26 (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 ----------------------------------------------------------------- 6c07eb0 Regen generated files. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 - milena/tests/unit_test/unit-tests.mk | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 10 months

last-svn-commit-821-g6c07eb0 Regen generated files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 1 - milena/tests/unit_test/unit-tests.mk | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8e3a24d..360e77e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> Regen generated files. diff --git a/milena/headers.mk b/milena/headers.mk index bb64c9d..762e963 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -42,7 +42,6 @@ mln/accu/shape/all.hh \ mln/accu/shape/bbox.hh \ mln/accu/shape/essential.hh \ mln/accu/shape/height.hh \ -mln/accu/shape/site_list.hh \ mln/accu/shape/volume.hh \ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 2a44d75..59a3fc1 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -135,7 +135,6 @@ mln_accu_shape_all \ mln_accu_shape_bbox \ mln_accu_shape_essential \ mln_accu_shape_height \ -mln_accu_shape_site_list \ mln_accu_shape_volume \ mln_accu_site_set_all \ mln_accu_site_set_essential \ @@ -1461,7 +1460,6 @@ mln_accu_shape_all_SOURCES = mln_accu_shape_all.cc mln_accu_shape_bbox_SOURCES = mln_accu_shape_bbox.cc mln_accu_shape_essential_SOURCES = mln_accu_shape_essential.cc mln_accu_shape_height_SOURCES = mln_accu_shape_height.cc -mln_accu_shape_site_list_SOURCES = mln_accu_shape_site_list.cc mln_accu_shape_volume_SOURCES = mln_accu_shape_volume.cc mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc -- 1.5.6.5

13 years, 10 months

last-svn-commit-821-g4ad3ae8 Regen generated files.

by Guillaume Lazzara

13 years, 10 months

last-svn-commit-822-gdc4ed30 Regen generated files.

by Guillaume Lazzara

13 years, 10 months

branch next-build-test updated: last-svn-commit-820-g3c5ade3

by lazzara＠lrde.epita.fr

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 next-build-test has been updated via 3c5ade3ef4ade56a212f140ccfaf964f6c045c26 (commit) from 2021de27002717089153ea8bb6e1eb117e329cb8 (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 ----------------------------------------------------------------- 3c5ade3 Fix namespace ambiguities. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 +++++++++ scribo/src/debug/show_groups_bboxes.cc | 2 +- .../src/debug/show_links_bottom_aligned_2angles.cc | 8 +++++--- scribo/src/debug/show_links_top_aligned_2angles.cc | 7 ++++--- 4 files changed, 19 insertions(+), 7 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 10 months

last-svn-commit-820-g3c5ade3 Fix namespace ambiguities.

by Guillaume Lazzara

* src/debug/show_groups_bboxes.cc, * src/debug/show_links_bottom_aligned_2angles.cc, * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: prefix. --- scribo/ChangeLog | 9 +++++++++ scribo/src/debug/show_groups_bboxes.cc | 2 +- .../src/debug/show_links_bottom_aligned_2angles.cc | 8 +++++--- scribo/src/debug/show_links_top_aligned_2angles.cc | 7 ++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9d93e9e..db6bc11 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix namespace ambiguities. + + * src/debug/show_groups_bboxes.cc, + * src/debug/show_links_bottom_aligned_2angles.cc, + * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: + prefix. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am: define HAVE_QT for content_in_doc. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index eff0eb7..58c45d0 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) object_links<L> - left_link = link::with_single_left_link_dmax_ratio( + left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), link::internal::dmax_default(1), diff --git a/scribo/src/debug/show_links_bottom_aligned_2angles.cc b/scribo/src/debug/show_links_bottom_aligned_2angles.cc index 4b0e765..05fdca9 100644 --- a/scribo/src/debug/show_links_bottom_aligned_2angles.cc +++ b/scribo/src/debug/show_links_bottom_aligned_2angles.cc @@ -88,11 +88,13 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictBottomCenter); - object_links<L> output = link::compute(functor, anchor::Bottom); + object_links<L> output = primitive::link::compute(functor, anchor::Bottom); scribo::debug::logger().set_level(scribo::debug::None); diff --git a/scribo/src/debug/show_links_top_aligned_2angles.cc b/scribo/src/debug/show_links_top_aligned_2angles.cc index 48f3a13..59692cf 100644 --- a/scribo/src/debug/show_links_top_aligned_2angles.cc +++ b/scribo/src/debug/show_links_top_aligned_2angles.cc @@ -88,11 +88,12 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictTopCenter); - object_links<L> output = link::compute(functor, anchor::Top); + object_links<L> output = primitive::link::compute(functor, anchor::Top); scribo::debug::logger().set_level(scribo::debug::None); -- 1.5.6.5

13 years, 10 months

last-svn-commit-820-g31809b6 Fix namespace ambiguities.

by Guillaume Lazzara

13 years, 10 months

last-svn-commit-821-gaa0ecbc Fix namespace ambiguities.

by Guillaume Lazzara

* src/debug/show_groups_bboxes.cc, * src/debug/show_links_bottom_aligned_2angles.cc, * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: prefix. --- scribo/ChangeLog | 9 +++++++++ scribo/src/debug/show_groups_bboxes.cc | 2 +- .../src/debug/show_links_bottom_aligned_2angles.cc | 8 +++++--- scribo/src/debug/show_links_top_aligned_2angles.cc | 7 ++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 325a0ab..baca941 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix namespace ambiguities. + + * src/debug/show_groups_bboxes.cc, + * src/debug/show_links_bottom_aligned_2angles.cc, + * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: + prefix. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am: define HAVE_QT for content_in_doc. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index eff0eb7..58c45d0 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) object_links<L> - left_link = link::with_single_left_link_dmax_ratio( + left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), link::internal::dmax_default(1), diff --git a/scribo/src/debug/show_links_bottom_aligned_2angles.cc b/scribo/src/debug/show_links_bottom_aligned_2angles.cc index 4b0e765..05fdca9 100644 --- a/scribo/src/debug/show_links_bottom_aligned_2angles.cc +++ b/scribo/src/debug/show_links_bottom_aligned_2angles.cc @@ -88,11 +88,13 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictBottomCenter); - object_links<L> output = link::compute(functor, anchor::Bottom); + object_links<L> output = primitive::link::compute(functor, anchor::Bottom); scribo::debug::logger().set_level(scribo::debug::None); diff --git a/scribo/src/debug/show_links_top_aligned_2angles.cc b/scribo/src/debug/show_links_top_aligned_2angles.cc index 48f3a13..59692cf 100644 --- a/scribo/src/debug/show_links_top_aligned_2angles.cc +++ b/scribo/src/debug/show_links_top_aligned_2angles.cc @@ -88,11 +88,12 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictTopCenter); - object_links<L> output = link::compute(functor, anchor::Top); + object_links<L> output = primitive::link::compute(functor, anchor::Top); scribo::debug::logger().set_level(scribo::debug::None); -- 1.5.6.5

13 years, 10 months

branch next-build-test updated: last-svn-commit-819-g2021de2

by lazzara＠lrde.epita.fr

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 next-build-test has been updated via 2021de27002717089153ea8bb6e1eb117e329cb8 (commit) via b4dcface8e9554a81fd84675f18b2abd6c51cb9e (commit) from db7457153f9ac3811483be20a4d8981e31443785 (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 ----------------------------------------------------------------- 2021de2 src/Makefile.am: define HAVE_QT for content_in_doc. b4dcfac Add missing anchor argument. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 12 ++++++++++++ .../primitive/link/internal/find_several_links.hh | 8 ++++---- .../link/internal/link_several_dmax_base.hh | 7 +++++-- .../link/internal/link_single_dmax_base.hh | 10 +++++++--- scribo/src/Makefile.am | 2 +- 5 files changed, 29 insertions(+), 10 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches