March 2011 - Olena-patches

last-svn-commit-820-g3c5ade3 Fix namespace ambiguities.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* 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

1 0

branch next-build-test updated: last-svn-commit-819-g2021de2
by lazzara＠lrde.epita.fr 14 Mar '11

14 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 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

1 0

last-svn-commit-820-gb54ebe3 src/Makefile.am: define HAVE_QT for content_in_doc.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 38a9966..325a0ab 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 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> + Add missing anchor argument. * scribo/primitive/link/internal/find_several_links.hh, diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 3a35528..6360a56 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -104,7 +104,7 @@ if HAVE_QT $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ - $(QT_CPPFLAGS) + $(QT_CPPFLAGS) -DHAVE_QT content_in_doc_CXXFLAGS = $(AM_CXXFLAGS) \ $(QT_CXXFLAGS) content_in_doc_LDFLAGS = $(AM_LDFLAGS) \ -- 1.5.6.5

1 0

last-svn-commit-819-g30e9e38 src/Makefile.am: define HAVE_QT for content_in_doc.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5833fb9..9d93e9e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 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> + Add missing anchor argument. * scribo/primitive/link/internal/find_several_links.hh, diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 3a35528..6360a56 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -104,7 +104,7 @@ if HAVE_QT $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ - $(QT_CPPFLAGS) + $(QT_CPPFLAGS) -DHAVE_QT content_in_doc_CXXFLAGS = $(AM_CXXFLAGS) \ $(QT_CXXFLAGS) content_in_doc_LDFLAGS = $(AM_LDFLAGS) \ -- 1.5.6.5

1 0

last-svn-commit-819-g2021de2 src/Makefile.am: define HAVE_QT for content_in_doc.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5833fb9..9d93e9e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 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> + Add missing anchor argument. * scribo/primitive/link/internal/find_several_links.hh, diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 3a35528..6360a56 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -104,7 +104,7 @@ if HAVE_QT $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ - $(QT_CPPFLAGS) + $(QT_CPPFLAGS) -DHAVE_QT content_in_doc_CXXFLAGS = $(AM_CXXFLAGS) \ $(QT_CXXFLAGS) content_in_doc_LDFLAGS = $(AM_LDFLAGS) \ -- 1.5.6.5

1 0

last-svn-commit-819-gaac2de9 Add missing anchor argument.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* scribo/primitive/link/internal/find_several_links.hh, * scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. --- scribo/ChangeLog | 8 ++++++++ .../primitive/link/internal/find_several_links.hh | 8 ++++---- .../link/internal/link_several_dmax_base.hh | 7 +++++-- .../link/internal/link_single_dmax_base.hh | 10 +++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f84156c..38a9966 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing anchor argument. + + * scribo/primitive/link/internal/find_several_links.hh, + * scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. * headers.mk, diff --git a/scribo/scribo/primitive/link/internal/find_several_links.hh b/scribo/scribo/primitive/link/internal/find_several_links.hh index 4d9404e..2d4a663 100644 --- a/scribo/scribo/primitive/link/internal/find_several_links.hh +++ b/scribo/scribo/primitive/link/internal/find_several_links.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -106,10 +106,10 @@ namespace scribo && ! functor.is_potential_link(current_object, start_point, p) // <-- is_potential_link && functor.verify_link_criterion(current_object, - start_point, p)) // <-- verify_link_criterion + start_point, p, anchor)) // <-- verify_link_criterion functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh index e5b9ce2..422eed9 100644 --- a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh @@ -84,7 +84,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const; + const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -133,9 +134,11 @@ namespace scribo link_several_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh index aca3e67..113411c 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_base.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. // @@ -81,7 +82,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -116,9 +118,11 @@ namespace scribo link_single_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

1 0

last-svn-commit-818-g546e98d Add missing anchor argument.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* scribo/primitive/link/internal/find_several_links.hh, * scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. --- scribo/ChangeLog | 8 ++++++++ .../primitive/link/internal/find_several_links.hh | 8 ++++---- .../link/internal/link_several_dmax_base.hh | 7 +++++-- .../link/internal/link_single_dmax_base.hh | 10 +++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4a08433..5833fb9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing anchor argument. + + * scribo/primitive/link/internal/find_several_links.hh, + * scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. * headers.mk, diff --git a/scribo/scribo/primitive/link/internal/find_several_links.hh b/scribo/scribo/primitive/link/internal/find_several_links.hh index 4d9404e..2d4a663 100644 --- a/scribo/scribo/primitive/link/internal/find_several_links.hh +++ b/scribo/scribo/primitive/link/internal/find_several_links.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -106,10 +106,10 @@ namespace scribo && ! functor.is_potential_link(current_object, start_point, p) // <-- is_potential_link && functor.verify_link_criterion(current_object, - start_point, p)) // <-- verify_link_criterion + start_point, p, anchor)) // <-- verify_link_criterion functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh index e5b9ce2..422eed9 100644 --- a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh @@ -84,7 +84,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const; + const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -133,9 +134,11 @@ namespace scribo link_several_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh index aca3e67..113411c 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_base.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. // @@ -81,7 +82,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -116,9 +118,11 @@ namespace scribo link_single_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

1 0

last-svn-commit-818-gb4dcfac Add missing anchor argument.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* scribo/primitive/link/internal/find_several_links.hh, * scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. --- scribo/ChangeLog | 8 ++++++++ .../primitive/link/internal/find_several_links.hh | 8 ++++---- .../link/internal/link_several_dmax_base.hh | 7 +++++-- .../link/internal/link_single_dmax_base.hh | 10 +++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4a08433..5833fb9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing anchor argument. + + * scribo/primitive/link/internal/find_several_links.hh, + * scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. * headers.mk, diff --git a/scribo/scribo/primitive/link/internal/find_several_links.hh b/scribo/scribo/primitive/link/internal/find_several_links.hh index 4d9404e..2d4a663 100644 --- a/scribo/scribo/primitive/link/internal/find_several_links.hh +++ b/scribo/scribo/primitive/link/internal/find_several_links.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -106,10 +106,10 @@ namespace scribo && ! functor.is_potential_link(current_object, start_point, p) // <-- is_potential_link && functor.verify_link_criterion(current_object, - start_point, p)) // <-- verify_link_criterion + start_point, p, anchor)) // <-- verify_link_criterion functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh index e5b9ce2..422eed9 100644 --- a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh @@ -84,7 +84,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const; + const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -133,9 +134,11 @@ namespace scribo link_several_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh index aca3e67..113411c 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_base.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. // @@ -81,7 +82,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -116,9 +118,11 @@ namespace scribo link_single_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5

1 0

last-svn-commit-775-g9fc92d2 configure.ac: scribo/src/primitive/remove.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fedefa..30f8b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: scribo/src/primitive/remove. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: configure scribo/tests/convert. 2011-03-14 Thierry GERAUD <thierry.geraud(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index e30f010..44f359b 100644 --- a/configure.ac +++ b/configure.ac @@ -332,6 +332,7 @@ AC_CONFIG_FILES([ scribo/src/primitive/extract/Makefile scribo/src/primitive/find/Makefile scribo/src/primitive/group/Makefile + scribo/src/primitive/remove/Makefile scribo/src/table/Makefile scribo/src/text/Makefile scribo/src/toolchain/Makefile -- 1.5.6.5

1 0

last-svn-commit-774-g36bdfe6 Add new tools in Scribo.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* src/primitive/extract/Makefile.am, * src/primitive/remove/Makefile.am: Add new targets. * src/primitive/extract/separators_nonvisible.cc, * src/primitive/remove/separators.cc: New. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/primitive/extract/Makefile.am | 2 ++ .../extract/separators_nonvisible.cc} | 19 ++++++++++--------- scribo/src/primitive/{ => remove}/Makefile.am | 11 ++++++----- .../negate.cc => primitive/remove/separators.cc} | 20 ++++++++++++-------- 5 files changed, 40 insertions(+), 22 deletions(-) copy scribo/src/{misc/negate.cc => primitive/extract/separators_nonvisible.cc} (79%) copy scribo/src/primitive/{ => remove}/Makefile.am (82%) copy scribo/src/{misc/negate.cc => primitive/remove/separators.cc} (76%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0aa4ba2..8b7ad7f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new tools in Scribo. + + * src/primitive/extract/Makefile.am, + * src/primitive/remove/Makefile.am: Add new targets. + + * src/primitive/extract/separators_nonvisible.cc, + * src/primitive/remove/separators.cc: New. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. * scribo/core/macros.hh: Update comments. diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index a46cd68..22d6bfd 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = \ discontinued_lines \ discontinued_vlines \ discontinued_hlines \ + separators_nonvisible \ thick_vlines \ thick_hlines \ lines_pattern @@ -29,6 +30,7 @@ noinst_PROGRAMS = \ discontinued_lines_SOURCES = discontinued_lines.cc discontinued_vlines_SOURCES = discontinued_vlines.cc discontinued_hlines_SOURCES = discontinued_hlines.cc +separators_nonvisible_SOURCES = separators_nonvisible.cc thick_vlines_SOURCES = thick_vlines.cc thick_hlines_SOURCES = thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc diff --git a/scribo/src/misc/negate.cc b/scribo/src/primitive/extract/separators_nonvisible.cc similarity index 79% copy from scribo/src/misc/negate.cc copy to scribo/src/primitive/extract/separators_nonvisible.cc index da6fad6..82d4787 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/primitive/extract/separators_nonvisible.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -25,35 +24,37 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> #include <mln/io/pbm/all.hh> +#include <mln/data/convert.hh> +#include <scribo/primitive/extract/separators_nonvisible2.hh> #include <scribo/debug/usage.hh> - const char *args_desc[][2] = { { "input.pbm", "A binary image." }, + { "output.pbm", "Output image." }, {0, 0} }; int main(int argc, char *argv[]) { - mln::trace::entering("main"); using namespace mln; + using namespace scribo; if (argc != 3) return scribo::debug::usage(argv, - "Negate a binary image", + "Extract non visible separators (whitespaces)", "input.pbm output.pbm", args_desc); + trace::entering("main"); + image2d<bool> input; io::pbm::load(input, argv[1]); - io::pbm::save(logical::not_(input), argv[2]); - - mln::trace::exiting("main"); + io::pbm::save(primitive::extract::separators_nonvisible(input), argv[2]); + trace::exiting("main"); } diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/remove/Makefile.am similarity index 82% copy from scribo/src/primitive/Makefile.am copy to scribo/src/primitive/remove/Makefile.am index 7e46a66..a673886 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/remove/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,7 +16,8 @@ include $(top_srcdir)/scribo/scribo.mk -SUBDIRS = \ - extract \ - find \ - group + +noinst_PROGRAMS = \ + separators + +separators_SOURCES = separators.cc diff --git a/scribo/src/misc/negate.cc b/scribo/src/primitive/remove/separators.cc similarity index 76% copy from scribo/src/misc/negate.cc copy to scribo/src/primitive/remove/separators.cc index da6fad6..46e977f 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/primitive/remove/separators.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -25,35 +24,40 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> #include <mln/io/pbm/all.hh> +#include <mln/data/convert.hh> +#include <scribo/primitive/extract/separators.hh> +#include <scribo/primitive/remove/separators.hh> #include <scribo/debug/usage.hh> - const char *args_desc[][2] = { { "input.pbm", "A binary image." }, + { "output.pbm", "Output image." }, {0, 0} }; int main(int argc, char *argv[]) { - mln::trace::entering("main"); using namespace mln; + using namespace scribo; if (argc != 3) return scribo::debug::usage(argv, - "Negate a binary image", + "Remove visible separators", "input.pbm output.pbm", args_desc); + trace::entering("main"); + image2d<bool> input; io::pbm::load(input, argv[1]); - io::pbm::save(logical::not_(input), argv[2]); + image2d<bool> seps = primitive::extract::separators(input, 81); - mln::trace::exiting("main"); + io::pbm::save(primitive::remove::separators(input, seps), argv[2]); + trace::exiting("main"); } -- 1.5.6.5

1 0