Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-819-g2021de2 src/Makefile.am: define HAVE_QT for content_in_doc.

by Guillaume Lazzara

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

13 years, 10 months

last-svn-commit-819-g30e9e38 src/Makefile.am: define HAVE_QT for content_in_doc.

by Guillaume Lazzara

13 years, 10 months

last-svn-commit-820-gb54ebe3 src/Makefile.am: define HAVE_QT for content_in_doc.

by Guillaume Lazzara

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

13 years, 10 months

last-svn-commit-818-gb4dcfac Add missing anchor argument.

by Guillaume Lazzara

* 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

13 years, 10 months

last-svn-commit-818-g546e98d Add missing anchor argument.

by Guillaume Lazzara

13 years, 10 months

last-svn-commit-819-gaac2de9 Add missing anchor argument.

by Guillaume Lazzara

* 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

13 years, 10 months

last-svn-commit-773-g09b76a6 Small fixes in Scribo.

by Guillaume Lazzara

* scribo/core/macros.hh: Update comments. * scribo/text/merging.hh: Add comments and fix line data swap. * scribo/text/recognition.hh: Make use of is_textline. * src/text_in_picture.cc: Initialize ImageMagick. --- scribo/ChangeLog | 12 ++++++++++++ scribo/scribo/core/macros.hh | 7 +++---- scribo/scribo/text/merging.hh | 6 +++--- scribo/scribo/text/recognition.hh | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d783c5c..0aa4ba2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo. + + * scribo/core/macros.hh: Update comments. + + * scribo/text/merging.hh: Add comments and fix line data swap. + + * scribo/text/recognition.hh: Make use of is_textline. + + * src/text_in_picture.cc: Initialize ImageMagick. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve and cleanup whitespace separator detection. * scribo/core/tag/anchor.hh: Add new anchors. diff --git a/scribo/scribo/core/macros.hh b/scribo/scribo/core/macros.hh index 887539f..c6de1ff 100644 --- a/scribo/scribo/core/macros.hh +++ b/scribo/scribo/core/macros.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. // @@ -33,8 +33,6 @@ # define for_all_elements(E, S) \ for (unsigned E = 0; E < S.nelements(); ++E) - -// FIXME: we want to replace previous macros by these ones. # define for_all_comps(C, S) \ for (unsigned C = 1; C <= S.nelements(); ++C) @@ -56,6 +54,7 @@ # define for_all_line_comps(E, S) \ for_all_elements(E, S) +// Internal use only. # define for_all_lines_info(E, S) \ for_all_comp_data(E, S) diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 3087465..f433e51 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -192,7 +192,7 @@ namespace scribo { // we transfer data from the largest item to the root one. scribo::line_info<L> tmp = lines(l1); - lines(l1) = lines(l2); + std::swap(lines(l1), lines(l2)); lines(l1).fast_merge(tmp); // We must set manually the tag for lines(l2) since it is @@ -504,8 +504,8 @@ namespace scribo void one_merge_pass(unsigned ith_pass, const box2d& domain, - std::vector<scribo::line_id_t>& v, - scribo::line_set<L>& lines, + std::vector<scribo::line_id_t>& v, // Ids sorted by bbox size. + scribo::line_set<L>& lines, // Tagged Lines (looks_like_a_text_line?) mln::util::array<unsigned>& parent) { image2d<unsigned> billboard(domain); diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 59f269e..3a9742b 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -127,7 +127,7 @@ namespace scribo /// Use text bboxes with Tesseract for_all_lines(i, lines) { - if (! lines(i).is_valid() || lines(i).is_hidden() || lines(i).type() != line::Text) + if (! lines(i).is_textline()) continue; mln_domain(I) box = lines(i).bbox(); -- 1.5.6.5

13 years, 10 months

last-svn-commit-774-g36bdfe6 Add new tools in Scribo.

by Guillaume Lazzara

* 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

13 years, 10 months

last-svn-commit-775-g9fc92d2 configure.ac: scribo/src/primitive/remove.

by Guillaume Lazzara

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

13 years, 10 months

last-svn-commit-767-gc027c16 Add an optional base index for debug::iota.

by Guillaume Lazzara

* mln/debug/iota.hh, * mln/debug/iota.spe.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/debug/iota.hh | 22 +++++++++++++++++----- milena/mln/debug/iota.spe.hh | 9 +++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7a28158..e03d35c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add an optional base index for debug::iota. + + * mln/debug/iota.hh, + * mln/debug/iota.spe.hh: Here. + 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/convert/to_qimage_nocopy.cc: Fix a warning. diff --git a/milena/mln/debug/iota.hh b/milena/mln/debug/iota.hh index cfc3ae9..3e569b9 100644 --- a/milena/mln/debug/iota.hh +++ b/milena/mln/debug/iota.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,7 +50,7 @@ namespace mln * assigned. */ template <typename I> - void iota(Image<I>& input); + void iota(Image<I>& input, unsigned base_index); # ifndef MLN_INCLUDE_ONLY @@ -60,9 +61,9 @@ namespace mln template <typename I> inline void - iota(trait::image::speed::any, I& input) + iota(trait::image::speed::any, I& input, unsigned base_index) { - unsigned i = 0; + unsigned i = base_index; mln_piter(I) p(input.domain()); for_all(p) input(p) = ++i % mln_max(mln_value(I)); @@ -71,17 +72,28 @@ namespace mln } // end of namespace mln::debug::impl + template <typename I> inline void iota(Image<I>& input) { + iota(input, 0); + } + + + template <typename I> + inline + void + iota(Image<I>& input, unsigned base_index) + { trace::entering("debug::iota"); mln_precondition(exact(input).is_valid()); - impl::iota(mln_trait_image_speed(I)(), exact(input)); + impl::iota(mln_trait_image_speed(I)(), exact(input), base_index); trace::exiting("debug::iota"); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::debug diff --git a/milena/mln/debug/iota.spe.hh b/milena/mln/debug/iota.spe.hh index 9a22bca..37e17d9 100644 --- a/milena/mln/debug/iota.spe.hh +++ b/milena/mln/debug/iota.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -48,16 +49,16 @@ namespace mln { template <typename I> - void iota(trait::image::speed::fastest, I& input); + void iota(trait::image::speed::fastest, I& input, unsigned base_index); # ifndef MLN_INCLUDE_ONLY template <typename I> inline void - iota(trait::image::speed::fastest, I& input) + iota(trait::image::speed::fastest, I& input, unsigned base_index) { - unsigned i = 0; + unsigned i = base_index; mln_pixter(I) p(input); for_all(p) p.val() = static_cast<mln_value(I)>(++i % mln_max(mln_value(I))); -- 1.5.6.5

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