- Olena-patches

last-svn-commit-826-g87d708b Fix compilation issues on MAC.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

* scribo/core/line_info.hh: Explicitly call parent constructor. * scribo/primitive/extract/non_text.hh: Fix ambiguities on std::pow overloads. * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/core/line_info.hh | 3 ++- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- scribo/src/debug/show_groups_bboxes.cc | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 811fa11..ddb9868 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation issues on MAC. + + * scribo/core/line_info.hh: Explicitly call parent constructor. + * scribo/primitive/extract/non_text.hh: Fix ambiguities on + std::pow overloads. + + * src/debug/show_group_bboxes.cc: Fix namespace ambiguity. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 4def6fe..866e3f4 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -132,6 +132,7 @@ namespace scribo template <typename L> class line_info : public Serializable<line_info<L> > { + typedef Serializable<line_info<L> > parent_t; typedef internal::line_info_data<L> data_t; typedef mln::util::object_id<scribo::ComponentId, unsigned> component_id_t; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; @@ -352,7 +353,7 @@ namespace scribo template <typename L> line_info<L>::line_info() - : id_(0) + : parent_t(), id_(0) { } diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index a456270..cbc6ea2 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -116,8 +116,8 @@ namespace scribo } - const unsigned q_div = std::pow(2, 8 - nbits); - const unsigned q = unsigned(std::pow(2, nbits)); + const unsigned q_div = std::pow(2.f, (int)(8 - nbits)); + const unsigned q = unsigned(std::pow(2.f, (int)nbits)); const unsigned nelements = input.nelements(); diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index 58c45d0..b323976 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) if (argc != 3) { - std::cerr << "Usage : " << argv[0] << " input.* out.pbm" << std::endl; + std::cerr << "Usage : " << argv[0] << " input.pbm out.pbm" << std::endl; return 1; } @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), - link::internal::dmax_default(1), + primitive::link::internal::dmax_default(1), anchor::MassCenter); object_links<L> -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-824-g234857f
by lazzara＠lrde.epita.fr 21 Mar '11

21 Mar '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 next-build-test has been updated via 234857f163935061703e9a266f1d4819853784c2 (commit) via f74b26eef10f1d8c8d44c0ae6c5a4863e280cc3c (commit) via 7dcdc997eeb813df22ac5a1838f09ee98f776357 (commit) from 6c07eb07cb2b526fcc5f6f1e3e9129a909059907 (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 ----------------------------------------------------------------- 234857f scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer. f74b26e scribo/text/merging: Add a precondition. Fix merging policy. 7dcdc99 scribo/primitive/link/internal/link_functor_base.hh: Stop neighbor lookup when a separator is found. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 14 ++++++++++++++ .../primitive/link/internal/dmax_functor_base.hh | 2 +- .../primitive/link/internal/link_functor_base.hh | 9 +++++++-- scribo/scribo/text/merging.hh | 10 ++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-824-g234857f scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 5 +++++ .../primitive/link/internal/dmax_functor_base.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ace76e0..a6c7806 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the + dmax ratio safer. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh index 67a8db4..334cc4d 100644 --- a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh @@ -83,7 +83,7 @@ namespace scribo w = b.width(), h = b.height(); - return (w / 2.0f) + (dmax_factor_ * math::max(w, h)); + return (w / 2.0f) + (dmax_factor_ * h);//math::max(w, h)); } -- 1.5.6.5

1 0

last-svn-commit-824-g848f99d scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 5 +++++ .../primitive/link/internal/dmax_functor_base.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ace76e0..a6c7806 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the + dmax ratio safer. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh index 67a8db4..334cc4d 100644 --- a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh @@ -83,7 +83,7 @@ namespace scribo w = b.width(), h = b.height(); - return (w / 2.0f) + (dmax_factor_ * math::max(w, h)); + return (w / 2.0f) + (dmax_factor_ * h);//math::max(w, h)); } -- 1.5.6.5

1 0

last-svn-commit-825-g923a8af scribo/primitive/link/internal/dmax_functor_base.hh: Make the dmax ratio safer.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 5 +++++ .../primitive/link/internal/dmax_functor_base.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4f95c5..811fa11 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/internal/dmax_functor_base.hh: Make the + dmax ratio safer. + +2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh index 67a8db4..334cc4d 100644 --- a/scribo/scribo/primitive/link/internal/dmax_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh @@ -83,7 +83,7 @@ namespace scribo w = b.width(), h = b.height(); - return (w / 2.0f) + (dmax_factor_ * math::max(w, h)); + return (w / 2.0f) + (dmax_factor_ * h);//math::max(w, h)); } -- 1.5.6.5

1 0

last-svn-commit-823-gf74b26e scribo/text/merging: Add a precondition. Fix merging policy.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/text/merging.hh | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 78c687b..ace76e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. + +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. diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index f433e51..26e2da7 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -226,6 +226,9 @@ namespace scribo bool between_separators(const scribo::line_info<L>& l1, const scribo::line_info<L>& l2) { + // No separators found in image. + mln_precondition(l1.holder().components().has_separators()); + unsigned col1 = l1.bbox().pcenter().col(), col2 = l2.bbox().pcenter().col(); @@ -649,6 +652,13 @@ namespace scribo //if (!non_text_and_text_can_merge(lines(l), lines(mc))) // continue; + // Avoid the case when a large title ebbox overlap + // with a text column. In that case, the title may + // merge with punctuation from the text. + if (lines(l).holder().components().has_separators() + && between_separators(lines(l), lines(mc))) + continue; + // Mark current line as punctuation. lines(l).update_type(line::Punctuation); -- 1.5.6.5

1 0

last-svn-commit-823-g9b60b90 scribo/text/merging: Add a precondition. Fix merging policy.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/text/merging.hh | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 78c687b..ace76e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. + +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. diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index f433e51..26e2da7 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -226,6 +226,9 @@ namespace scribo bool between_separators(const scribo::line_info<L>& l1, const scribo::line_info<L>& l2) { + // No separators found in image. + mln_precondition(l1.holder().components().has_separators()); + unsigned col1 = l1.bbox().pcenter().col(), col2 = l2.bbox().pcenter().col(); @@ -649,6 +652,13 @@ namespace scribo //if (!non_text_and_text_can_merge(lines(l), lines(mc))) // continue; + // Avoid the case when a large title ebbox overlap + // with a text column. In that case, the title may + // merge with punctuation from the text. + if (lines(l).holder().components().has_separators() + && between_separators(lines(l), lines(mc))) + continue; + // Mark current line as punctuation. lines(l).update_type(line::Punctuation); -- 1.5.6.5

1 0

last-svn-commit-824-g662b1be scribo/text/merging: Add a precondition. Fix merging policy.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/text/merging.hh | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index df923b8..b4f95c5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/merging: Add a precondition. Fix merging policy. + +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. diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index f433e51..26e2da7 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -226,6 +226,9 @@ namespace scribo bool between_separators(const scribo::line_info<L>& l1, const scribo::line_info<L>& l2) { + // No separators found in image. + mln_precondition(l1.holder().components().has_separators()); + unsigned col1 = l1.bbox().pcenter().col(), col2 = l2.bbox().pcenter().col(); @@ -649,6 +652,13 @@ namespace scribo //if (!non_text_and_text_can_merge(lines(l), lines(mc))) // continue; + // Avoid the case when a large title ebbox overlap + // with a text column. In that case, the title may + // merge with punctuation from the text. + if (lines(l).holder().components().has_separators() + && between_separators(lines(l), lines(mc))) + continue; + // Mark current line as punctuation. lines(l).update_type(line::Punctuation); -- 1.5.6.5

1 0

last-svn-commit-822-g7dcdc99 scribo/primitive/link/internal/link_functor_base.hh: Stop neighbor lookup when a separator is found.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- 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 db6bc11..78c687b 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

1 0

last-svn-commit-822-g638a307 scribo/primitive/link/internal/link_functor_base.hh: Stop neighbor lookup when a separator is found.
by Guillaume Lazzara 21 Mar '11

21 Mar '11

--- 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 db6bc11..78c687b 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

1 0