Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena-2.0-392-g153144d tests/unit_test/unit-tests.mk: Regen.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/tests/unit_test/unit-tests.mk | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a1e5a66..aa4dc0d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Write a valid test for labeling::foreground. * tests/labeling/Makefile.am: Add more extra-dist files. diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d4d0c48..1817969 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -43,7 +43,8 @@ if HAVE_MAGICKXX check_PROGRAMS += \ mln_io_magick_all \ mln_io_magick_load \ -mln_io_magick_save +mln_io_magick_save \ +mln_io_magick_internal_init_magick mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_all_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} @@ -51,9 +52,23 @@ mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_load_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +mln_io_magick_internal_init_magick_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +mln_io_magick_internal_init_magick_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} endif HAVE_MAGICKXX # Starting a conditional unit test list. +if HAVE_POPPLER +check_PROGRAMS += \ +mln_io_pdf_get_header \ +mln_io_pdf_load + +mln_io_pdf_get_header_CPPFLAGS= ${POPPLER_CPPFLAGS} -DHAVE_POPPLER ${AM_CPPFLAGS} +mln_io_pdf_get_header_LDFLAGS= ${POPPLER_LDFLAGS} ${AM_LDFLAGS} +mln_io_pdf_load_CPPFLAGS= ${POPPLER_CPPFLAGS} -DHAVE_POPPLER ${AM_CPPFLAGS} +mln_io_pdf_load_LDFLAGS= ${POPPLER_LDFLAGS} ${AM_LDFLAGS} +endif HAVE_POPPLER + +# Starting a conditional unit test list. if HAVE_QT check_PROGRAMS += \ mln_convert_to_qimage \ @@ -112,7 +127,6 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_sum \ mln_accu_math_sumpow \ -mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ mln_accu_p \ @@ -733,8 +747,6 @@ mln_io_pbm_load \ mln_io_pbm_save \ mln_io_pbms_all \ mln_io_pbms_load \ -mln_io_pdf_get_header \ -mln_io_pdf_load \ mln_io_pfm_all \ mln_io_pfm_load \ mln_io_pfm_save \ -- 1.7.2.5

11 years, 10 months

olena-2.0-391-g4da0078 Write a valid test for labeling::foreground.

by Guillaume Lazzara

* tests/labeling/Makefile.am: Add more extra-dist files. * tests/labeling/foreground.cc: Rewrite. * tests/labeling/foreground.ref.pgm: New. --- milena/ChangeLog | 10 ++++++++ milena/tests/labeling/Makefile.am | 8 +++++- milena/tests/labeling/foreground.cc | 34 ++++++++++++----------------- milena/tests/labeling/foreground.ref.pgm | Bin 0 -> 81654 bytes 4 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 milena/tests/labeling/foreground.ref.pgm diff --git a/milena/ChangeLog b/milena/ChangeLog index b5dc109..a1e5a66 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Write a valid test for labeling::foreground. + + * tests/labeling/Makefile.am: Add more extra-dist files. + + * tests/labeling/foreground.cc: Rewrite. + + * tests/labeling/foreground.ref.pgm: New. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation issues. * mln/fun/v2v/round_sat.hh, diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index 33e81e4..1cabf25 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,6 +17,10 @@ include $(top_srcdir)/milena/tests/tests.mk +EXTRA_DIST = \ + foreground.ref.pgm + + check_PROGRAMS = \ background \ blobs \ diff --git a/milena/tests/labeling/foreground.cc b/milena/tests/labeling/foreground.cc index 8be0aeb..286c166 100644 --- a/milena/tests/labeling/foreground.cc +++ b/milena/tests/labeling/foreground.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,12 +27,15 @@ #include <mln/core/image/image2d.hh> #include <mln/core/var.hh> #include <mln/io/pbm/load.hh> +#include <mln/io/pgm/load.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/data/compare.hh> #include <mln/labeling/foreground.hh> +#include <mln/value/int_u8.hh> #include "tests/data.hh" +#include <mln/io/pgm/save.hh> int main() { @@ -41,27 +44,18 @@ int main() typedef image2d<bool> I; neighb2d nbh = c4(); - I pic = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); - image2d<unsigned> out, ref; + // Load ref + image2d<value::int_u8> ref; + io::pgm::load(ref, MLN_TESTS_DIR "/labeling/foreground.ref.pgm"); - unsigned n; - out = labeling::foreground(pic, nbh, n); // Calls the fastest 'video' - // version. - mln_assertion(n == 33); - { - // Note that labeling::foreground actually is labeling::value - // which calls canvas::labeling_video and its generic dispatch - // leads to canvas::impl::generic::labeling. + I input = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); + image2d<value::int_u8> out; - labeling::impl::value_functor<I,unsigned> f(pic, true); + value::int_u8 n; + out = labeling::foreground(input, nbh, n); - unsigned n_; - ref = canvas::labeling::impl::generic::labeling(pic, nbh, n_, - pic.domain(), - f); - mln_invariant(n_ == n); - mln_invariant(ref == out); - } + mln_assertion(n == 33); + mln_assertion(ref == out); } diff --git a/milena/tests/labeling/foreground.ref.pgm b/milena/tests/labeling/foreground.ref.pgm new file mode 100644 index 0000000..e2dc613 Binary files /dev/null and b/milena/tests/labeling/foreground.ref.pgm differ -- 1.7.2.5

11 years, 10 months

olena-2.0-390-ge4ad8e3 Fix compilation issues.

by Guillaume Lazzara

* mln/fun/v2v/round_sat.hh, * mln/io/pdf/get_header.hh: Add missing includes. * mln/value/internal/gray_f.hxx: Update use of math::round. * tests/data.hh.in: Add a new path. * tests/unit_test/Makefile.am, * tests/unit_test/cond_tests_magickxx: Consider more conditional tests. * tests/unit_test/cond_tests_poppler: New. --- milena/ChangeLog | 17 +++++++++++++++++ milena/mln/fun/v2v/round_sat.hh | 4 +++- milena/mln/io/pdf/get_header.hh | 2 ++ milena/mln/value/internal/gray_f.hxx | 8 ++++---- milena/tests/data.hh.in | 3 +++ milena/tests/unit_test/Makefile.am | 1 + milena/tests/unit_test/cond_tests_magickxx | 1 + milena/tests/unit_test/cond_tests_poppler | 2 ++ 8 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_poppler diff --git a/milena/ChangeLog b/milena/ChangeLog index 2b7f730..b5dc109 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation issues. + + * mln/fun/v2v/round_sat.hh, + * mln/io/pdf/get_header.hh: Add missing includes. + + * mln/value/internal/gray_f.hxx: Update use of math::round. + + * tests/data.hh.in: Add a new path. + + * tests/unit_test/Makefile.am, + * tests/unit_test/cond_tests_magickxx: Consider more conditional + tests. + + * tests/unit_test/cond_tests_poppler: New. + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/algebra/mat.cc: Fix test. diff --git a/milena/mln/fun/v2v/round_sat.hh b/milena/mln/fun/v2v/round_sat.hh index ce8c6b4..d0a0073 100644 --- a/milena/mln/fun/v2v/round_sat.hh +++ b/milena/mln/fun/v2v/round_sat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,6 +32,7 @@ /// Round the given value considering its type as circular. # include <mln/core/concept/function.hh> +# include <mln/trait/value_.hh> namespace mln diff --git a/milena/mln/io/pdf/get_header.hh b/milena/mln/io/pdf/get_header.hh index 1969689..0567433 100644 --- a/milena/mln/io/pdf/get_header.hh +++ b/milena/mln/io/pdf/get_header.hh @@ -33,6 +33,8 @@ # include <iostream> # include <fstream> +#include <poppler/cpp/poppler-document.h> + # include <mln/core/concept/image.hh> # include <mln/core/routine/initialize.hh> # include <mln/core/box_runstart_piter.hh> diff --git a/milena/mln/value/internal/gray_f.hxx b/milena/mln/value/internal/gray_f.hxx index c6863c3..66fdcad 100644 --- a/milena/mln/value/internal/gray_f.hxx +++ b/milena/mln/value/internal/gray_f.hxx @@ -117,8 +117,8 @@ namespace mln inline gray_f::operator graylevel<m>() const { - return graylevel<m>(math::round<int>()(this->v_ - * (mlc_pow_int(2, m) - 1))); + return graylevel<m>(math::round<int>(this->v_ + * (mlc_pow_int(2, m) - 1))); } @@ -126,8 +126,8 @@ namespace mln inline gray_f::operator gray_<m>() const { - return gray_<m>(math::round<int>()(this->v_ - * (mlc_pow_int(2, m) - 1))); + return gray_<m>(math::round<int>(this->v_ + * (mlc_pow_int(2, m) - 1))); } inline diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in index fe3034b..9e87a32 100644 --- a/milena/tests/data.hh.in +++ b/milena/tests/data.hh.in @@ -38,6 +38,9 @@ /// The absolute path to the img directory of Milena. # define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img" +/// \brief The absolute path to the test directory of Milena. +# define MLN_TESTS_DIR "@abs_top_srcdir@/milena/tests/" + /// The absolute path to the mesh directory of Milena. # define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh" diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 4ee9885..37df4c8 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -21,6 +21,7 @@ COND_TESTS = cond_tests_boost-tuple \ cond_tests_cfitsio \ cond_tests_gdcm \ cond_tests_magickxx \ + cond_tests_poppler \ cond_tests_qt \ cond_tests_tiff diff --git a/milena/tests/unit_test/cond_tests_magickxx b/milena/tests/unit_test/cond_tests_magickxx index 2d9ff23..8b34374 100644 --- a/milena/tests/unit_test/cond_tests_magickxx +++ b/milena/tests/unit_test/cond_tests_magickxx @@ -1,3 +1,4 @@ mln/io/magick/all.hh mln/io/magick/load.hh mln/io/magick/save.hh +mln/io/magick/internal/init_magick.hh diff --git a/milena/tests/unit_test/cond_tests_poppler b/milena/tests/unit_test/cond_tests_poppler new file mode 100644 index 0000000..4f13e3c --- /dev/null +++ b/milena/tests/unit_test/cond_tests_poppler @@ -0,0 +1,2 @@ +mln/io/pdf/get_header.hh +mln/io/pdf/load.hh -- 1.7.2.5

11 years, 10 months

olena-2.0-389-g64b6e9d tests/algebra/mat.cc: Fix test.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/tests/algebra/mat.cc | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 92f8ad0..2b7f730 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/algebra/mat.cc: Fix test. + +2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Automatically initialize GraphicsMagick. * mln/io/magick/internal/init_magick.hh: New. diff --git a/milena/tests/algebra/mat.cc b/milena/tests/algebra/mat.cc index a65ffc1..8250b1f 100644 --- a/milena/tests/algebra/mat.cc +++ b/milena/tests/algebra/mat.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -35,20 +36,20 @@ int main() { using namespace algebra; mat<3,3,int> - m = algebra::make(1, 2, 3, - 0, 1, 4, - 5, 6, 0), - m_1 = algebra::make(-24, +18, +05, - +20, -15, -04, - -05, +04, +01); + m = algebra::internal::make(1, 2, 3, + 0, 1, 4, + 5, 6, 0), + m_1 = algebra::internal::make(-24, +18, +05, + +20, -15, -04, + -05, +04, +01); mln_assertion(m._1() == m_1); mln_assertion(m * m._1() == literal::identity); } { using namespace algebra; - mat<2,2,int> m = algebra::make(1, 0, - 0, 1); + mat<2,2,int> m = algebra::internal::make(1, 0, + 0, 1); mln_assertion(tr(m) == 2); mln_assertion(det(m) == 1); mln_assertion(m._1() == m); -- 1.7.2.5

11 years, 10 months

olena-2.0-388-g40eaf23 Remove references to InitializeMagick().

by Guillaume Lazzara

* scribo/demo/viewer/main.cc, * scribo/demo/xml2doc/main.cc, * scribo/core/document.hh, * scribo/debug/logger.hh, * src/binarization/global_threshold.cc, * src/binarization/kim.cc, * src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/sauvola_ms_debug.cc, * src/binarization/sauvola_ms_fg.cc, * src/binarization/sauvola_ms_split.cc, * src/binarization/singh.cc, * src/binarization/wolf.cc, * src/content_in_doc.cc, * src/content_in_hdoc.cc, * src/contest/DAE-2011/content_in_doc_dae.cc, * src/contest/DAE-2011/content_in_hdoc_dae.cc, * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, * src/debug/show_components_boldness.cc, * src/debug/show_components_color.cc, * src/non_text_components.cc, * src/preprocessing/rotate.cc, * src/preprocessing/rotate_90.cc, * src/preprocessing/split_bg_fg.cc, * src/text_in_doc_preprocess.cc, * src/text_in_picture.cc, * src/text_in_picture_dual.cc, * src/text_recognition_in_picture.cc: Here. --- scribo/ChangeLog | 35 ++++++++++++++++++++ scribo/demo/viewer/main.cc | 2 - scribo/demo/xml2doc/main.cc | 5 +-- scribo/scribo/core/document.hh | 5 +-- scribo/scribo/debug/logger.hh | 1 - scribo/src/binarization/global_threshold.cc | 6 +-- scribo/src/binarization/kim.cc | 5 +-- scribo/src/binarization/niblack.cc | 2 - scribo/src/binarization/otsu.cc | 2 - scribo/src/binarization/sauvola.cc | 2 - scribo/src/binarization/sauvola_ms.cc | 2 - scribo/src/binarization/sauvola_ms_debug.cc | 6 +-- scribo/src/binarization/sauvola_ms_fg.cc | 6 +-- scribo/src/binarization/sauvola_ms_split.cc | 4 +-- scribo/src/binarization/singh.cc | 5 +-- scribo/src/binarization/wolf.cc | 2 - scribo/src/content_in_doc.cc | 2 - scribo/src/content_in_hdoc.cc | 2 - scribo/src/contest/DAE-2011/content_in_doc_dae.cc | 6 +-- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 6 +-- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 4 +-- scribo/src/debug/show_components_boldness.cc | 5 +-- scribo/src/debug/show_components_color.cc | 6 +-- scribo/src/non_text_components.cc | 6 +-- scribo/src/preprocessing/rotate.cc | 5 ++- scribo/src/preprocessing/rotate_90.cc | 5 +-- scribo/src/preprocessing/split_bg_fg.cc | 4 +-- scribo/src/text_in_doc_preprocess.cc | 6 +-- scribo/src/text_in_picture.cc | 4 +-- scribo/src/text_in_picture_dual.cc | 6 +-- scribo/src/text_recognition_in_picture.cc | 4 +-- 31 files changed, 73 insertions(+), 88 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 81b1d34..b0455fc 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,38 @@ +2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove references to InitializeMagick(). + + * demo/viewer/main.cc, + * demo/xml2doc/main.cc, + * core/document.hh, + * debug/logger.hh, + * src/binarization/global_threshold.cc, + * src/binarization/kim.cc, + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc, + * src/binarization/sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_split.cc, + * src/binarization/singh.cc, + * src/binarization/wolf.cc, + * src/content_in_doc.cc, + * src/content_in_hdoc.cc, + * src/contest/DAE-2011/content_in_doc_dae.cc, + * src/contest/DAE-2011/content_in_hdoc_dae.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, + * src/debug/show_components_boldness.cc, + * src/debug/show_components_color.cc, + * src/non_text_components.cc, + * src/preprocessing/rotate.cc, + * src/preprocessing/rotate_90.cc, + * src/preprocessing/split_bg_fg.cc, + * src/text_in_doc_preprocess.cc, + * src/text_in_picture.cc, + * src/text_in_picture_dual.cc, + * src/text_recognition_in_picture.cc: Here. + 2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> Fix namespace ambiguities. diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index d14e36d..ff79f01 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -39,8 +39,6 @@ int main(int argc, char** argv) return 0; } - Magick::InitializeMagick(*argv); - Viewer* viewer = Viewer::Instance(argc, argv); if (!viewer) diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index fa2a0f8..368e52d 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -89,8 +90,6 @@ int svg_base64(const QString& xml, const QString& svg) int main(int argc, char **argv) { - Magick::InitializeMagick(argv[0]); - QString man = \ "xml_transform\n" "OPTIONS:\n\n" diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 5bbd226..0a6ca5a 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -237,7 +237,6 @@ namespace scribo void document<L>::open() { - Magick::InitializeMagick(0); mln::io::magick::load(data_->image_, data_->filename_); } diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 9c21cdc..5c0fcbe 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -254,7 +254,6 @@ namespace scribo verbose_prefix_("LOG: "), stream_(std::cerr) { - // Magick::InitializeMagick(0); } diff --git a/scribo/src/binarization/global_threshold.cc b/scribo/src/binarization/global_threshold.cc index eaf11c7..1879de0 100644 --- a/scribo/src/binarization/global_threshold.cc +++ b/scribo/src/binarization/global_threshold.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -81,8 +81,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); unsigned threshold = atoi(options.arg("threshold_value")); diff --git a/scribo/src/binarization/kim.cc b/scribo/src/binarization/kim.cc index 0a064d8..c055a95 100644 --- a/scribo/src/binarization/kim.cc +++ b/scribo/src/binarization/kim.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -82,8 +83,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 049d8ed..0769230 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -83,8 +83,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index 30e9afb..2231161 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -83,8 +83,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); bool verbose = options.is_set("verbose"); diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index 4e059cf..3ea0f8b 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -81,8 +81,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index ebb2ba7..9f3e9dd 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -99,8 +99,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index 434556a..9a61f96 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -127,8 +127,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); diff --git a/scribo/src/binarization/sauvola_ms_fg.cc b/scribo/src/binarization/sauvola_ms_fg.cc index 9f47b7d..2c11636 100644 --- a/scribo/src/binarization/sauvola_ms_fg.cc +++ b/scribo/src/binarization/sauvola_ms_fg.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -126,8 +126,6 @@ int main(int argc, char *argv[]) << " - k4=" << binarization::internal::k4 << std::endl; - Magick::InitializeMagick(0); - // Load image2d<value::rgb8> input_1; io::magick::load(input_1, options.arg("input.*")); diff --git a/scribo/src/binarization/sauvola_ms_split.cc b/scribo/src/binarization/sauvola_ms_split.cc index 0430beb..aede1e0 100644 --- a/scribo/src/binarization/sauvola_ms_split.cc +++ b/scribo/src/binarization/sauvola_ms_split.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Copyright (C) 2009, 2010, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -121,8 +121,6 @@ int main(int argc, char *argv[]) << " - k4=" << binarization::internal::k4 << std::endl; - Magick::InitializeMagick(0); - image2d<value::rgb8> input_1; io::magick::load(input_1, options.arg("input.*")); diff --git a/scribo/src/binarization/singh.cc b/scribo/src/binarization/singh.cc index 8078bfd..ee00115 100644 --- a/scribo/src/binarization/singh.cc +++ b/scribo/src/binarization/singh.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -81,8 +82,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index 94456e8..2c35247 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -81,8 +81,6 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - Magick::InitializeMagick(*argv); - trace::entering("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 0d2fcac..430b309 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -120,8 +120,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; mln::io::magick::load(input, options.arg("input.*")); diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index c9760fb..bdede6a 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -96,8 +96,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - mln::util::timer t; t.start(); diff --git a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc index 2a0e9d7..3ce4f08 100644 --- a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -72,8 +72,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; mln::io::magick::load(input, argv[1]); diff --git a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index c6f6e0e..796218f 100644 --- a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -79,8 +79,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - mln::util::timer t; t.start(); diff --git a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc index 21a7732..019fd5a 100644 --- a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc +++ b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -78,8 +78,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - mln::util::timer t; t.start(); diff --git a/scribo/src/debug/show_components_boldness.cc b/scribo/src/debug/show_components_boldness.cc index f9aca3f..7f58d10 100644 --- a/scribo/src/debug/show_components_boldness.cc +++ b/scribo/src/debug/show_components_boldness.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -39,8 +40,6 @@ int main(int argc, char *argv[]) return 1; } - Magick::InitializeMagick(0); - typedef mln::value::int_u<30> V; typedef image2d<V> L; diff --git a/scribo/src/debug/show_components_color.cc b/scribo/src/debug/show_components_color.cc index a13b85b..8f27d43 100644 --- a/scribo/src/debug/show_components_color.cc +++ b/scribo/src/debug/show_components_color.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,8 +40,6 @@ int main(int argc, char *argv[]) return 1; } - Magick::InitializeMagick(0); - typedef mln::value::int_u<30> V; typedef image2d<V> L; diff --git a/scribo/src/non_text_components.cc b/scribo/src/non_text_components.cc index e6db89b..e847b2c 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/non_text_components.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -82,8 +82,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; mln::io::magick::load(input, argv[1]); diff --git a/scribo/src/preprocessing/rotate.cc b/scribo/src/preprocessing/rotate.cc index c0b599b..de7b20d 100644 --- a/scribo/src/preprocessing/rotate.cc +++ b/scribo/src/preprocessing/rotate.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -59,7 +60,7 @@ int main(int argc, char *argv[]) typedef image2d<value::rgb8> I; I ima; - Magick::InitializeMagick(0); + io::magick::load(ima, argv[1]); image2d<value::rgb8> diff --git a/scribo/src/preprocessing/rotate_90.cc b/scribo/src/preprocessing/rotate_90.cc index 23625a9..1de8b65 100644 --- a/scribo/src/preprocessing/rotate_90.cc +++ b/scribo/src/preprocessing/rotate_90.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -55,8 +56,6 @@ int main(int argc, char *argv[]) "input.* output.ppm <positive>", args_desc); - Magick::InitializeMagick(0); - typedef image2d<value::rgb8> I; I ima; io::magick::load(ima, argv[1]); diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index 2b68b53..e759835 100644 --- a/scribo/src/preprocessing/split_bg_fg.cc +++ b/scribo/src/preprocessing/split_bg_fg.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -49,8 +49,6 @@ int main(int argc, char *argv[]) mln::trace::entering("main"); using namespace mln; - Magick::InitializeMagick(0); - if (argc != 6) return scribo::debug::usage(argv, "Split background and foreground.", diff --git a/scribo/src/text_in_doc_preprocess.cc b/scribo/src/text_in_doc_preprocess.cc index 39b48bb..213f19f 100644 --- a/scribo/src/text_in_doc_preprocess.cc +++ b/scribo/src/text_in_doc_preprocess.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -79,8 +79,6 @@ int main(int argc, char* argv[]) if (!options.parse(argc, argv)) return 1; - Magick::InitializeMagick(*argv); - image2d<value::rgb8> input_rgb; io::magick::load(input_rgb, options.arg("input.*")); diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index d38d756..4409be2 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -84,8 +84,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - image2d<value::rgb8> input_rgb; io::magick::load(input_rgb, options.arg("input.*")); diff --git a/scribo/src/text_in_picture_dual.cc b/scribo/src/text_in_picture_dual.cc index 3eb9433..dcd9754 100644 --- a/scribo/src/text_in_picture_dual.cc +++ b/scribo/src/text_in_picture_dual.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -87,8 +87,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - image2d<value::rgb8> input_rgb; io::magick::load(input_rgb, argv[1]); diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index b1b01c9..5456263 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -173,8 +173,6 @@ int main(int argc, char* argv[]) trace::entering("main"); - Magick::InitializeMagick(*argv); - typedef image2d<value::rgb8> I; I input_rgb; mln::io::magick::load(input_rgb, argv[1]); -- 1.7.2.5

11 years, 10 months

olena-2.0-387-g6588683 Automatically initialize GraphicsMagick.

by Guillaume Lazzara

* mln/io/magick/internal/init_magick.hh: New. * mln/io/magick/load.hh, * mln/io/magick/save.hh: Use init_magick struct and update doc. * tests/io/magick/load.cc, * tests/io/magick/save.cc: Remove references to InitializeMagick. --- milena/ChangeLog | 12 +++++ .../{abort.hh => magick/internal/init_magick.hh} | 43 ++++++++++--------- milena/mln/io/magick/load.hh | 31 +++----------- milena/mln/io/magick/save.hh | 32 +++----------- milena/tests/io/magick/load.cc | 18 +------- milena/tests/io/magick/save.cc | 19 +-------- 6 files changed, 53 insertions(+), 102 deletions(-) copy milena/mln/io/{abort.hh => magick/internal/init_magick.hh} (71%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 277a65d..92f8ad0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Automatically initialize GraphicsMagick. + + * mln/io/magick/internal/init_magick.hh: New. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Use init_magick struct and update doc. + + * tests/io/magick/load.cc, + * tests/io/magick/save.cc: Remove references to InitializeMagick. + 2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/img/2dgrid.png: New. Add missing file. diff --git a/milena/mln/io/abort.hh b/milena/mln/io/magick/internal/init_magick.hh similarity index 71% copy from milena/mln/io/abort.hh copy to milena/mln/io/magick/internal/init_magick.hh index 9d06e7b..35a64a2 100644 --- a/milena/mln/io/abort.hh +++ b/milena/mln/io/magick/internal/init_magick.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,16 +23,14 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_ABORT_HH -# define MLN_IO_ABORT_HH +#ifndef MLN_IO_MAGICK_INTERNAL_INIT_MAGICK_HH +# define MLN_IO_MAGICK_INTERNAL_INIT_MAGICK_HH /// \file +/// +/// \brief Initialize GraphicsMagick library. -/// Define a function which aborts a process in io module. - -# include <cstdlib> -# include <iostream> - +# include <Magick++.h> namespace mln { @@ -41,27 +38,33 @@ namespace mln namespace io { - namespace internal + namespace magick { - /// The way to abort when an error occur in io processing. - void abort(); + namespace internal + { + + struct init_magick + { + init_magick(); + }; # ifndef MLN_INCLUDE_ONLY - inline - void abort() - { - std::cerr << "I/O error, aborting." << std::endl; - std::abort(); - } + init_magick::init_magick() + { + Magick::InitializeMagick(0); + } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::internal + } // end of namespace mln::io::magick::internal + + } // end of namespace mln::io::magick } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_ABORT_HH + +#endif // ! MLN_IO_MAGICK_INTERNAL_INIT_MAGICK_HH diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 3065db0..e3c07bd 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Copyright (C) 2009, 2010, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -30,11 +30,6 @@ /// \file /// /// \brief Image intput routines based on Magick++. -/// -/// Do not forget to call Magick::InitializeMagick(*argv) -/// before using any of these functions, as advised by the -/// GraphicsMagick documentation -/// (http://www.graphicsmagick.org/Magick++/Image.html). # include <cstdlib> @@ -45,6 +40,8 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> +# include <mln/io/magick/internal/init_magick.hh> + namespace mln { @@ -146,6 +143,10 @@ namespace mln I& ima = exact(ima_); + // Initialize GraphicsMagick only once. + static internal::init_magick init; + (void) init; + // FIXME: Handle Magick++'s exceptions (see either // ImageMagick++'s or GraphicsMagick++'s documentation). Magick::Image magick_ima(filename); @@ -203,24 +204,6 @@ namespace mln } - // FIXME: Unfinished? -#if 0 - template<typename T> - inline - void - load(Image<tiled2d<T> >& ima_, const std::string& filename) - { - trace::entering("mln::io::magick::load"); - - tiled2d<T>& ima = exact(ima_); - - tiled2d<T> result(filename); - - ima = result; - trace::exiting("mln::io::magick::load"); - } -#endif - # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 0ed869b..4c10703 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -30,11 +30,6 @@ /// \file /// /// \brief Image output routines based on Magick++. -/// -/// Do not forget to call Magick::InitializeMagick(*argv) -/// before using any of these functions, as advised by the -/// GraphicsMagick documentation -/// (http://www.graphicsmagick.org/Magick++/Image.html). # include <cstdlib> @@ -52,6 +47,7 @@ # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> +# include <mln/io/magick/internal/init_magick.hh> namespace mln { @@ -500,6 +496,10 @@ namespace mln const I& ima = exact(ima_); const J& opacity_mask = exact(opacity_mask_); + // Initialize GraphicsMagick only once. + static internal::init_magick init; + (void) init; + def::coord ncols = geom::ncols(ima), nrows = geom::nrows(ima); @@ -542,24 +542,6 @@ namespace mln save(ima, opacity_mask, filename); } - - // FIXME: Unfinished? -#if 0 - template <typename T> - void - save(const Image< tiled2d<T> >& ima_, const std::string& filename) - { - trace::entering("mln::io::magick::save"); - - tiled2d<T>& ima = exact(ima_); - - ima.buffer().write(filename); - - trace::exiting("mln::io::magick::save"); - } -#endif - - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::io::magick diff --git a/milena/tests/io/magick/load.cc b/milena/tests/io/magick/load.cc index 1525545..34af3f8 100644 --- a/milena/tests/io/magick/load.cc +++ b/milena/tests/io/magick/load.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,21 +43,6 @@ int main(int /* argc */, char* argv[]) { using namespace mln; - /* From http://www.graphicsmagick.org/Magick++/Image.html: - - The InitializeMagick() function MUST be invoked before - constructing any Magick++ objects. This used to be optional, - but now it is absolutely required. This function initalizes - semaphores and configuration information necessary for the - software to work correctly. Failing to invoke - InitializeMagick() is likely to lead to a program crash or - thrown assertion. If the program resides in the same directory - as the GraphicsMagick files, then argv[0] may be passed as an - argument so that GraphicsMagick knows where its files reside, - otherwise NULL may be passed and GraphicsMagick will try to use - other means (if necessary). */ - Magick::InitializeMagick(*argv); - // Compare Milena's built-in PBM loaded and Magick++'s support for PBM. { typedef image2d<bool> I; diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index d01643e..d650180 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -70,21 +70,6 @@ int main(int /* argc */, char* argv[]) { using namespace mln; - /* From http://www.graphicsmagick.org/Magick++/Image.html: - - The InitializeMagick() function MUST be invoked before - constructing any Magick++ objects. This used to be optional, - but now it is absolutely required. This function initalizes - semaphores and configuration information necessary for the - software to work correctly. Failing to invoke - InitializeMagick() is likely to lead to a program crash or - thrown assertion. If the program resides in the same directory - as the GraphicsMagick files, then argv[0] may be passed as an - argument so that GraphicsMagick knows where its files reside, - otherwise NULL may be passed and GraphicsMagick will try to use - other means (if necessary). */ - Magick::InitializeMagick(*argv); - point2d p(0,0); // Grayscale values (PBM -> PBM -> PBM). -- 1.7.2.5

11 years, 10 months

olena-2.0-394-gd48b8a4 Make use of mln_trace.

by Guillaume Lazzara

* scribo/binarization/global_threshold.hh, * scribo/binarization/global_threshold_auto.hh, * scribo/binarization/internal/local_threshold_core.hh, * scribo/binarization/kim.hh, * scribo/binarization/local_threshold.hh, * scribo/binarization/niblack.hh, * scribo/binarization/niblack_fast.hh, * scribo/binarization/niblack_threshold.hh, * scribo/binarization/otsu.hh, * scribo/binarization/otsu_threshold.hh, * scribo/binarization/sauvola.hh, * scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_ms_split.hh, * scribo/binarization/sauvola_threshold.hh, * scribo/binarization/singh.hh, * scribo/binarization/wolf.hh, * scribo/binarization/wolf_fast.hh, * scribo/convert/from_base64.hh, * scribo/convert/to_base64.hh, * scribo/core/central_sites.hh, * scribo/core/erase_objects.hh, * scribo/core/init_integral_image.hh, * scribo/debug/alignment_decision_image.hh, * scribo/debug/bboxes_enlarged_image.hh, * scribo/debug/bboxes_image.hh, * scribo/debug/char_space_image.hh, * scribo/debug/decision_image.hh, * scribo/debug/highlight_text_area.hh, * scribo/debug/line_info_image.hh, * scribo/debug/linked_bboxes_image.hh, * scribo/debug/links_decision_image.hh, * scribo/debug/links_image.hh, * scribo/debug/looks_like_a_text_line_image.hh, * scribo/debug/mean_and_base_lines_image.hh, * scribo/debug/save_comp_diff.hh, * scribo/debug/save_label_image.hh, * scribo/debug/save_table_image.hh, * scribo/debug/text_areas_image.hh, * scribo/draw/bounding_box_links.hh, * scribo/draw/bounding_boxes.hh, * scribo/draw/groups_bboxes.hh, * scribo/draw/line_components.hh, * scribo/estim/components_features.hh, * scribo/estim/font_boldness.hh, * scribo/estim/font_color.hh, * scribo/estim/internal/compute_skeleton.hh, * scribo/estim/object_groups_mean_width.hh, * scribo/filter/common/objects_photo.hh, * scribo/filter/images_in_paragraph.hh, * scribo/filter/internal/alignment_angle.hh, * scribo/filter/internal/component_aligned.hh, * scribo/filter/internal/compute.hh, * scribo/filter/object_groups_mean_width.hh, * scribo/filter/object_groups_size_ratio.hh, * scribo/filter/object_groups_small.hh, * scribo/filter/object_groups_with_holes.hh, * scribo/filter/object_links_aligned.hh, * scribo/filter/object_links_bbox_h_ratio.hh, * scribo/filter/object_links_bbox_overlap.hh, * scribo/filter/object_links_bbox_ratio.hh, * scribo/filter/object_links_bbox_w_ratio.hh, * scribo/filter/object_links_bottom_aligned.hh, * scribo/filter/object_links_center_aligned.hh, * scribo/filter/object_links_left_aligned.hh, * scribo/filter/object_links_non_aligned_simple.hh, * scribo/filter/object_links_right_aligned.hh, * scribo/filter/object_links_top_aligned.hh, * scribo/filter/objects_h_thick.hh, * scribo/filter/objects_h_thin.hh, * scribo/filter/objects_large.hh, * scribo/filter/objects_on_border.hh, * scribo/filter/objects_size_ratio.hh, * scribo/filter/objects_small.hh, * scribo/filter/objects_thick.hh, * scribo/filter/objects_thin.hh, * scribo/filter/objects_v_thick.hh, * scribo/filter/objects_v_thin.hh, * scribo/filter/objects_with_holes.hh, * scribo/filter/paragraphs_bbox_overlap.hh, * scribo/filter/paragraphs_in_borders.hh, * scribo/filter/paragraphs_in_image.hh, * scribo/filter/separators_in_borders.hh, * scribo/filter/separators_in_element.hh, * scribo/filter/separators_in_paragraph.hh, * scribo/filter/separators_vert_in_borders.hh, * scribo/io/img/save.hh, * scribo/io/text_boxes/save.hh, * scribo/io/xml/internal/save_image_to_xml.hh, * scribo/io/xml/save.hh, * scribo/layout/xy_cut.hh, * scribo/make/influence_zone_graph.hh, * scribo/make/text_blocks_image.hh, * scribo/make/text_components_image.hh, * scribo/postprocessing/fill_object_holes.hh, * scribo/postprocessing/images_to_drop_capital.hh, * scribo/preprocessing/crop.hh, * scribo/preprocessing/crop_without_localization.hh, * scribo/preprocessing/denoise.hh, * scribo/preprocessing/denoise_bg.hh, * scribo/preprocessing/denoise_fg.hh, * scribo/preprocessing/deskew.hh, * scribo/preprocessing/deskew_crop.hh, * scribo/preprocessing/homogeneous_contrast.hh, * scribo/preprocessing/rotate_90.hh, * scribo/preprocessing/split_bg_fg.hh, * scribo/primitive/extract/alignments.hh, * scribo/primitive/extract/canvas.hh, * scribo/primitive/extract/cells.hh, * scribo/primitive/extract/components.hh, * scribo/primitive/extract/horizontal_separators.hh, * scribo/primitive/extract/lines_discontinued.hh, * scribo/primitive/extract/lines_h_discontinued.hh, * scribo/primitive/extract/lines_h_pattern.hh, * scribo/primitive/extract/lines_h_single.hh, * scribo/primitive/extract/lines_h_thick.hh, * scribo/primitive/extract/lines_h_thick_and_single.hh, * scribo/primitive/extract/lines_h_thick_and_thin.hh, * scribo/primitive/extract/lines_pattern.hh, * scribo/primitive/extract/lines_thick.hh, * scribo/primitive/extract/lines_v_discontinued.hh, * scribo/primitive/extract/lines_v_pattern.hh, * scribo/primitive/extract/lines_v_single.hh, * scribo/primitive/extract/lines_v_thick.hh, * scribo/primitive/extract/lines_v_thick_and_single.hh, * scribo/primitive/extract/non_text.hh, * scribo/primitive/extract/non_text_hdoc.hh, * scribo/primitive/extract/non_text_kmean.hh, * scribo/primitive/extract/separators.hh, * scribo/primitive/extract/separators_nonvisible.hh, * scribo/primitive/extract/vertical_separators.hh, * scribo/primitive/group/apply.hh, * scribo/primitive/group/from_double_link.hh, * scribo/primitive/group/from_double_link_any.hh, * scribo/primitive/group/from_graph.hh, * scribo/primitive/group/from_single_link.hh, * scribo/primitive/identify.hh, * scribo/primitive/internal/find_graph_link.hh, * scribo/primitive/internal/rd.hh, * scribo/primitive/internal/update_graph_link.hh, * scribo/primitive/link/compute.hh, * scribo/primitive/link/compute_several.hh, * scribo/primitive/link/merge_double_link.hh, * scribo/primitive/link/merge_double_link_closest_aligned.hh, * scribo/primitive/link/with_graph.hh, * scribo/primitive/link/with_rag.hh, * scribo/primitive/link/with_several_graphes.hh, * scribo/primitive/link/with_several_left_links.hh, * scribo/primitive/link/with_several_right_closest_links.hh, * scribo/primitive/link/with_several_right_links.hh, * scribo/primitive/link/with_several_right_links_overlap.hh, * scribo/primitive/link/with_single_down_link.hh, * scribo/primitive/link/with_single_left_link.hh, * scribo/primitive/link/with_single_left_link_dmax_ratio.hh, * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh, * scribo/primitive/link/with_single_right_link.hh, * scribo/primitive/link/with_single_right_link_bottom.hh, * scribo/primitive/link/with_single_right_link_dmax_ratio.hh, * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh, * scribo/primitive/link/with_single_right_link_top.hh, * scribo/primitive/link/with_single_up_link.hh, * scribo/primitive/merge/components.hh, * scribo/primitive/regroup/from_single_left_link.hh, * scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, * scribo/primitive/remove/separators.hh, * scribo/subsampling/bilinear.hh, * scribo/subsampling/integral.hh, * scribo/subsampling/integral_single_image.hh, * scribo/table/align_lines_horizontaly.hh, * scribo/table/align_lines_verticaly.hh, * scribo/table/connect_horizontal_lines.hh, * scribo/table/connect_vertical_lines.hh, * scribo/table/erase.hh, * scribo/table/extract.hh, * scribo/table/internal/align_lines.hh, * scribo/table/internal/connect_lines.hh, * scribo/table/internal/repair_lines.hh, * scribo/table/rebuild.hh, * scribo/table/repair_horizontal_lines.hh, * scribo/table/repair_vertical_lines.hh, * scribo/text/clean.hh, * scribo/text/clean_inplace.hh, * scribo/text/extract_lines.hh, * scribo/text/extract_lines_with_features.hh, * scribo/text/extract_lines_wo_merge.hh, * scribo/text/look_like_text_lines.hh, * scribo/text/paragraphs_closing.hh, * scribo/text/recognition.hh, * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, * scribo/toolchain/nepomuk/text_extraction.hh, * scribo/toolchain/text_in_doc_preprocess.hh, * scribo/toolchain/text_in_picture.hh, * scribo/upsampling/bs2x.hh, * scribo/upsampling/eagle.hh, * scribo/util/box_intersection.hh, * scribo/util/box_is_included.hh, * scribo/util/component_precise_outline.hh, * scribo/util/compute_sub_domains.hh, * scribo/util/hex_to_color.hh, * scribo/util/init_integral_image.hh, * src/binarization/global_threshold.cc, * src/binarization/kim.cc, * src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/pgm_global_threshold_auto.cc, * src/binarization/pgm_niblack_threshold_image.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms.cc, * src/binarization/sauvola_ms_debug.cc, * src/binarization/sauvola_ms_fg.cc, * src/binarization/sauvola_ms_split.cc, * src/binarization/singh.cc, * src/binarization/wolf.cc, * src/content_in_doc.cc, * src/content_in_hdoc.cc, * src/contest/DAE-2011/content_in_doc_dae.cc, * src/contest/DAE-2011/content_in_hdoc_dae.cc, * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, * src/debug/highlight_text_area.cc, * src/debug/show_info_median_inter_characters.cc, * src/debug/show_info_x_height.cc, * src/debug/show_lines_boldness.cc, * src/debug/show_objects_large.cc, * src/debug/show_objects_large_small.cc, * src/debug/show_objects_small.cc, * src/debug/show_objects_thick.cc, * src/debug/show_objects_thin.cc, * src/debug/show_paragraph_blocks.cc, * src/debug/show_separators.cc, * src/debug/show_stoppers.cc, * src/debug/show_text_lines.cc, * src/debug/show_text_lines_wo_seps.cc, * src/filter/objects_large.cc, * src/filter/objects_small.cc, * src/filter/objects_thick.cc, * src/filter/objects_thin.cc, * src/filter/objects_with_holes.cc, * src/filter/objects_with_holes_pgm.cc, * src/misc/negate.cc, * src/misc/superpose.cc, * src/non_text_components.cc, * src/pbm_text_in_doc.cc, * src/postprocessing/fill_object_holes.cc, * src/preprocessing/denoise_bg.cc, * src/preprocessing/denoise_fg.cc, * src/preprocessing/preprocess.cc, * src/preprocessing/split_bg_fg.cc, * src/preprocessing/subsample.cc, * src/preprocessing/unskew.cc, * src/primitive/extract/alignments.cc, * src/primitive/extract/discontinued_hlines.cc, * src/primitive/extract/discontinued_lines.cc, * src/primitive/extract/discontinued_vlines.cc, * src/primitive/extract/lines_pattern.cc, * src/primitive/extract/separators_nonvisible.cc, * src/primitive/extract/thick_hlines.cc, * src/primitive/extract/thick_vlines.cc, * src/primitive/find/find_discontinued_lines.cc, * src/primitive/find/find_pattern_lines.cc, * src/primitive/find/find_single_lines.cc, * src/primitive/find/find_thick_and_single_lines.cc, * src/primitive/find/find_thick_lines.cc, * src/primitive/remove/separators.cc, * src/table/erase.cc, * src/table/extract.cc, * src/text/cleantxt.cc, * src/text/pbm_lines_recognition.cc, * src/text/pbm_recognition.cc, * src/text_in_picture.cc, * src/text_in_picture_dual.cc, * src/text_recognition_in_picture.cc, * src/util/component_precise_outline.cc: Here. --- scribo/ChangeLog | 277 ++++++++++++++++++++ scribo/scribo/binarization/global_threshold.hh | 3 +- .../scribo/binarization/global_threshold_auto.hh | 3 +- .../binarization/internal/local_threshold_core.hh | 9 +- scribo/scribo/binarization/kim.hh | 3 +- scribo/scribo/binarization/local_threshold.hh | 9 +- scribo/scribo/binarization/niblack.hh | 3 +- scribo/scribo/binarization/niblack_fast.hh | 3 +- scribo/scribo/binarization/niblack_threshold.hh | 3 +- scribo/scribo/binarization/otsu.hh | 2 +- scribo/scribo/binarization/otsu_threshold.hh | 3 +- scribo/scribo/binarization/sauvola.hh | 3 +- scribo/scribo/binarization/sauvola_ms.hh | 9 +- scribo/scribo/binarization/sauvola_ms_split.hh | 3 +- scribo/scribo/binarization/sauvola_threshold.hh | 3 +- scribo/scribo/binarization/singh.hh | 3 +- scribo/scribo/binarization/wolf.hh | 3 +- scribo/scribo/binarization/wolf_fast.hh | 3 +- scribo/scribo/convert/from_base64.hh | 9 +- scribo/scribo/convert/to_base64.hh | 3 +- scribo/scribo/core/central_sites.hh | 3 +- scribo/scribo/core/erase_objects.hh | 3 +- scribo/scribo/core/init_integral_image.hh | 3 +- scribo/scribo/debug/alignment_decision_image.hh | 3 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 3 +- scribo/scribo/debug/bboxes_image.hh | 9 +- scribo/scribo/debug/char_space_image.hh | 3 +- scribo/scribo/debug/decision_image.hh | 6 +- scribo/scribo/debug/highlight_text_area.hh | 12 +- scribo/scribo/debug/line_info_image.hh | 3 +- scribo/scribo/debug/linked_bboxes_image.hh | 9 +- scribo/scribo/debug/links_decision_image.hh | 3 +- scribo/scribo/debug/links_image.hh | 3 +- .../scribo/debug/looks_like_a_text_line_image.hh | 3 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 3 +- scribo/scribo/debug/save_comp_diff.hh | 3 +- scribo/scribo/debug/save_label_image.hh | 3 +- scribo/scribo/debug/save_table_image.hh | 6 +- scribo/scribo/debug/text_areas_image.hh | 3 +- scribo/scribo/draw/bounding_box_links.hh | 9 +- scribo/scribo/draw/bounding_boxes.hh | 6 +- scribo/scribo/draw/groups_bboxes.hh | 3 +- scribo/scribo/draw/line_components.hh | 3 +- scribo/scribo/estim/components_features.hh | 3 +- scribo/scribo/estim/font_boldness.hh | 12 +- scribo/scribo/estim/font_color.hh | 9 +- scribo/scribo/estim/internal/compute_skeleton.hh | 3 +- scribo/scribo/estim/object_groups_mean_width.hh | 3 +- scribo/scribo/filter/common/objects_photo.hh | 3 +- scribo/scribo/filter/images_in_paragraph.hh | 3 +- scribo/scribo/filter/internal/alignment_angle.hh | 3 +- scribo/scribo/filter/internal/component_aligned.hh | 3 +- scribo/scribo/filter/internal/compute.hh | 6 +- scribo/scribo/filter/object_groups_mean_width.hh | 3 +- scribo/scribo/filter/object_groups_size_ratio.hh | 3 +- scribo/scribo/filter/object_groups_small.hh | 3 +- scribo/scribo/filter/object_groups_with_holes.hh | 7 +- scribo/scribo/filter/object_links_aligned.hh | 3 +- scribo/scribo/filter/object_links_bbox_h_ratio.hh | 3 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 3 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 3 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 3 +- .../scribo/filter/object_links_bottom_aligned.hh | 3 +- .../scribo/filter/object_links_center_aligned.hh | 3 +- scribo/scribo/filter/object_links_left_aligned.hh | 3 +- .../filter/object_links_non_aligned_simple.hh | 3 +- scribo/scribo/filter/object_links_right_aligned.hh | 3 +- scribo/scribo/filter/object_links_top_aligned.hh | 3 +- scribo/scribo/filter/objects_h_thick.hh | 6 +- scribo/scribo/filter/objects_h_thin.hh | 6 +- scribo/scribo/filter/objects_large.hh | 6 +- scribo/scribo/filter/objects_on_border.hh | 3 +- scribo/scribo/filter/objects_size_ratio.hh | 3 +- scribo/scribo/filter/objects_small.hh | 6 +- scribo/scribo/filter/objects_thick.hh | 6 +- scribo/scribo/filter/objects_thin.hh | 6 +- scribo/scribo/filter/objects_v_thick.hh | 6 +- scribo/scribo/filter/objects_v_thin.hh | 6 +- scribo/scribo/filter/objects_with_holes.hh | 8 +- scribo/scribo/filter/paragraphs_bbox_overlap.hh | 3 +- scribo/scribo/filter/paragraphs_in_borders.hh | 3 +- scribo/scribo/filter/paragraphs_in_image.hh | 3 +- scribo/scribo/filter/separators_in_borders.hh | 3 +- scribo/scribo/filter/separators_in_element.hh | 3 +- scribo/scribo/filter/separators_in_paragraph.hh | 3 +- scribo/scribo/filter/separators_vert_in_borders.hh | 3 +- scribo/scribo/io/img/save.hh | 4 +- scribo/scribo/io/text_boxes/save.hh | 3 +- scribo/scribo/io/xml/internal/save_image_to_xml.hh | 3 +- scribo/scribo/io/xml/save.hh | 3 +- scribo/scribo/layout/xy_cut.hh | 18 +- scribo/scribo/make/influence_zone_graph.hh | 3 +- scribo/scribo/make/text_blocks_image.hh | 3 +- scribo/scribo/make/text_components_image.hh | 3 +- scribo/scribo/postprocessing/fill_object_holes.hh | 10 +- .../postprocessing/images_to_drop_capital.hh | 3 +- scribo/scribo/preprocessing/crop.hh | 3 +- .../preprocessing/crop_without_localization.hh | 3 +- scribo/scribo/preprocessing/denoise.hh | 3 +- scribo/scribo/preprocessing/denoise_bg.hh | 3 +- scribo/scribo/preprocessing/denoise_fg.hh | 3 +- scribo/scribo/preprocessing/deskew.hh | 3 +- scribo/scribo/preprocessing/deskew_crop.hh | 3 +- .../scribo/preprocessing/homogeneous_contrast.hh | 3 +- scribo/scribo/preprocessing/rotate_90.hh | 3 +- scribo/scribo/preprocessing/split_bg_fg.hh | 12 +- scribo/scribo/primitive/extract/alignments.hh | 3 +- scribo/scribo/primitive/extract/canvas.hh | 3 +- scribo/scribo/primitive/extract/cells.hh | 3 +- scribo/scribo/primitive/extract/components.hh | 6 +- .../primitive/extract/horizontal_separators.hh | 3 +- .../scribo/primitive/extract/lines_discontinued.hh | 3 +- .../primitive/extract/lines_h_discontinued.hh | 3 +- scribo/scribo/primitive/extract/lines_h_pattern.hh | 3 +- scribo/scribo/primitive/extract/lines_h_single.hh | 6 +- scribo/scribo/primitive/extract/lines_h_thick.hh | 3 +- .../primitive/extract/lines_h_thick_and_single.hh | 3 +- .../primitive/extract/lines_h_thick_and_thin.hh | 3 +- scribo/scribo/primitive/extract/lines_pattern.hh | 9 +- scribo/scribo/primitive/extract/lines_thick.hh | 3 +- .../primitive/extract/lines_v_discontinued.hh | 3 +- scribo/scribo/primitive/extract/lines_v_pattern.hh | 3 +- scribo/scribo/primitive/extract/lines_v_single.hh | 6 +- scribo/scribo/primitive/extract/lines_v_thick.hh | 3 +- .../primitive/extract/lines_v_thick_and_single.hh | 3 +- scribo/scribo/primitive/extract/non_text.hh | 3 +- scribo/scribo/primitive/extract/non_text_hdoc.hh | 3 +- scribo/scribo/primitive/extract/non_text_kmean.hh | 3 +- scribo/scribo/primitive/extract/separators.hh | 3 +- .../primitive/extract/separators_nonvisible.hh | 3 +- .../primitive/extract/vertical_separators.hh | 3 +- scribo/scribo/primitive/group/apply.hh | 6 +- scribo/scribo/primitive/group/from_double_link.hh | 3 +- .../scribo/primitive/group/from_double_link_any.hh | 3 +- scribo/scribo/primitive/group/from_graph.hh | 3 +- scribo/scribo/primitive/group/from_single_link.hh | 3 +- scribo/scribo/primitive/identify.hh | 3 +- .../scribo/primitive/internal/find_graph_link.hh | 3 +- scribo/scribo/primitive/internal/rd.hh | 6 +- .../scribo/primitive/internal/update_graph_link.hh | 3 +- scribo/scribo/primitive/link/compute.hh | 3 +- scribo/scribo/primitive/link/compute_several.hh | 3 +- scribo/scribo/primitive/link/merge_double_link.hh | 3 +- .../link/merge_double_link_closest_aligned.hh | 3 +- scribo/scribo/primitive/link/with_graph.hh | 3 +- scribo/scribo/primitive/link/with_rag.hh | 3 +- .../scribo/primitive/link/with_several_graphes.hh | 3 +- .../primitive/link/with_several_left_links.hh | 3 +- .../link/with_several_right_closest_links.hh | 3 +- .../primitive/link/with_several_right_links.hh | 3 +- .../link/with_several_right_links_overlap.hh | 3 +- .../scribo/primitive/link/with_single_down_link.hh | 3 +- .../scribo/primitive/link/with_single_left_link.hh | 3 +- .../link/with_single_left_link_dmax_ratio.hh | 3 +- .../with_single_left_link_dmax_ratio_aligned.hh | 3 +- .../primitive/link/with_single_right_link.hh | 3 +- .../link/with_single_right_link_bottom.hh | 3 +- .../link/with_single_right_link_dmax_ratio.hh | 3 +- .../with_single_right_link_dmax_ratio_aligned.hh | 3 +- .../primitive/link/with_single_right_link_top.hh | 3 +- .../scribo/primitive/link/with_single_up_link.hh | 3 +- scribo/scribo/primitive/merge/components.hh | 3 +- .../primitive/regroup/from_single_left_link.hh | 3 +- .../regroup/from_single_left_link_wrt_h_ratio.hh | 3 +- scribo/scribo/primitive/remove/separators.hh | 3 +- scribo/scribo/subsampling/bilinear.hh | 3 +- scribo/scribo/subsampling/integral.hh | 12 +- scribo/scribo/subsampling/integral_single_image.hh | 12 +- scribo/scribo/table/align_lines_horizontaly.hh | 3 +- scribo/scribo/table/align_lines_verticaly.hh | 3 +- scribo/scribo/table/connect_horizontal_lines.hh | 3 +- scribo/scribo/table/connect_vertical_lines.hh | 3 +- scribo/scribo/table/erase.hh | 3 +- scribo/scribo/table/extract.hh | 3 +- scribo/scribo/table/internal/align_lines.hh | 3 +- scribo/scribo/table/internal/connect_lines.hh | 3 +- scribo/scribo/table/internal/repair_lines.hh | 3 +- scribo/scribo/table/rebuild.hh | 3 +- scribo/scribo/table/repair_horizontal_lines.hh | 3 +- scribo/scribo/table/repair_vertical_lines.hh | 3 +- scribo/scribo/text/clean.hh | 3 +- scribo/scribo/text/clean_inplace.hh | 3 +- scribo/scribo/text/extract_lines.hh | 6 +- scribo/scribo/text/extract_lines_with_features.hh | 3 +- scribo/scribo/text/extract_lines_wo_merge.hh | 3 +- scribo/scribo/text/look_like_text_lines.hh | 6 +- scribo/scribo/text/paragraphs_closing.hh | 3 +- scribo/scribo/text/recognition.hh | 12 +- .../internal/text_in_doc_preprocess_functor.hh | 2 +- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 3 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 3 +- scribo/scribo/toolchain/text_in_picture.hh | 3 +- scribo/scribo/upsampling/bs2x.hh | 3 +- scribo/scribo/upsampling/eagle.hh | 3 +- scribo/scribo/util/box_intersection.hh | 3 +- scribo/scribo/util/box_is_included.hh | 3 +- scribo/scribo/util/component_precise_outline.hh | 4 +- scribo/scribo/util/compute_sub_domains.hh | 3 +- scribo/scribo/util/hex_to_color.hh | 3 +- scribo/scribo/util/init_integral_image.hh | 12 +- scribo/src/binarization/global_threshold.cc | 3 +- scribo/src/binarization/kim.cc | 2 +- scribo/src/binarization/niblack.cc | 3 +- scribo/src/binarization/otsu.cc | 3 +- .../src/binarization/pgm_global_threshold_auto.cc | 3 +- .../binarization/pgm_niblack_threshold_image.cc | 3 +- scribo/src/binarization/sauvola.cc | 3 +- scribo/src/binarization/sauvola_debug.cc | 3 +- scribo/src/binarization/sauvola_ms.cc | 2 +- scribo/src/binarization/sauvola_ms_debug.cc | 2 +- scribo/src/binarization/sauvola_ms_fg.cc | 2 +- scribo/src/binarization/sauvola_ms_split.cc | 2 +- scribo/src/binarization/singh.cc | 3 +- scribo/src/binarization/wolf.cc | 3 +- scribo/src/content_in_doc.cc | 3 +- scribo/src/content_in_hdoc.cc | 3 +- scribo/src/contest/DAE-2011/content_in_doc_dae.cc | 3 +- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 3 +- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 3 +- scribo/src/debug/highlight_text_area.cc | 3 +- .../src/debug/show_info_median_inter_characters.cc | 3 +- scribo/src/debug/show_info_x_height.cc | 3 +- scribo/src/debug/show_lines_boldness.cc | 3 +- scribo/src/debug/show_objects_large.cc | 2 +- scribo/src/debug/show_objects_large_small.cc | 2 +- scribo/src/debug/show_objects_small.cc | 2 +- scribo/src/debug/show_objects_thick.cc | 2 +- scribo/src/debug/show_objects_thin.cc | 2 +- scribo/src/debug/show_paragraph_blocks.cc | 3 +- scribo/src/debug/show_separators.cc | 3 +- scribo/src/debug/show_stoppers.cc | 3 +- scribo/src/debug/show_text_lines.cc | 3 +- scribo/src/debug/show_text_lines_wo_seps.cc | 3 +- scribo/src/filter/objects_large.cc | 3 +- scribo/src/filter/objects_small.cc | 3 +- scribo/src/filter/objects_thick.cc | 3 +- scribo/src/filter/objects_thin.cc | 3 +- scribo/src/filter/objects_with_holes.cc | 3 +- scribo/src/filter/objects_with_holes_pgm.cc | 3 +- scribo/src/misc/negate.cc | 3 +- scribo/src/misc/superpose.cc | 3 +- scribo/src/non_text_components.cc | 3 +- scribo/src/pbm_text_in_doc.cc | 3 +- scribo/src/postprocessing/fill_object_holes.cc | 3 +- scribo/src/preprocessing/denoise_bg.cc | 3 +- scribo/src/preprocessing/denoise_fg.cc | 3 +- scribo/src/preprocessing/preprocess.cc | 3 +- scribo/src/preprocessing/split_bg_fg.cc | 3 +- scribo/src/preprocessing/subsample.cc | 3 +- scribo/src/preprocessing/unskew.cc | 3 +- scribo/src/primitive/extract/alignments.cc | 3 +- .../src/primitive/extract/discontinued_hlines.cc | 3 +- scribo/src/primitive/extract/discontinued_lines.cc | 3 +- .../src/primitive/extract/discontinued_vlines.cc | 3 +- scribo/src/primitive/extract/lines_pattern.cc | 3 +- .../src/primitive/extract/separators_nonvisible.cc | 3 +- scribo/src/primitive/extract/thick_hlines.cc | 3 +- scribo/src/primitive/extract/thick_vlines.cc | 3 +- .../src/primitive/find/find_discontinued_lines.cc | 3 +- scribo/src/primitive/find/find_pattern_lines.cc | 3 +- scribo/src/primitive/find/find_single_lines.cc | 3 +- .../primitive/find/find_thick_and_single_lines.cc | 3 +- scribo/src/primitive/find/find_thick_lines.cc | 3 +- scribo/src/primitive/remove/separators.cc | 3 +- scribo/src/table/erase.cc | 3 +- scribo/src/table/extract.cc | 3 +- scribo/src/text/cleantxt.cc | 3 +- scribo/src/text/pbm_lines_recognition.cc | 3 +- scribo/src/text/pbm_recognition.cc | 3 +- scribo/src/text_in_picture.cc | 3 +- scribo/src/text_in_picture_dual.cc | 2 +- scribo/src/text_recognition_in_picture.cc | 3 +- scribo/src/util/component_precise_outline.cc | 3 +- 273 files changed, 616 insertions(+), 671 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b0455fc..6bf0607 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,282 @@ 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of mln_trace. + + * scribo/binarization/global_threshold.hh, + * scribo/binarization/global_threshold_auto.hh, + * scribo/binarization/internal/local_threshold_core.hh, + * scribo/binarization/kim.hh, + * scribo/binarization/local_threshold.hh, + * scribo/binarization/niblack.hh, + * scribo/binarization/niblack_fast.hh, + * scribo/binarization/niblack_threshold.hh, + * scribo/binarization/otsu.hh, + * scribo/binarization/otsu_threshold.hh, + * scribo/binarization/sauvola.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_ms_split.hh, + * scribo/binarization/sauvola_threshold.hh, + * scribo/binarization/singh.hh, + * scribo/binarization/wolf.hh, + * scribo/binarization/wolf_fast.hh, + * scribo/convert/from_base64.hh, + * scribo/convert/to_base64.hh, + * scribo/core/central_sites.hh, + * scribo/core/erase_objects.hh, + * scribo/core/init_integral_image.hh, + * scribo/debug/alignment_decision_image.hh, + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/bboxes_image.hh, + * scribo/debug/char_space_image.hh, + * scribo/debug/decision_image.hh, + * scribo/debug/highlight_text_area.hh, + * scribo/debug/line_info_image.hh, + * scribo/debug/linked_bboxes_image.hh, + * scribo/debug/links_decision_image.hh, + * scribo/debug/links_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_comp_diff.hh, + * scribo/debug/save_label_image.hh, + * scribo/debug/save_table_image.hh, + * scribo/debug/text_areas_image.hh, + * scribo/draw/bounding_box_links.hh, + * scribo/draw/bounding_boxes.hh, + * scribo/draw/groups_bboxes.hh, + * scribo/draw/line_components.hh, + * scribo/estim/components_features.hh, + * scribo/estim/font_boldness.hh, + * scribo/estim/font_color.hh, + * scribo/estim/internal/compute_skeleton.hh, + * scribo/estim/object_groups_mean_width.hh, + * scribo/filter/common/objects_photo.hh, + * scribo/filter/images_in_paragraph.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/filter/internal/component_aligned.hh, + * scribo/filter/internal/compute.hh, + * scribo/filter/object_groups_mean_width.hh, + * scribo/filter/object_groups_size_ratio.hh, + * scribo/filter/object_groups_small.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/object_links_aligned.hh, + * scribo/filter/object_links_bbox_h_ratio.hh, + * scribo/filter/object_links_bbox_overlap.hh, + * scribo/filter/object_links_bbox_ratio.hh, + * scribo/filter/object_links_bbox_w_ratio.hh, + * scribo/filter/object_links_bottom_aligned.hh, + * scribo/filter/object_links_center_aligned.hh, + * scribo/filter/object_links_left_aligned.hh, + * scribo/filter/object_links_non_aligned_simple.hh, + * scribo/filter/object_links_right_aligned.hh, + * scribo/filter/object_links_top_aligned.hh, + * scribo/filter/objects_h_thick.hh, + * scribo/filter/objects_h_thin.hh, + * scribo/filter/objects_large.hh, + * scribo/filter/objects_on_border.hh, + * scribo/filter/objects_size_ratio.hh, + * scribo/filter/objects_small.hh, + * scribo/filter/objects_thick.hh, + * scribo/filter/objects_thin.hh, + * scribo/filter/objects_v_thick.hh, + * scribo/filter/objects_v_thin.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/filter/paragraphs_bbox_overlap.hh, + * scribo/filter/paragraphs_in_borders.hh, + * scribo/filter/paragraphs_in_image.hh, + * scribo/filter/separators_in_borders.hh, + * scribo/filter/separators_in_element.hh, + * scribo/filter/separators_in_paragraph.hh, + * scribo/filter/separators_vert_in_borders.hh, + * scribo/io/img/save.hh, + * scribo/io/text_boxes/save.hh, + * scribo/io/xml/internal/save_image_to_xml.hh, + * scribo/io/xml/save.hh, + * scribo/layout/xy_cut.hh, + * scribo/make/influence_zone_graph.hh, + * scribo/make/text_blocks_image.hh, + * scribo/make/text_components_image.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/postprocessing/images_to_drop_capital.hh, + * scribo/preprocessing/crop.hh, + * scribo/preprocessing/crop_without_localization.hh, + * scribo/preprocessing/denoise.hh, + * scribo/preprocessing/denoise_bg.hh, + * scribo/preprocessing/denoise_fg.hh, + * scribo/preprocessing/deskew.hh, + * scribo/preprocessing/deskew_crop.hh, + * scribo/preprocessing/homogeneous_contrast.hh, + * scribo/preprocessing/rotate_90.hh, + * scribo/preprocessing/split_bg_fg.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/extract/canvas.hh, + * scribo/primitive/extract/cells.hh, + * scribo/primitive/extract/components.hh, + * scribo/primitive/extract/horizontal_separators.hh, + * scribo/primitive/extract/lines_discontinued.hh, + * scribo/primitive/extract/lines_h_discontinued.hh, + * scribo/primitive/extract/lines_h_pattern.hh, + * scribo/primitive/extract/lines_h_single.hh, + * scribo/primitive/extract/lines_h_thick.hh, + * scribo/primitive/extract/lines_h_thick_and_single.hh, + * scribo/primitive/extract/lines_h_thick_and_thin.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/primitive/extract/lines_thick.hh, + * scribo/primitive/extract/lines_v_discontinued.hh, + * scribo/primitive/extract/lines_v_pattern.hh, + * scribo/primitive/extract/lines_v_single.hh, + * scribo/primitive/extract/lines_v_thick.hh, + * scribo/primitive/extract/lines_v_thick_and_single.hh, + * scribo/primitive/extract/non_text.hh, + * scribo/primitive/extract/non_text_hdoc.hh, + * scribo/primitive/extract/non_text_kmean.hh, + * scribo/primitive/extract/separators.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/primitive/extract/vertical_separators.hh, + * scribo/primitive/group/apply.hh, + * scribo/primitive/group/from_double_link.hh, + * scribo/primitive/group/from_double_link_any.hh, + * scribo/primitive/group/from_graph.hh, + * scribo/primitive/group/from_single_link.hh, + * scribo/primitive/identify.hh, + * scribo/primitive/internal/find_graph_link.hh, + * scribo/primitive/internal/rd.hh, + * scribo/primitive/internal/update_graph_link.hh, + * scribo/primitive/link/compute.hh, + * scribo/primitive/link/compute_several.hh, + * scribo/primitive/link/merge_double_link.hh, + * scribo/primitive/link/merge_double_link_closest_aligned.hh, + * scribo/primitive/link/with_graph.hh, + * scribo/primitive/link/with_rag.hh, + * scribo/primitive/link/with_several_graphes.hh, + * scribo/primitive/link/with_several_left_links.hh, + * scribo/primitive/link/with_several_right_closest_links.hh, + * scribo/primitive/link/with_several_right_links.hh, + * scribo/primitive/link/with_several_right_links_overlap.hh, + * scribo/primitive/link/with_single_down_link.hh, + * scribo/primitive/link/with_single_left_link.hh, + * scribo/primitive/link/with_single_left_link_dmax_ratio.hh, + * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh, + * scribo/primitive/link/with_single_right_link.hh, + * scribo/primitive/link/with_single_right_link_bottom.hh, + * scribo/primitive/link/with_single_right_link_dmax_ratio.hh, + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh, + * scribo/primitive/link/with_single_right_link_top.hh, + * scribo/primitive/link/with_single_up_link.hh, + * scribo/primitive/merge/components.hh, + * scribo/primitive/regroup/from_single_left_link.hh, + * scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, + * scribo/primitive/remove/separators.hh, + * scribo/subsampling/bilinear.hh, + * scribo/subsampling/integral.hh, + * scribo/subsampling/integral_single_image.hh, + * scribo/table/align_lines_horizontaly.hh, + * scribo/table/align_lines_verticaly.hh, + * scribo/table/connect_horizontal_lines.hh, + * scribo/table/connect_vertical_lines.hh, + * scribo/table/erase.hh, + * scribo/table/extract.hh, + * scribo/table/internal/align_lines.hh, + * scribo/table/internal/connect_lines.hh, + * scribo/table/internal/repair_lines.hh, + * scribo/table/rebuild.hh, + * scribo/table/repair_horizontal_lines.hh, + * scribo/table/repair_vertical_lines.hh, + * scribo/text/clean.hh, + * scribo/text/clean_inplace.hh, + * scribo/text/extract_lines.hh, + * scribo/text/extract_lines_with_features.hh, + * scribo/text/extract_lines_wo_merge.hh, + * scribo/text/look_like_text_lines.hh, + * scribo/text/paragraphs_closing.hh, + * scribo/text/recognition.hh, + * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, + * scribo/toolchain/nepomuk/text_extraction.hh, + * scribo/toolchain/text_in_doc_preprocess.hh, + * scribo/toolchain/text_in_picture.hh, + * scribo/upsampling/bs2x.hh, + * scribo/upsampling/eagle.hh, + * scribo/util/box_intersection.hh, + * scribo/util/box_is_included.hh, + * scribo/util/component_precise_outline.hh, + * scribo/util/compute_sub_domains.hh, + * scribo/util/hex_to_color.hh, + * scribo/util/init_integral_image.hh, + * src/binarization/global_threshold.cc, + * src/binarization/kim.cc, + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/pgm_global_threshold_auto.cc, + * src/binarization/pgm_niblack_threshold_image.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_debug.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc, + * src/binarization/sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_split.cc, + * src/binarization/singh.cc, + * src/binarization/wolf.cc, + * src/content_in_doc.cc, + * src/content_in_hdoc.cc, + * src/contest/DAE-2011/content_in_doc_dae.cc, + * src/contest/DAE-2011/content_in_hdoc_dae.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, + * src/debug/highlight_text_area.cc, + * src/debug/show_info_median_inter_characters.cc, + * src/debug/show_info_x_height.cc, + * src/debug/show_lines_boldness.cc, + * src/debug/show_objects_large.cc, + * src/debug/show_objects_large_small.cc, + * src/debug/show_objects_small.cc, + * src/debug/show_objects_thick.cc, + * src/debug/show_objects_thin.cc, + * src/debug/show_paragraph_blocks.cc, + * src/debug/show_separators.cc, + * src/debug/show_stoppers.cc, + * src/debug/show_text_lines.cc, + * src/debug/show_text_lines_wo_seps.cc, + * src/filter/objects_large.cc, + * src/filter/objects_small.cc, + * src/filter/objects_thick.cc, + * src/filter/objects_thin.cc, + * src/filter/objects_with_holes.cc, + * src/filter/objects_with_holes_pgm.cc, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/non_text_components.cc, + * src/pbm_text_in_doc.cc, + * src/postprocessing/fill_object_holes.cc, + * src/preprocessing/denoise_bg.cc, + * src/preprocessing/denoise_fg.cc, + * src/preprocessing/preprocess.cc, + * src/preprocessing/split_bg_fg.cc, + * src/preprocessing/subsample.cc, + * src/preprocessing/unskew.cc, + * src/primitive/extract/alignments.cc, + * src/primitive/extract/discontinued_hlines.cc, + * src/primitive/extract/discontinued_lines.cc, + * src/primitive/extract/discontinued_vlines.cc, + * src/primitive/extract/lines_pattern.cc, + * src/primitive/extract/separators_nonvisible.cc, + * src/primitive/extract/thick_hlines.cc, + * src/primitive/extract/thick_vlines.cc, + * src/primitive/find/find_discontinued_lines.cc, + * src/primitive/find/find_pattern_lines.cc, + * src/primitive/find/find_single_lines.cc, + * src/primitive/find/find_thick_and_single_lines.cc, + * src/primitive/find/find_thick_lines.cc, + * src/primitive/remove/separators.cc, + * src/table/erase.cc, + * src/table/extract.cc, + * src/text/cleantxt.cc, + * src/text/pbm_lines_recognition.cc, + * src/text/pbm_recognition.cc, + * src/text_in_picture.cc, + * src/text_in_picture_dual.cc, + * src/text_recognition_in_picture.cc, + * src/util/component_precise_outline.cc: Here. + +2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove references to InitializeMagick(). * demo/viewer/main.cc, diff --git a/scribo/scribo/binarization/global_threshold.hh b/scribo/scribo/binarization/global_threshold.hh index 46c25ef..16b4d6b 100644 --- a/scribo/scribo/binarization/global_threshold.hh +++ b/scribo/scribo/binarization/global_threshold.hh @@ -72,7 +72,7 @@ namespace scribo mln_ch_value(I, bool) global_threshold(const Image& input, const mln_value(I)& threshold) { - trace::entering("scribo::binarization::global_threshold"); + mln_trace("scribo::binarization::global_threshold"); mln_precondition(exact(input).is_valid()); mlc_is_not_a(mln_value(I), value::Vectorial)::check(); @@ -80,7 +80,6 @@ namespace scribo mln::fun::v2b::threshold_le<mln_value(I)> f(threshold); mln_ch_value(I, bool) output = data::transform(input, f); - trace::exiting("scribo::binarization::global_threshold"); return output; } diff --git a/scribo/scribo/binarization/global_threshold_auto.hh b/scribo/scribo/binarization/global_threshold_auto.hh index a17f9da..196ca3a 100644 --- a/scribo/scribo/binarization/global_threshold_auto.hh +++ b/scribo/scribo/binarization/global_threshold_auto.hh @@ -89,7 +89,7 @@ namespace scribo mln_ch_value(I, bool) global_threshold_auto(const Image& input_) { - trace::entering("scribo::binarization::global_threshold_auto"); + mln_trace("scribo::binarization::global_threshold_auto"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -154,7 +154,6 @@ namespace scribo mln_ch_value(I, bool) output; output = duplicate((pw::value(input) < pw::cst(threshold)) | input.domain()); - trace::exiting("scribo::binarization::global_threshold_auto"); return output; } diff --git a/scribo/scribo/binarization/internal/local_threshold_core.hh b/scribo/scribo/binarization/internal/local_threshold_core.hh index 2dce13f..90f0659 100644 --- a/scribo/scribo/binarization/internal/local_threshold_core.hh +++ b/scribo/scribo/binarization/internal/local_threshold_core.hh @@ -110,12 +110,11 @@ namespace scribo void local_threshold_core(const Image& input, unsigned window_size) { - trace::entering("scribo::binarization::internal::impl::generic::local_threshold_core"); + mln_trace("scribo::binarization::internal::impl::generic::local_threshold_core"); // Not implemented mlc_abort(I)::check(); - trace::exiting("scribo::binarization::internal::impl::generic::local_threshold_core"); } } // end of namespace scribo::binarization::internal::impl::generic @@ -125,7 +124,7 @@ namespace scribo void local_threshold_core_fastest(const Image& input, F& f, unsigned window_size) { - trace::entering("scribo::binarization::internal::impl::generic::local_threshold_core"); + mln_trace("scribo::binarization::internal::impl::generic::local_threshold_core"); mln_precondition(exact(input).is_valid()); scribo::debug::logger().start_local_time_logging(); @@ -174,7 +173,6 @@ namespace scribo scribo::debug::logger().stop_local_time_logging("Binarization -"); - trace::exiting("scribo::binarization::internal::impl::generic::local_threshold_core"); } @@ -227,7 +225,7 @@ namespace scribo void local_threshold_core(const Image& input, F& f, unsigned window_size) { - trace::entering("scribo::binarization::internal::local_threshold_core"); + mln_trace("scribo::binarization::internal::local_threshold_core"); mln_precondition(exact(input).is_valid()); @@ -252,7 +250,6 @@ namespace scribo mln::debug::filename(alphacond_image_output)); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG - trace::exiting("scribo::binarization::internal::local_threshold_core"); } template <typename I, typename F> diff --git a/scribo/scribo/binarization/kim.hh b/scribo/scribo/binarization/kim.hh index 0d31a1d..f0e066c 100644 --- a/scribo/scribo/binarization/kim.hh +++ b/scribo/scribo/binarization/kim.hh @@ -133,7 +133,7 @@ namespace scribo mln_ch_value(I, bool) kim(const Image& input_, unsigned window_size, double k) { - trace::entering("scribo::binarization::kim"); + mln_trace("scribo::binarization::kim"); const I& input = exact(input_); @@ -241,7 +241,6 @@ namespace scribo } } - trace::exiting("scribo::binarization::kim"); return output; } diff --git a/scribo/scribo/binarization/local_threshold.hh b/scribo/scribo/binarization/local_threshold.hh index efbf2e4..1c3a00e 100644 --- a/scribo/scribo/binarization/local_threshold.hh +++ b/scribo/scribo/binarization/local_threshold.hh @@ -97,7 +97,7 @@ namespace scribo mln_ch_value(I, bool) local_threshold(const Image& input_, const Image<T>& threshold_) { - trace::entering("scribo::binarization::impl::generic::local_threshold"); + mln_trace("scribo::binarization::impl::generic::local_threshold"); internal::local_threshold_tests(input_, threshold_); @@ -111,7 +111,6 @@ namespace scribo for_all(p) output(p) = (input(p) <= threshold(p)); - trace::exiting("scribo::binarization::impl::generic::local_threshold"); return output; } @@ -124,7 +123,7 @@ namespace scribo local_threshold_fastest(const Image& input_, const Image<T>& threshold_) { - trace::entering("scribo::binarization::impl::generic::local_threshold_fastest"); + mln_trace("scribo::binarization::impl::generic::local_threshold_fastest"); internal::local_threshold_tests(input_, threshold_); const I& input = exact(input_); @@ -141,7 +140,6 @@ namespace scribo for_all_3(pi, pt, po) po.val() = (pi.val() <= pt.val()); - trace::exiting("scribo::binarization::impl::generic::local_threshold_fastest"); return output; } @@ -195,14 +193,13 @@ namespace scribo mln_ch_value(I, bool) local_threshold(const Image& input, const Image<T>& threshold) { - trace::entering("scribo::binarization::local_threshold"); + mln_trace("scribo::binarization::local_threshold"); internal::local_threshold_tests(input, threshold); mln_ch_value(I, bool) output = internal::local_threshold_dispatch(input, threshold); - trace::exiting("scribo::binarization::local_threshold"); return output; } diff --git a/scribo/scribo/binarization/niblack.hh b/scribo/scribo/binarization/niblack.hh index 7804681..14b9ab7 100644 --- a/scribo/scribo/binarization/niblack.hh +++ b/scribo/scribo/binarization/niblack.hh @@ -94,14 +94,13 @@ namespace scribo mln_ch_value(I, bool) niblack(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::niblack"); + mln_trace("scribo::binarization::niblack"); mln_precondition(exact(input).is_valid()); internal::niblack_functor f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::niblack"); return f.output; } diff --git a/scribo/scribo/binarization/niblack_fast.hh b/scribo/scribo/binarization/niblack_fast.hh index e009c81..5143a4d 100644 --- a/scribo/scribo/binarization/niblack_fast.hh +++ b/scribo/scribo/binarization/niblack_fast.hh @@ -90,14 +90,13 @@ namespace scribo mln_ch_value(I, bool) niblack_fast(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::niblack_fast"); + mln_trace("scribo::binarization::niblack_fast"); mln_precondition(exact(input).is_valid()); internal::niblack_functor_fast f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::niblack_fast"); return f.output; } diff --git a/scribo/scribo/binarization/niblack_threshold.hh b/scribo/scribo/binarization/niblack_threshold.hh index 0ef9af2..1bd074b 100644 --- a/scribo/scribo/binarization/niblack_threshold.hh +++ b/scribo/scribo/binarization/niblack_threshold.hh @@ -93,7 +93,7 @@ namespace scribo niblack_threshold(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::niblack_threshold"); + mln_trace("scribo::binarization::niblack_threshold"); mln_precondition(mln_site_(I)::dim == 2); mln_precondition(exact(input).is_valid()); @@ -101,7 +101,6 @@ namespace scribo internal::niblack_threshold_functor f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::niblack_threshold"); return f.output; } diff --git a/scribo/scribo/binarization/otsu.hh b/scribo/scribo/binarization/otsu.hh index 2b8e97a..2a8163d 100644 --- a/scribo/scribo/binarization/otsu.hh +++ b/scribo/scribo/binarization/otsu.hh @@ -63,7 +63,7 @@ namespace scribo mln_ch_value(I,bool) otsu(const Image& input_) { - trace::entering("scribo::binarization::otsu"); + mln_trace("scribo::binarization::otsu"); const I& input = exact(input_); mln_precondition(input.is_valid()); diff --git a/scribo/scribo/binarization/otsu_threshold.hh b/scribo/scribo/binarization/otsu_threshold.hh index 391acfa..1ee4b42 100644 --- a/scribo/scribo/binarization/otsu_threshold.hh +++ b/scribo/scribo/binarization/otsu_threshold.hh @@ -65,7 +65,7 @@ namespace scribo mln_value(I) otsu_threshold(const Image& input_) { - trace::entering("scribo::binarization::otsu_threshold"); + mln_trace("scribo::binarization::otsu_threshold"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -122,7 +122,6 @@ namespace scribo } } - trace::exiting("scribo::binarization::otsu_threshold"); return threshold; } diff --git a/scribo/scribo/binarization/sauvola.hh b/scribo/scribo/binarization/sauvola.hh index f6dce0e..a512ac4 100644 --- a/scribo/scribo/binarization/sauvola.hh +++ b/scribo/scribo/binarization/sauvola.hh @@ -96,14 +96,13 @@ namespace scribo mln_ch_value(I, bool) sauvola(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::sauvola"); + mln_trace("scribo::binarization::sauvola"); mln_precondition(exact(input).is_valid()); internal::sauvola_functor f(input, K, SCRIBO_DEFAULT_SAUVOLA_R); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::sauvola"); return f.output; } diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 4f32ec3..e5a46cb 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -805,7 +805,7 @@ namespace scribo unsigned s, image2d<mln::util::couple<double,double> >& integral_sum_sum_2) { - trace::entering("scribo::binarization::sauvola_ms"); + mln_trace("scribo::binarization::sauvola_ms"); const I& input_1 = exact(input_1_); typedef mln_value(I) V; @@ -1000,7 +1000,6 @@ namespace scribo scribo::debug::logger().stop_local_time_logging("5. Final binarization -"); scribo::debug::logger().start_local_time_logging(); - trace::exiting("scribo::binarization::sauvola_ms"); return output; } @@ -1017,7 +1016,7 @@ namespace scribo sauvola_ms(const Image& input_1_, unsigned w_1, unsigned s, image2d<mln::util::couple<double,double> >& integral_sum_sum_2) { - trace::entering("scribo::binarization::sauvola_ms"); + mln_trace("scribo::binarization::sauvola_ms"); mln_precondition(exact(input_1_).is_valid()); // Gray level images ONLY. @@ -1028,7 +1027,6 @@ namespace scribo output = impl::generic::sauvola_ms(exact(input_1_), w_1, s, integral_sum_sum_2); - trace::exiting("scribo::binarization::sauvola_ms"); return output; } @@ -1036,7 +1034,7 @@ namespace scribo mln_ch_value(I,bool) sauvola_ms(const Image& input_1_, unsigned w_1, unsigned s) { - trace::entering("scribo::binarization::sauvola_ms"); + mln_trace("scribo::binarization::sauvola_ms"); mln_precondition(exact(input_1_).is_valid()); // Gray level images ONLY. @@ -1049,7 +1047,6 @@ namespace scribo mln_ch_value(I,bool) output = sauvola_ms(input_1_, w_1, s, integral_sum_sum_2); - trace::exiting("scribo::binarization::sauvola_ms"); return output; } diff --git a/scribo/scribo/binarization/sauvola_ms_split.hh b/scribo/scribo/binarization/sauvola_ms_split.hh index e8cd240..c577d52 100644 --- a/scribo/scribo/binarization/sauvola_ms_split.hh +++ b/scribo/scribo/binarization/sauvola_ms_split.hh @@ -105,7 +105,7 @@ namespace scribo unsigned s, unsigned min_ntrue, double k2, double k3, double k4) { - trace::entering("scribo::binarization::sauvola_ms_split"); + mln_trace("scribo::binarization::sauvola_ms_split"); mln_precondition(exact(input_1_).is_valid()); mlc_is(mln_value(I), value::rgb8)::check(); @@ -157,7 +157,6 @@ namespace scribo ++b_ptr; } - trace::exiting("scribo::binarization::sauvola_ms_split"); return output; } diff --git a/scribo/scribo/binarization/sauvola_threshold.hh b/scribo/scribo/binarization/sauvola_threshold.hh index 2dff6d6..ad6a5a9 100644 --- a/scribo/scribo/binarization/sauvola_threshold.hh +++ b/scribo/scribo/binarization/sauvola_threshold.hh @@ -91,7 +91,7 @@ namespace scribo sauvola_threshold(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::sauvola_threshold"); + mln_trace("scribo::binarization::sauvola_threshold"); mln_precondition(mln_site_(I)::dim == 2); mln_precondition(exact(input).is_valid()); @@ -99,7 +99,6 @@ namespace scribo internal::sauvola_threshold_functor f(input, K, SCRIBO_DEFAULT_SAUVOLA_R); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::sauvola_threshold"); return f.output; } diff --git a/scribo/scribo/binarization/singh.hh b/scribo/scribo/binarization/singh.hh index 58f4664..d66fd04 100644 --- a/scribo/scribo/binarization/singh.hh +++ b/scribo/scribo/binarization/singh.hh @@ -89,14 +89,13 @@ namespace scribo mln_ch_value(I, bool) singh(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::singh"); + mln_trace("scribo::binarization::singh"); mln_precondition(exact(input).is_valid()); internal::singh_functor f(input, K); internal::local_threshold_core(input, f, window_size); - trace::exiting("scribo::binarization::singh"); return f.output; } diff --git a/scribo/scribo/binarization/wolf.hh b/scribo/scribo/binarization/wolf.hh index 6dc2f64..376c486 100644 --- a/scribo/scribo/binarization/wolf.hh +++ b/scribo/scribo/binarization/wolf.hh @@ -127,7 +127,7 @@ namespace scribo mln_ch_value(I, bool) wolf(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::wolf"); + mln_trace("scribo::binarization::wolf"); mln_precondition(exact(input).is_valid()); @@ -166,7 +166,6 @@ namespace scribo scribo::canvas::integral_browsing(integral, 1, window_size, window_size, integral_size_ratio, f); - trace::exiting("scribo::binarization::wolf"); return f.output; } diff --git a/scribo/scribo/binarization/wolf_fast.hh b/scribo/scribo/binarization/wolf_fast.hh index 58cb723..10e9d28 100644 --- a/scribo/scribo/binarization/wolf_fast.hh +++ b/scribo/scribo/binarization/wolf_fast.hh @@ -126,7 +126,7 @@ namespace scribo mln_ch_value(I, bool) wolf_fast(const Image& input, unsigned window_size, double K) { - trace::entering("scribo::binarization::wolf_fast"); + mln_trace("scribo::binarization::wolf_fast"); mln_precondition(exact(input).is_valid()); @@ -164,7 +164,6 @@ namespace scribo scribo::canvas::integral_browsing(integral, 1, window_size, window_size, 3, f); - trace::exiting("scribo::binarization::wolf_fast"); return f.output; } diff --git a/scribo/scribo/convert/from_base64.hh b/scribo/scribo/convert/from_base64.hh index 753883d..a6edc8f 100644 --- a/scribo/scribo/convert/from_base64.hh +++ b/scribo/scribo/convert/from_base64.hh @@ -124,7 +124,7 @@ namespace scribo void from_base64_(const V& data64, const unsigned length, Image& output_) { - trace::entering("scribo::convert::from_base64_"); + mln_trace("scribo::convert::from_base64_"); mln_precondition(exact(output_).is_valid()); using namespace internal; @@ -176,7 +176,6 @@ namespace scribo } } - trace::exiting("scribo::convert::to_base64_"); } @@ -187,11 +186,10 @@ namespace scribo void from_base64(const util::array<unsigned char>& data64, Image& output_) { - trace::entering("scribo::convert::from_base64"); + mln_trace("scribo::convert::from_base64"); internal::from_base64_(data64, data64.nelements(), output_); - trace::exiting("scribo::convert::to_base64"); } @@ -201,12 +199,11 @@ namespace scribo void from_base64(const QString& data64, Image& output_) { - trace::entering("scribo::convert::from_base64"); + mln_trace("scribo::convert::from_base64"); QByteArray data64_ = data64.toAscii(); internal::from_base64_(data64_.constData(), data64_.size(), output_); - trace::exiting("scribo::convert::to_base64"); } # endif // ! HAVE_QT diff --git a/scribo/scribo/convert/to_base64.hh b/scribo/scribo/convert/to_base64.hh index 81dda1f..5bf12ff 100644 --- a/scribo/scribo/convert/to_base64.hh +++ b/scribo/scribo/convert/to_base64.hh @@ -118,7 +118,7 @@ namespace scribo void to_base64(const Image& input_, mln::util::array<unsigned char>& output) { - trace::entering("scribo::convert::to_base64"); + mln_trace("scribo::convert::to_base64"); mln_precondition(exact(input_).is_valid()); using namespace internal; @@ -171,7 +171,6 @@ namespace scribo } } - trace::exiting("scribo::convert::to_base64"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/core/central_sites.hh b/scribo/scribo/core/central_sites.hh index 47e92d9..0279b69 100644 --- a/scribo/scribo/core/central_sites.hh +++ b/scribo/scribo/core/central_sites.hh @@ -73,7 +73,7 @@ namespace scribo mln::util::couple<P,P> central_sites(const box& b, unsigned dim) { - trace::entering("scribo::central_sites"); + mln_trace("scribo::central_sites"); mln_precondition(b.is_valid()); unsigned n = b.pmax()[dim] - b.pmin()[dim]; @@ -83,7 +83,6 @@ namespace scribo P p2 = b.center(); p2[dim] += n / 2; - trace::exiting("scribo::central_sites"); return mln::make::couple(p1, p2); } diff --git a/scribo/scribo/core/erase_objects.hh b/scribo/scribo/core/erase_objects.hh index 78fd293..9a7f15d 100644 --- a/scribo/scribo/core/erase_objects.hh +++ b/scribo/scribo/core/erase_objects.hh @@ -64,7 +64,7 @@ namespace scribo erase_objects(Image& input_, const component_set<L>& comps) { - trace::entering("scribo::erase_objects"); + mln_trace("scribo::erase_objects"); mlc_equal(mln_value(I),bool)::check(); @@ -75,7 +75,6 @@ namespace scribo != pw::cst(literal::zero))).rw(), false); - trace::exiting("scribo::erase_objects"); } diff --git a/scribo/scribo/core/init_integral_image.hh b/scribo/scribo/core/init_integral_image.hh index 5bd88dc..b3f4456 100644 --- a/scribo/scribo/core/init_integral_image.hh +++ b/scribo/scribo/core/init_integral_image.hh @@ -70,7 +70,7 @@ namespace scribo mln_ch_value(I,double) init_integral_image(const Image& input_, F& func) { - trace::entering("scribo::init_integral_image"); + mln_trace("scribo::init_integral_image"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -99,7 +99,6 @@ namespace scribo - output.at_(row - 1, col - 1) + func(input.at_(row, col)); - trace::exiting("scribo::init_integral_image"); return output; } diff --git a/scribo/scribo/debug/alignment_decision_image.hh b/scribo/scribo/debug/alignment_decision_image.hh index c17a22d..00ad931 100644 --- a/scribo/scribo/debug/alignment_decision_image.hh +++ b/scribo/scribo/debug/alignment_decision_image.hh @@ -84,7 +84,7 @@ namespace scribo const object_links<L>& filtered_links, const anchor::Type& anchor) { - trace::entering("scribo::debug::alignment_decision_image"); + mln_trace("scribo::debug::alignment_decision_image"); const I& input = exact(input_); const component_set<L>& components = links.components(); @@ -119,7 +119,6 @@ namespace scribo mln::draw::line(decision_image, anchor_i, anchor_li, value); } - trace::exiting("scribo::debug::alignment_decision_image"); return decision_image; } diff --git a/scribo/scribo/debug/bboxes_enlarged_image.hh b/scribo/scribo/debug/bboxes_enlarged_image.hh index 562e396..65f77fb 100644 --- a/scribo/scribo/debug/bboxes_enlarged_image.hh +++ b/scribo/scribo/debug/bboxes_enlarged_image.hh @@ -103,7 +103,7 @@ namespace scribo const value::rgb8& text_value, const value::rgb8& non_text_value) { - trace::entering("scribo::debug::bboxes_enlarged_image"); + mln_trace("scribo::debug::bboxes_enlarged_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); @@ -117,7 +117,6 @@ namespace scribo mln::draw::box(output, lines(l).bbox(), non_text_value); } - trace::exiting("scribo::debug::bboxes_enlarged_image"); return output; } diff --git a/scribo/scribo/debug/bboxes_image.hh b/scribo/scribo/debug/bboxes_image.hh index 1b2ee4f..d18f471 100644 --- a/scribo/scribo/debug/bboxes_image.hh +++ b/scribo/scribo/debug/bboxes_image.hh @@ -102,13 +102,12 @@ namespace scribo const mln::util::array< box<mln_site(I)> >& bboxes, const value::rgb8& value) { - trace::entering("scribo::debug::bboxes_image"); + mln_trace("scribo::debug::bboxes_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); draw::bounding_boxes(tmp, bboxes, value); - trace::exiting("scribo::debug::bboxes_image"); return tmp; } @@ -120,7 +119,7 @@ namespace scribo const line_set<L>& lines, const value::rgb8& value) { - trace::entering("scribo::debug::bboxes_image"); + mln_trace("scribo::debug::bboxes_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) @@ -130,7 +129,6 @@ namespace scribo if (! lines(l).is_hidden()) mln::draw::box(output, lines(l).bbox(), value); - trace::exiting("scribo::debug::bboxes_image"); return output; } @@ -152,7 +150,7 @@ namespace scribo const component_set<L>& comps, const value::rgb8& value) { - trace::entering("scribo::debug::bboxes_image"); + mln_trace("scribo::debug::bboxes_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) @@ -162,7 +160,6 @@ namespace scribo if (comps(c).is_valid()) mln::draw::box(output, comps(c).bbox(), value); - trace::exiting("scribo::debug::bboxes_image"); return output; } diff --git a/scribo/scribo/debug/char_space_image.hh b/scribo/scribo/debug/char_space_image.hh index ffb2e82..b08942c 100644 --- a/scribo/scribo/debug/char_space_image.hh +++ b/scribo/scribo/debug/char_space_image.hh @@ -71,7 +71,7 @@ namespace scribo char_space_image(const Image& input, const line_set<L>& line, const value::rgb8& v) { - trace::entering("scribo::debug::char_space_image"); + mln_trace("scribo::debug::char_space_image"); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); @@ -102,7 +102,6 @@ namespace scribo } - trace::exiting("scribo::debug::char_space_image"); return output; } diff --git a/scribo/scribo/debug/decision_image.hh b/scribo/scribo/debug/decision_image.hh index f375b0b..c2310a3 100644 --- a/scribo/scribo/debug/decision_image.hh +++ b/scribo/scribo/debug/decision_image.hh @@ -107,7 +107,7 @@ namespace scribo const object_groups<L>& groups, const object_groups<L>& filtered_groups) { - trace::entering("scribo::debug::decision_image"); + mln_trace("scribo::debug::decision_image"); const I& input = exact(input_); const component_set<L>& components = groups.components(); @@ -128,7 +128,6 @@ namespace scribo mln::draw::box(decision_image, components(i).bbox(), literal::green); - trace::exiting("scribo::debug::decision_image"); return decision_image; } @@ -140,7 +139,7 @@ namespace scribo const object_links<L>& filtered_links, anchor::Type anchor) { - trace::entering("scribo::debug::decision_image"); + mln_trace("scribo::debug::decision_image"); const I& input = exact(input_); const component_set<L>& comps = links.components(); @@ -173,7 +172,6 @@ namespace scribo } } - trace::exiting("scribo::debug::decision_image"); return decision_image; } diff --git a/scribo/scribo/debug/highlight_text_area.hh b/scribo/scribo/debug/highlight_text_area.hh index 2a7ed8a..dc4e4b4 100644 --- a/scribo/scribo/debug/highlight_text_area.hh +++ b/scribo/scribo/debug/highlight_text_area.hh @@ -145,7 +145,7 @@ namespace scribo highlight_text_area(const Image& input_, const mln::util::array<box<mln_site(I)> >& bbox) { - trace::entering("scribo::debug::highlight_text_area"); + mln_trace("scribo::debug::highlight_text_area"); const I& input = exact(input_); @@ -166,7 +166,6 @@ namespace scribo for_all_elements(i, bbox) mln::draw::box(output, bbox(i), literal::red); - trace::exiting("scribo::debug::highlight_text_area"); return output; } @@ -176,7 +175,7 @@ namespace scribo highlight_text_area(const Image& input_, const line_set<L>& lines) { - trace::entering("scribo::debug::highlight_text_area"); + mln_trace("scribo::debug::highlight_text_area"); const I& input = exact(input_); @@ -211,7 +210,6 @@ namespace scribo mln::draw::box(output, lines(i).bbox(), literal::red); } - trace::exiting("scribo::debug::highlight_text_area"); return output; } @@ -221,7 +219,7 @@ namespace scribo highlight_text_area(const Image& input_, const scribo::component_set<L>& components) { - trace::entering("scribo::debug::highlight_text_area"); + mln_trace("scribo::debug::highlight_text_area"); const I& input = exact(input_); @@ -244,7 +242,6 @@ namespace scribo if (components(i).is_valid()) mln::draw::box(output, components(i).bbox(), literal::red); - trace::exiting("scribo::debug::highlight_text_area"); return output; } @@ -255,7 +252,7 @@ namespace scribo const scribo::component_set<L>& components, double angle, box2d rb) { - trace::entering("scribo::debug::highlight_text_area"); + mln_trace("scribo::debug::highlight_text_area"); const I& input = exact(input_); @@ -293,7 +290,6 @@ namespace scribo if (components(i).is_valid()) mln::draw::box(output, bbox(i), literal::red); - trace::exiting("scribo::debug::highlight_text_area"); return output; } diff --git a/scribo/scribo/debug/line_info_image.hh b/scribo/scribo/debug/line_info_image.hh index ff277ef..fb54cc8 100644 --- a/scribo/scribo/debug/line_info_image.hh +++ b/scribo/scribo/debug/line_info_image.hh @@ -69,7 +69,7 @@ namespace scribo mln_ch_value(I,value::rgb8) line_info_image(const Image& input, const line_set<L>& line) { - trace::entering("scribo::debug::line_info_image"); + mln_trace("scribo::debug::line_info_image"); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); @@ -114,7 +114,6 @@ namespace scribo literal::orange); } - trace::exiting("scribo::debug::line_info_image"); return output; } diff --git a/scribo/scribo/debug/linked_bboxes_image.hh b/scribo/scribo/debug/linked_bboxes_image.hh index 1b502b0..8a28ae1 100644 --- a/scribo/scribo/debug/linked_bboxes_image.hh +++ b/scribo/scribo/debug/linked_bboxes_image.hh @@ -164,7 +164,7 @@ namespace scribo const value::rgb8& link_value, anchor::Type anchor) { - trace::entering("scribo::debug::linked_bboxes_image"); + mln_trace("scribo::debug::linked_bboxes_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); @@ -172,7 +172,6 @@ namespace scribo draw::bounding_boxes(tmp, links.components(), box_value); draw::bounding_box_links(tmp, links, link_value, anchor); - trace::exiting("scribo::debug::linked_bboxes_image"); return tmp; } @@ -223,7 +222,7 @@ namespace scribo const value::rgb8& validated_link_value, anchor::Type anchor) { - trace::entering("scribo::debug::linked_bboxes_image"); + mln_trace("scribo::debug::linked_bboxes_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I,value::rgb8) tmp = data::convert(value::rgb8(), input); @@ -235,7 +234,6 @@ namespace scribo validated_link_value, anchor); - trace::exiting("scribo::debug::linked_bboxes_image"); return tmp; } @@ -250,7 +248,7 @@ namespace scribo const value::rgb8& link_value, anchor::Type anchor) { - trace::entering("scribo::debug::linked_bboxes_image"); + mln_trace("scribo::debug::linked_bboxes_image"); mln_precondition(exact(g).is_valid()); mln_precondition(exact(input).is_valid()); @@ -260,7 +258,6 @@ namespace scribo draw::bounding_box_links(tmp, exact(g).components(), g, link_value, anchor); - trace::exiting("scribo::debug::linked_bboxes_image"); return tmp; } diff --git a/scribo/scribo/debug/links_decision_image.hh b/scribo/scribo/debug/links_decision_image.hh index 80a6cdf..b6528b2 100644 --- a/scribo/scribo/debug/links_decision_image.hh +++ b/scribo/scribo/debug/links_decision_image.hh @@ -68,7 +68,7 @@ namespace scribo const object_links<L>& links, const object_links<L>& filtered_links) { - trace::entering("scribo::debug::links_decision_image"); + mln_trace("scribo::debug::links_decision_image"); const I& input = exact(input_); const component_set<L>& comps = links.components(); @@ -100,7 +100,6 @@ namespace scribo mln::draw::line(links_decision_image, p1, p2, value); } - trace::exiting("scribo::debug::links_decision_image"); return links_decision_image; } diff --git a/scribo/scribo/debug/links_image.hh b/scribo/scribo/debug/links_image.hh index f7ac992..c41446f 100644 --- a/scribo/scribo/debug/links_image.hh +++ b/scribo/scribo/debug/links_image.hh @@ -72,7 +72,7 @@ namespace scribo anchor::Type anchor, bool draw_bboxes) { - trace::entering("scribo::debug::links_image"); + mln_trace("scribo::debug::links_image"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -97,7 +97,6 @@ namespace scribo anchor), literal::green); - trace::exiting("scribo::debug::links_image"); return links_image; } diff --git a/scribo/scribo/debug/looks_like_a_text_line_image.hh b/scribo/scribo/debug/looks_like_a_text_line_image.hh index 48c0009..de1aad1 100644 --- a/scribo/scribo/debug/looks_like_a_text_line_image.hh +++ b/scribo/scribo/debug/looks_like_a_text_line_image.hh @@ -97,7 +97,7 @@ namespace scribo const value::rgb8& text_value, const value::rgb8& non_text_value) { - trace::entering("scribo::debug::looks_like_a_text_line_image"); + mln_trace("scribo::debug::looks_like_a_text_line_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input); @@ -111,7 +111,6 @@ namespace scribo mln::draw::box(output, lines(l).bbox(), non_text_value); } - trace::exiting("scribo::debug::looks_like_a_text_line_image"); return output; } diff --git a/scribo/scribo/debug/mean_and_base_lines_image.hh b/scribo/scribo/debug/mean_and_base_lines_image.hh index 89ee198..d84668e 100644 --- a/scribo/scribo/debug/mean_and_base_lines_image.hh +++ b/scribo/scribo/debug/mean_and_base_lines_image.hh @@ -100,7 +100,7 @@ namespace scribo const value::rgb8& meanline_value, const value::rgb8& baseline_value) { - trace::entering("scribo::debug::mean_and_base_lines_image"); + mln_trace("scribo::debug::mean_and_base_lines_image"); mln_precondition(exact(input).is_valid()); mln_ch_value(I, value::rgb8) @@ -130,7 +130,6 @@ namespace scribo } } - trace::exiting("scribo::debug::mean_and_base_lines_image"); return output; } diff --git a/scribo/scribo/debug/save_comp_diff.hh b/scribo/scribo/debug/save_comp_diff.hh index 6b2bc3b..b4a4003 100644 --- a/scribo/scribo/debug/save_comp_diff.hh +++ b/scribo/scribo/debug/save_comp_diff.hh @@ -77,7 +77,7 @@ namespace scribo const component_set<L2>& comps_new, const std::string& filename) { - trace::entering("scribo::debug::save_comp_diff"); + mln_trace("scribo::debug::save_comp_diff"); image2d<value::rgb8> output; initialize(output, comps_ref.labeled_image()); @@ -96,7 +96,6 @@ namespace scribo io::ppm::save(output, filename); - trace::exiting("scribo::debug::save_comp_diff"); } diff --git a/scribo/scribo/debug/save_label_image.hh b/scribo/scribo/debug/save_label_image.hh index af138d9..0abe246 100644 --- a/scribo/scribo/debug/save_label_image.hh +++ b/scribo/scribo/debug/save_label_image.hh @@ -66,13 +66,12 @@ namespace scribo save_label_image(const Image& lbl, const mln_value(I)& nlabels, const char *filename) { - trace::entering("scribo::debug::save_label_image"); + mln_trace("scribo::debug::save_label_image"); mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(lbl).is_valid()); io::ppm::save(labeling::colorize(value::rgb8(), lbl, nlabels), filename); - trace::exiting("scribo::debug::save_label_image"); } diff --git a/scribo/scribo/debug/save_table_image.hh b/scribo/scribo/debug/save_table_image.hh index c606604..420b7c7 100644 --- a/scribo/scribo/debug/save_table_image.hh +++ b/scribo/scribo/debug/save_table_image.hh @@ -92,7 +92,7 @@ namespace scribo const value::rgb8& bbox_color, const std::string& filename) { - trace::entering("scribo::debug::save_table_image"); + mln_trace("scribo::debug::save_table_image"); // mlc_converts_to(mln_value(I), value::rgb8)::check(); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -102,7 +102,6 @@ namespace scribo draw::bounding_boxes(out2, tableboxes.second(), bbox_color); io::ppm::save(out2, filename); - trace::exiting("scribo::debug::save_table_image"); } @@ -115,7 +114,7 @@ namespace scribo const value::rgb8& bbox_color, const std::string& filename) { - trace::entering("scribo::debug::save_table_image"); + mln_trace("scribo::debug::save_table_image"); const S& input_domain = exact(input_domain_); mln_precondition(input_domain.is_valid()); @@ -125,7 +124,6 @@ namespace scribo draw::bounding_boxes(out2, tableboxes.second(), bbox_color); io::ppm::save(out2, filename); - trace::exiting("scribo::debug::save_table_image"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/debug/text_areas_image.hh b/scribo/scribo/debug/text_areas_image.hh index 6aaa64f..f20ba24 100644 --- a/scribo/scribo/debug/text_areas_image.hh +++ b/scribo/scribo/debug/text_areas_image.hh @@ -75,7 +75,7 @@ namespace scribo text_areas_image(const Image& input_rgb_, const scribo::component_set<L>& comps) { - trace::entering("scribo::debug::text_areas_image"); + mln_trace("scribo::debug::text_areas_image"); const I& input_rgb = exact(input_rgb_); mln_precondition(input_rgb.is_valid()); @@ -119,7 +119,6 @@ namespace scribo dv[0] += comps(i).bbox().nrows() + shift; } - trace::exiting("scribo::debug::text_areas_image"); return output; } diff --git a/scribo/scribo/draw/bounding_box_links.hh b/scribo/scribo/draw/bounding_box_links.hh index 2816d4e..e9e316d 100644 --- a/scribo/scribo/draw/bounding_box_links.hh +++ b/scribo/scribo/draw/bounding_box_links.hh @@ -215,7 +215,7 @@ namespace scribo const mln_value(I)& value, anchor::Type anchor) { - trace::entering("scribo::draw::bounding_box_links"); + mln_trace("scribo::draw::bounding_box_links"); I& input = exact(input_); @@ -232,7 +232,6 @@ namespace scribo mln::draw::line(input, p1, p2, value); } - trace::exiting("scribo::draw::bounding_box_links"); } @@ -258,7 +257,7 @@ namespace scribo const mln_value(I)& validated_link_value, anchor::Type anchor) { - trace::entering("scribo::draw::bounding_box_links"); + mln_trace("scribo::draw::bounding_box_links"); I& input = exact(input_); mln_precondition(input.is_valid()); @@ -303,7 +302,6 @@ namespace scribo } - trace::exiting("scribo::draw::bounding_box_links"); } @@ -315,14 +313,13 @@ namespace scribo const Graph<G>& g, const mln_value(I)& link_value) { - trace::entering("scribo::draw::bounding_box_links"); + mln_trace("scribo::draw::bounding_box_links"); mln_precondition(exact(input).is_valid()); internal::draw_graph_edges_functor<I,G> f(exact(input), link_value); mln::canvas::browsing::depth_first_search(g, f); - trace::exiting("scribo::draw::bounding_box_links"); } diff --git a/scribo/scribo/draw/bounding_boxes.hh b/scribo/scribo/draw/bounding_boxes.hh index d2a6384..134ab1a 100644 --- a/scribo/scribo/draw/bounding_boxes.hh +++ b/scribo/scribo/draw/bounding_boxes.hh @@ -72,7 +72,7 @@ namespace scribo const mln::util::array< box<mln_site(I)> >& boxes, const mln_value(I)& value) { - trace::entering("scribo::draw::bounding_boxes"); + mln_trace("scribo::draw::bounding_boxes"); I& input = exact(input_); @@ -82,7 +82,6 @@ namespace scribo if (boxes[i].is_valid()) mln::draw::box(input, boxes[i], value); - trace::exiting("scribo::draw::bounding_boxes"); } @@ -93,7 +92,7 @@ namespace scribo const component_set<L>& components, const mln_value(I)& value) { - trace::entering("scribo::draw::bounding_boxes"); + mln_trace("scribo::draw::bounding_boxes"); I& input = exact(input_); @@ -103,7 +102,6 @@ namespace scribo if (components(i).is_valid()) mln::draw::box(input, components(i).bbox(), value); - trace::exiting("scribo::draw::bounding_boxes"); } diff --git a/scribo/scribo/draw/groups_bboxes.hh b/scribo/scribo/draw/groups_bboxes.hh index 95cb4e2..f53532e 100644 --- a/scribo/scribo/draw/groups_bboxes.hh +++ b/scribo/scribo/draw/groups_bboxes.hh @@ -67,7 +67,7 @@ namespace scribo const object_groups<L>& groups, const mln_value(I)& value) { - trace::entering("scribo::draw::groups_bboxes"); + mln_trace("scribo::draw::groups_bboxes"); I& input = exact(input_); @@ -77,7 +77,6 @@ namespace scribo if (groups(g).is_valid()) mln::draw::box(input, groups(g).bbox(), value); - trace::exiting("scribo::draw::groups_bboxes"); } diff --git a/scribo/scribo/draw/line_components.hh b/scribo/scribo/draw/line_components.hh index 6025eef..24dae61 100644 --- a/scribo/scribo/draw/line_components.hh +++ b/scribo/scribo/draw/line_components.hh @@ -61,7 +61,7 @@ namespace scribo const line_info<L>& line, const mln_value(I)& value) { - trace::entering("scribo::draw::line_components"); + mln_trace("scribo::draw::line_components"); I& input = exact(input_); @@ -102,7 +102,6 @@ namespace scribo } } - trace::exiting("scribo::draw::line_components"); } diff --git a/scribo/scribo/estim/components_features.hh b/scribo/scribo/estim/components_features.hh index 4db21e2..06be1ce 100644 --- a/scribo/scribo/estim/components_features.hh +++ b/scribo/scribo/estim/components_features.hh @@ -80,7 +80,7 @@ namespace scribo components_features(const Image& input_, const Image<J>& bin_input_, const component_set<L>& components) { - trace::entering("scribo::estim::components_features"); + mln_trace("scribo::estim::components_features"); const I& input = exact(input_); const J& bin_input = exact(bin_input_); @@ -167,7 +167,6 @@ namespace scribo // t.stop(); // std::cout << "compute color and boldness " << t << std::endl; - trace::exiting("scribo::estim::components_features"); return output; } diff --git a/scribo/scribo/estim/font_boldness.hh b/scribo/scribo/estim/font_boldness.hh index 0b145bf..e46f225 100644 --- a/scribo/scribo/estim/font_boldness.hh +++ b/scribo/scribo/estim/font_boldness.hh @@ -68,7 +68,7 @@ namespace scribo boldness_from_lbl(const Image& ima_lbl_, const Image<J>& skel_) { - trace::entering("scribo::estim::internal::boldness_from_lbl"); + mln_trace("scribo::estim::internal::boldness_from_lbl"); const I& ima_lbl = exact(ima_lbl_); const J& skel = exact(skel_); @@ -89,7 +89,6 @@ namespace scribo float res = ima_p / (float) skel_p; - trace::exiting("scribo::estim::internal::boldness_from_lbl"); return res; } @@ -103,7 +102,7 @@ namespace scribo const mln_value(I)& nlabels, const Image<J>& skel_lbl_) { - trace::entering("scribo::estim::internal::boldness_from_lbl"); + mln_trace("scribo::estim::internal::boldness_from_lbl"); const I& ima_lbl = exact(ima_lbl_); const J& skel_lbl = exact(skel_lbl_); @@ -137,7 +136,6 @@ namespace scribo // variance /= nlabels; - trace::exiting("scribo::estim::internal::boldness_from_lbl"); return mean.to_result(); } @@ -156,7 +154,7 @@ namespace scribo float font_boldness(const Image& ima_) { - trace::entering("scribo::estim::impl::generic::font_boldness"); + mln_trace("scribo::estim::impl::generic::font_boldness"); const I& ima = exact(ima_); mln_precondition(ima.is_valid()); @@ -176,7 +174,6 @@ namespace scribo float output = internal::boldness_from_lbl(lbl, nlabels, slbl); - trace::exiting("scribo::estim::impl::generic::font_boldness"); return output; } @@ -192,14 +189,13 @@ namespace scribo float font_boldness(const Image& ima) { - trace::entering("scribo::estim::font_boldness"); + mln_trace("scribo::estim::font_boldness"); mln_precondition(exact(ima).is_valid()); mlc_is(mln_value(I), bool)::check(); float output = impl::generic::font_boldness(ima); - trace::exiting("scribo::estim::font_boldness"); return output; } diff --git a/scribo/scribo/estim/font_color.hh b/scribo/scribo/estim/font_color.hh index 78e8c83..9df6ccb 100644 --- a/scribo/scribo/estim/font_color.hh +++ b/scribo/scribo/estim/font_color.hh @@ -67,7 +67,7 @@ namespace scribo font_color_rgb(const Image& text_ima_, const Image<J>& bin_text_ima_) { - trace::entering("scribo::estim::impl::font_color_rgb"); + mln_trace("scribo::estim::impl::font_color_rgb"); typedef mln_value(I) V1; typedef mln_value(J) V2; @@ -106,7 +106,6 @@ namespace scribo med_rgb.green() = m_green.to_result(); med_rgb.blue() = m_blue.to_result(); - trace::exiting("scribo::estim::impl::font_color_rgb"); return med_rgb; } @@ -116,7 +115,7 @@ namespace scribo font_color_grayscale(const Image& text_ima_, const Image<J>& bin_text_ima_) { - trace::entering("scribo::estim::impl::font_color_grayscale"); + mln_trace("scribo::estim::impl::font_color_grayscale"); typedef mln_value(I) V1; typedef mln_value(J) V2; @@ -143,7 +142,6 @@ namespace scribo med_val = m_val.to_result(); - trace::exiting("scribo::estim::impl::font_color_grayscale"); return med_val; } @@ -189,11 +187,10 @@ namespace scribo mln_value(I) font_color(const Image& text_ima, const Image<J>& bin_text_ima) { - trace::entering("scribo::estim::font_color"); + mln_trace("scribo::estim::font_color"); mln_value(I) output = internal::font_color_dispatch(text_ima, bin_text_ima); - trace::exiting("scribo::estim::font_color"); return output; } diff --git a/scribo/scribo/estim/internal/compute_skeleton.hh b/scribo/scribo/estim/internal/compute_skeleton.hh index 175ebd0..6c9c4e2 100644 --- a/scribo/scribo/estim/internal/compute_skeleton.hh +++ b/scribo/scribo/estim/internal/compute_skeleton.hh @@ -72,7 +72,7 @@ namespace scribo mln_concrete(I) compute_skeleton(const Image& input_) { - trace::entering("scribo::estim::internal::compute_skeleton"); + mln_trace("scribo::estim::internal::compute_skeleton"); const I& input = exact(input_); mlc_is(mln_value(I), bool)::check(); @@ -103,7 +103,6 @@ namespace scribo topo::skeleton::is_simple_point<nbh_t>(nbh), K, dist_map); - trace::exiting("scribo::estim::internal::compute_skeleton"); return skel; } diff --git a/scribo/scribo/estim/object_groups_mean_width.hh b/scribo/scribo/estim/object_groups_mean_width.hh index 9167db4..e91ec31 100644 --- a/scribo/scribo/estim/object_groups_mean_width.hh +++ b/scribo/scribo/estim/object_groups_mean_width.hh @@ -66,7 +66,7 @@ namespace scribo mln::util::array<float> object_groups_mean_width(const object_groups<L>& groups) { - trace::entering("scribo::estim::object_groups_mean_width"); + mln_trace("scribo::estim::object_groups_mean_width"); mln_precondition(groups.is_valid()); @@ -84,7 +84,6 @@ namespace scribo else output(g) = 0; - trace::exiting("scribo::estim::object_groups_mean_width"); return output; } diff --git a/scribo/scribo/filter/common/objects_photo.hh b/scribo/scribo/filter/common/objects_photo.hh index 2d8d581..e21588c 100644 --- a/scribo/scribo/filter/common/objects_photo.hh +++ b/scribo/scribo/filter/common/objects_photo.hh @@ -65,7 +65,7 @@ namespace scribo component_set<L> components_photo(const component_set<L>& components) { - trace::entering("scribo::filter::common::components_photo"); + mln_trace("scribo::filter::common::components_photo"); mln_precondition(components.is_valid()); @@ -81,7 +81,6 @@ namespace scribo // math::min(input.ncols(), // input.nrows()) / 5); - trace::exiting("scribo::filter::common::components_photo"); return filtered_components; } diff --git a/scribo/scribo/filter/images_in_paragraph.hh b/scribo/scribo/filter/images_in_paragraph.hh index 9a88c51..5fc340b 100644 --- a/scribo/scribo/filter/images_in_paragraph.hh +++ b/scribo/scribo/filter/images_in_paragraph.hh @@ -64,7 +64,7 @@ namespace scribo void images_in_paragraph(document<L>& doc) { - trace::entering("scribo::filter::images_in_paragraph"); + mln_trace("scribo::filter::images_in_paragraph"); mln_precondition(doc.is_valid()); @@ -104,7 +104,6 @@ namespace scribo // Ignored components are still in the separator image... doc.set_elements(elts); - trace::exiting("scribo::filter::images_in_paragraph"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index 035dec7..fcbb892 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.hh @@ -73,7 +73,7 @@ namespace scribo unsigned current_object, unsigned nbh_object, anchor::Type anchor) { - trace::entering("scribo::filter::internal::alignment_angle"); + mln_trace("scribo::filter::internal::alignment_angle"); mln_precondition(comps.is_valid()); @@ -165,7 +165,6 @@ namespace scribo " Invalid anchor value... Aborting computation."); } - trace::exiting("scribo::filter::internal::alignment_angle"); return result; } diff --git a/scribo/scribo/filter/internal/component_aligned.hh b/scribo/scribo/filter/internal/component_aligned.hh index 7200d44..210b0ea 100644 --- a/scribo/scribo/filter/internal/component_aligned.hh +++ b/scribo/scribo/filter/internal/component_aligned.hh @@ -89,7 +89,7 @@ namespace scribo unsigned current_object, unsigned nbh_object, anchor::Type anchor, float max_alpha_rad) { - trace::entering("scribo::filter::internal::component_aligned_rad"); + mln_trace("scribo::filter::internal::component_aligned_rad"); mln_precondition(comps.is_valid()); @@ -98,7 +98,6 @@ namespace scribo bool output = (angle <= max_alpha_rad); - trace::exiting("scribo::filter::internal::component_aligned_rad"); return output; } diff --git a/scribo/scribo/filter/internal/compute.hh b/scribo/scribo/filter/internal/compute.hh index 7c87c5f..133cd3c 100644 --- a/scribo/scribo/filter/internal/compute.hh +++ b/scribo/scribo/filter/internal/compute.hh @@ -94,7 +94,7 @@ namespace scribo const V& label_type, const Function_v2b<F>& filter) { - trace::entering("scribo::filter::internal::compute"); + mln_trace("scribo::filter::internal::compute"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -113,7 +113,6 @@ namespace scribo mln_concrete(I) output = duplicate(input); data::fill((output | pw::value(components) == literal::zero).rw(), false); - trace::exiting("scribo::filter::internal::compute"); return output; } @@ -124,14 +123,13 @@ namespace scribo compute(const component_set<L>& components, const Function_v2b<F>& filter) { - trace::entering("scribo::filter::internal::compute"); + mln_trace("scribo::filter::internal::compute"); mln_precondition(components.is_valid()); component_set<L> output = components.duplicate(); output.update_tags(filter, component::Ignored); - trace::exiting("scribo::filter::internal::compute"); return output; } diff --git a/scribo/scribo/filter/object_groups_mean_width.hh b/scribo/scribo/filter/object_groups_mean_width.hh index 2386517..d2c8e4f 100644 --- a/scribo/scribo/filter/object_groups_mean_width.hh +++ b/scribo/scribo/filter/object_groups_mean_width.hh @@ -69,7 +69,7 @@ namespace scribo object_groups<L> object_groups_mean_width(const object_groups<L>& groups, float width) { - trace::entering("scribo::filter::object_groups_mean_width"); + mln_trace("scribo::filter::object_groups_mean_width"); mln_precondition(groups.is_valid()); mln_precondition(width >= 0); @@ -84,7 +84,6 @@ namespace scribo && group_width[g] < width) output(g).invalidate(); - trace::exiting("scribo::filter::object_groups_mean_width"); return output; } diff --git a/scribo/scribo/filter/object_groups_size_ratio.hh b/scribo/scribo/filter/object_groups_size_ratio.hh index 2607c86..6298352 100644 --- a/scribo/scribo/filter/object_groups_size_ratio.hh +++ b/scribo/scribo/filter/object_groups_size_ratio.hh @@ -75,7 +75,7 @@ namespace scribo float max_size_ratio, float max_invalid_ratio_per_group) { - trace::entering("scribo::filter::object_groups_size_ratio"); + mln_trace("scribo::filter::object_groups_size_ratio"); mln_precondition(groups.is_valid()); @@ -99,7 +99,6 @@ namespace scribo || !groups(g).is_valid()) output(g).invalidate(); - trace::exiting("scribo::filter::object_groups_size_ratio"); return output; } diff --git a/scribo/scribo/filter/object_groups_small.hh b/scribo/scribo/filter/object_groups_small.hh index 5a698cb..618ea79 100644 --- a/scribo/scribo/filter/object_groups_small.hh +++ b/scribo/scribo/filter/object_groups_small.hh @@ -71,7 +71,7 @@ namespace scribo object_groups_small(const object_groups<L>& groups, unsigned n_links) { - trace::entering("scribo::filter::object_groups_small"); + mln_trace("scribo::filter::object_groups_small"); mln_precondition(groups.is_valid()); @@ -81,7 +81,6 @@ namespace scribo if (output(i).is_valid() && output(i).card() < n_links) output(i).invalidate(); - trace::exiting("scribo::filter::object_groups_small"); return output; } diff --git a/scribo/scribo/filter/object_groups_with_holes.hh b/scribo/scribo/filter/object_groups_with_holes.hh index 46d8d41..40e0209 100644 --- a/scribo/scribo/filter/object_groups_with_holes.hh +++ b/scribo/scribo/filter/object_groups_with_holes.hh @@ -160,7 +160,7 @@ namespace scribo object_groups_with_holes(const object_groups<L>& groups, unsigned min_size) { - trace::entering("scribo::filter::impl::generic::object_groups_with_holes"); + mln_trace("scribo::filter::impl::generic::object_groups_with_holes"); // Grouping groups and relabel the underlying labeled image. // Groups are now considered as components. @@ -299,7 +299,6 @@ namespace scribo // No groups need to be invalidated. if (kept == components.nelements()) { - trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); return groups.duplicate(); } @@ -309,7 +308,6 @@ namespace scribo if (! to_keep(group_2_comp(c))) output(c).invalidate(); - trace::exiting("scribo::filter::impl::generic::object_groups_with_holes"); return output; } @@ -328,14 +326,13 @@ namespace scribo object_groups_with_holes(const object_groups<L>& groups, unsigned min_size) { - trace::entering("scribo::filter::object_groups_with_holes"); + mln_trace("scribo::filter::object_groups_with_holes"); mln_precondition(groups.is_valid()); object_groups<L> output = impl::generic::object_groups_with_holes(groups, min_size); - trace::exiting("scribo::filter::object_groups_with_holes"); return output; } diff --git a/scribo/scribo/filter/object_links_aligned.hh b/scribo/scribo/filter/object_links_aligned.hh index 6d76d95..da85b26 100644 --- a/scribo/scribo/filter/object_links_aligned.hh +++ b/scribo/scribo/filter/object_links_aligned.hh @@ -93,14 +93,13 @@ namespace scribo float max_alpha, anchor::Type anchor) { - trace::entering("scribo::filter::object_links_aligned"); + mln_trace("scribo::filter::object_links_aligned"); mln_precondition(links.is_valid()); object_links<L> output = object_links_non_aligned_simple(links, anchor, max_alpha); - trace::exiting("scribo::filter::object_links_aligned"); return output; } diff --git a/scribo/scribo/filter/object_links_bbox_h_ratio.hh b/scribo/scribo/filter/object_links_bbox_h_ratio.hh index 2c3256a..45d1b66 100644 --- a/scribo/scribo/filter/object_links_bbox_h_ratio.hh +++ b/scribo/scribo/filter/object_links_bbox_h_ratio.hh @@ -76,14 +76,13 @@ namespace scribo object_links_bbox_h_ratio(const object_links<L>& links, float max_h_ratio) { - trace::entering("scribo::filter::object_links_bbox_h_ratio"); + mln_trace("scribo::filter::object_links_bbox_h_ratio"); mln_precondition(links.is_valid()); object_links<L> output = object_links_bbox_ratio(links, 0, max_h_ratio); - trace::exiting("scribo::filter::object_links_bbox_h_ratio"); return output; } diff --git a/scribo/scribo/filter/object_links_bbox_overlap.hh b/scribo/scribo/filter/object_links_bbox_overlap.hh index d09839a..969dd87 100644 --- a/scribo/scribo/filter/object_links_bbox_overlap.hh +++ b/scribo/scribo/filter/object_links_bbox_overlap.hh @@ -76,7 +76,7 @@ namespace scribo object_links_bbox_overlap(const object_links<L>& links, float max_overlap_ratio) { - trace::entering("scribo::filter::object_links_bbox_overlap"); + mln_trace("scribo::filter::object_links_bbox_overlap"); mln_precondition(links.is_valid()); @@ -100,7 +100,6 @@ namespace scribo output.clear(i); } - trace::exiting("scribo::filter::object_links_bbox_overlap"); return output; } diff --git a/scribo/scribo/filter/object_links_bbox_ratio.hh b/scribo/scribo/filter/object_links_bbox_ratio.hh index 2a2afa1..8580ea1 100644 --- a/scribo/scribo/filter/object_links_bbox_ratio.hh +++ b/scribo/scribo/filter/object_links_bbox_ratio.hh @@ -75,7 +75,7 @@ namespace scribo unsigned dim, float max_ratio) { - trace::entering("scribo::filter::object_links_bbox_ratio"); + mln_trace("scribo::filter::object_links_bbox_ratio"); mln_precondition(links.is_valid()); @@ -98,7 +98,6 @@ namespace scribo output.clear(i); } - trace::exiting("scribo::filter::object_links_bbox_ratio"); return output; } diff --git a/scribo/scribo/filter/object_links_bbox_w_ratio.hh b/scribo/scribo/filter/object_links_bbox_w_ratio.hh index 7bcb3d3..8b9a05a 100644 --- a/scribo/scribo/filter/object_links_bbox_w_ratio.hh +++ b/scribo/scribo/filter/object_links_bbox_w_ratio.hh @@ -75,14 +75,13 @@ namespace scribo object_links_bbox_w_ratio(const object_links<L>& links, float max_w_ratio) { - trace::entering("scribo::filter::object_links_bbox_w_ratio"); + mln_trace("scribo::filter::object_links_bbox_w_ratio"); mln_precondition(links.is_valid()); object_links<L> output = object_links_bbox_ratio(links, 1, max_w_ratio); - trace::exiting("scribo::filter::object_links_bbox_w_ratio"); return output; } diff --git a/scribo/scribo/filter/object_links_bottom_aligned.hh b/scribo/scribo/filter/object_links_bottom_aligned.hh index 353c2f6..ca643f8 100644 --- a/scribo/scribo/filter/object_links_bottom_aligned.hh +++ b/scribo/scribo/filter/object_links_bottom_aligned.hh @@ -93,14 +93,13 @@ namespace scribo object_links_bottom_aligned(const object_links<L>& links, float max_alpha) { - trace::entering("scribo::filter::object_links_bottom_aligned"); + mln_trace("scribo::filter::object_links_bottom_aligned"); mln_precondition(links.is_valid()); object_links<L> output = object_links_aligned(links, max_alpha, anchor::Bottom); - trace::exiting("scribo::filter::object_links_bottom_aligned"); return output; } diff --git a/scribo/scribo/filter/object_links_center_aligned.hh b/scribo/scribo/filter/object_links_center_aligned.hh index adbfad8..d5f4813 100644 --- a/scribo/scribo/filter/object_links_center_aligned.hh +++ b/scribo/scribo/filter/object_links_center_aligned.hh @@ -88,7 +88,7 @@ namespace scribo object_links_center_aligned(const object_links<L>& links, float max_alpha) { - trace::entering("scribo::filter::object_links_center_aligned"); + mln_trace("scribo::filter::object_links_center_aligned"); mln_precondition(links.is_valid()); @@ -96,7 +96,6 @@ namespace scribo output = object_links_non_aligned_simple(links, anchor::Center, max_alpha); - trace::exiting("scribo::filter::object_links_center_aligned"); return output; } diff --git a/scribo/scribo/filter/object_links_left_aligned.hh b/scribo/scribo/filter/object_links_left_aligned.hh index 9a50a20..2a7e0ef 100644 --- a/scribo/scribo/filter/object_links_left_aligned.hh +++ b/scribo/scribo/filter/object_links_left_aligned.hh @@ -94,7 +94,7 @@ namespace scribo object_links_left_aligned(const object_links<L>& links, float max_alpha) { - trace::entering("scribo::filter::object_links_left_aligned"); + mln_trace("scribo::filter::object_links_left_aligned"); mln_precondition(links.is_valid()); @@ -103,7 +103,6 @@ namespace scribo anchor::Left, max_alpha); - trace::exiting("scribo::filter::object_links_left_aligned"); return output; } diff --git a/scribo/scribo/filter/object_links_non_aligned_simple.hh b/scribo/scribo/filter/object_links_non_aligned_simple.hh index 77c5b1c..59fc6db 100644 --- a/scribo/scribo/filter/object_links_non_aligned_simple.hh +++ b/scribo/scribo/filter/object_links_non_aligned_simple.hh @@ -98,7 +98,7 @@ namespace scribo anchor::Type anchor, float max_alpha) { - trace::entering("scribo::filter::object_links_non_aligned_simple"); + mln_trace("scribo::filter::object_links_non_aligned_simple"); mln_precondition(links.is_valid()); @@ -117,7 +117,6 @@ namespace scribo output.clear(i); - trace::exiting("scribo::filter::object_links_non_aligned_simple"); return output; } diff --git a/scribo/scribo/filter/object_links_right_aligned.hh b/scribo/scribo/filter/object_links_right_aligned.hh index 018cf97..d72ac50 100644 --- a/scribo/scribo/filter/object_links_right_aligned.hh +++ b/scribo/scribo/filter/object_links_right_aligned.hh @@ -93,7 +93,7 @@ namespace scribo object_links_right_aligned(const object_links<L>& links, float max_alpha) { - trace::entering("scribo::filter::object_links_right_aligned"); + mln_trace("scribo::filter::object_links_right_aligned"); mln_precondition(links.is_valid()); @@ -102,7 +102,6 @@ namespace scribo anchor::Right, max_alpha); - trace::exiting("scribo::filter::object_links_right_aligned"); return output; } diff --git a/scribo/scribo/filter/object_links_top_aligned.hh b/scribo/scribo/filter/object_links_top_aligned.hh index 6489ea4..6295b63 100644 --- a/scribo/scribo/filter/object_links_top_aligned.hh +++ b/scribo/scribo/filter/object_links_top_aligned.hh @@ -94,14 +94,13 @@ namespace scribo object_links_top_aligned(const object_links<L>& links, float max_alpha) { - trace::entering("scribo::filter::object_links_top_aligned"); + mln_trace("scribo::filter::object_links_top_aligned"); mln_precondition(links.is_valid()); object_links<L> output = object_links_aligned(links, max_alpha, anchor::Top); - trace::exiting("scribo::filter::object_links_top_aligned"); return output; } diff --git a/scribo/scribo/filter/objects_h_thick.hh b/scribo/scribo/filter/objects_h_thick.hh index 7dc7fa5..7a0cc17 100644 --- a/scribo/scribo/filter/objects_h_thick.hh +++ b/scribo/scribo/filter/objects_h_thick.hh @@ -154,7 +154,7 @@ namespace scribo const V& label_type, unsigned max_thickness) { - trace::entering("scribo::filter::objects_h_thick"); + mln_trace("scribo::filter::objects_h_thick"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -166,7 +166,6 @@ namespace scribo mln_concrete(I) output = internal::compute(input, nbh, label_type, functor); - trace::exiting("scribo::filter::objects_h_thick"); return output; } @@ -177,12 +176,11 @@ namespace scribo objects_h_thick(const component_set<L>& comps, unsigned max_thickness) { - trace::entering("scribo::filter::objects_h_thick"); + mln_trace("scribo::filter::objects_h_thick"); internal::h_thick_object_filter<L> functor(comps, max_thickness); component_set<L> output = internal::compute(comps, functor); - trace::exiting("scribo::filter::objects_h_thick"); return output; } diff --git a/scribo/scribo/filter/objects_h_thin.hh b/scribo/scribo/filter/objects_h_thin.hh index 7b1d18a..2b3567d 100644 --- a/scribo/scribo/filter/objects_h_thin.hh +++ b/scribo/scribo/filter/objects_h_thin.hh @@ -155,7 +155,7 @@ namespace scribo const V& label_type, unsigned min_thinness) { - trace::entering("scribo::filter::objects_h_thin"); + mln_trace("scribo::filter::objects_h_thin"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -168,7 +168,6 @@ namespace scribo output = internal::compute(input, nbh, label_type, functor); - trace::exiting("scribo::filter::objects_h_thin"); return output; } @@ -179,14 +178,13 @@ namespace scribo objects_h_thin(const component_set<L>& comps, unsigned min_thinness) { - trace::entering("scribo::filter::objects_h_thin"); + mln_trace("scribo::filter::objects_h_thin"); internal::objects_h_thin_filter<L> is_not_too_h_thin(comps, min_thinness); component_set<L> output = internal::compute(comps, is_not_too_h_thin); - trace::exiting("scribo::filter::objects_h_thin"); return output; } diff --git a/scribo/scribo/filter/objects_large.hh b/scribo/scribo/filter/objects_large.hh index 96d1817..802b3db 100644 --- a/scribo/scribo/filter/objects_large.hh +++ b/scribo/scribo/filter/objects_large.hh @@ -105,7 +105,7 @@ namespace scribo V& nlabels, unsigned min_size) { - trace::entering("scribo::filter::components_large"); + mln_trace("scribo::filter::components_large"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -123,7 +123,6 @@ namespace scribo output = mln::data::transform(lbl.labeled_image(), fv2b); nlabels = fv2b.nlabels_; - trace::exiting("scribo::filter::components_large"); return output; } @@ -135,7 +134,7 @@ namespace scribo components_large(const component_set<L>& components, unsigned max_size) { - trace::entering("scribo::filter::components_large"); + mln_trace("scribo::filter::components_large"); mln_precondition(components.is_valid()); @@ -144,7 +143,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(f, component::Ignored); - trace::exiting("scribo::filter::components_large"); return output; } diff --git a/scribo/scribo/filter/objects_on_border.hh b/scribo/scribo/filter/objects_on_border.hh index 55578a4..e09b2ba 100644 --- a/scribo/scribo/filter/objects_on_border.hh +++ b/scribo/scribo/filter/objects_on_border.hh @@ -78,7 +78,7 @@ namespace scribo component_set<L> components_on_border(const component_set<L>& components) { - trace::entering("scribo::filter::components_on_border"); + mln_trace("scribo::filter::components_on_border"); mln_precondition(components.is_valid()); @@ -87,7 +87,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(f, component::Ignored); - trace::exiting("scribo::filter::components_on_border"); return output; } diff --git a/scribo/scribo/filter/objects_size_ratio.hh b/scribo/scribo/filter/objects_size_ratio.hh index 9efa8bf..3b0e6e4 100644 --- a/scribo/scribo/filter/objects_size_ratio.hh +++ b/scribo/scribo/filter/objects_size_ratio.hh @@ -104,7 +104,7 @@ namespace scribo float min_size_ratio) { - trace::entering("scribo::primitive::objects_size_ratio"); + mln_trace("scribo::primitive::objects_size_ratio"); typedef internal::components_size_ratio_filter<L> func_t; func_t has_valid_size_ratio(comps, min_size_ratio); @@ -112,7 +112,6 @@ namespace scribo component_set<L> output = comps.duplicate(); output.update_tags(has_valid_size_ratio, component::Ignored); - trace::exiting("scribo::primitive::objects_size_ratio"); return output; } diff --git a/scribo/scribo/filter/objects_small.hh b/scribo/scribo/filter/objects_small.hh index 14d88da..a6b0660 100644 --- a/scribo/scribo/filter/objects_small.hh +++ b/scribo/scribo/filter/objects_small.hh @@ -106,7 +106,7 @@ namespace scribo V& nlabels, unsigned min_size) { - trace::entering("scribo::filter::components_small"); + mln_trace("scribo::filter::components_small"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -124,7 +124,6 @@ namespace scribo output = mln::data::transform(lbl.labeled_image(), fv2b); nlabels = fv2b.nlabels_; - trace::exiting("scribo::filter::components_small"); return output; } @@ -135,7 +134,7 @@ namespace scribo components_small(const component_set<L>& components, unsigned min_size) { - trace::entering("scribo::filter::components_small"); + mln_trace("scribo::filter::components_small"); mln_precondition(components.is_valid()); @@ -144,7 +143,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(f, component::Ignored); - trace::exiting("scribo::filter::components_small"); return output; } diff --git a/scribo/scribo/filter/objects_thick.hh b/scribo/scribo/filter/objects_thick.hh index 8c3a03b..c3e238c 100644 --- a/scribo/scribo/filter/objects_thick.hh +++ b/scribo/scribo/filter/objects_thick.hh @@ -140,7 +140,7 @@ namespace scribo const V& label_type, unsigned max_thickness) { - trace::entering("scribo::filter::objects_thick"); + mln_trace("scribo::filter::objects_thick"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -160,7 +160,6 @@ namespace scribo mln_concrete(I) output = duplicate(input); data::fill((output | pw::value(components) == literal::zero).rw(), false); - trace::exiting("scribo::filter::objects_thick"); return output; } @@ -171,7 +170,7 @@ namespace scribo objects_thick(const component_set<L>& components, unsigned max_thickness) { - trace::entering("scribo::filter::objects_thick"); + mln_trace("scribo::filter::objects_thick"); mln_precondition(components.is_valid()); @@ -181,7 +180,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(is_not_too_thick, component::Ignored); - trace::exiting("scribo::filter::objects_thick"); return output; } diff --git a/scribo/scribo/filter/objects_thin.hh b/scribo/scribo/filter/objects_thin.hh index 1f3e7ab..777736e 100644 --- a/scribo/scribo/filter/objects_thin.hh +++ b/scribo/scribo/filter/objects_thin.hh @@ -142,7 +142,7 @@ namespace scribo const V& label_type, unsigned min_thickness) { - trace::entering("scribo::filter::components_thin"); + mln_trace("scribo::filter::components_thin"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -161,7 +161,6 @@ namespace scribo mln_concrete(I) output = mln::data::transform(comps.labeled_image(), fv2b); - trace::exiting("scribo::filter::components_thin"); return output; } @@ -172,7 +171,7 @@ namespace scribo components_thin(const component_set<L>& components, unsigned min_thickness) { - trace::entering("scribo::filter::components_thin"); + mln_trace("scribo::filter::components_thin"); mln_precondition(components.is_valid()); @@ -182,7 +181,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(is_not_too_thin, component::Ignored); - trace::exiting("scribo::filter::components_thin"); return output; } diff --git a/scribo/scribo/filter/objects_v_thick.hh b/scribo/scribo/filter/objects_v_thick.hh index e9e85a1..472c736 100644 --- a/scribo/scribo/filter/objects_v_thick.hh +++ b/scribo/scribo/filter/objects_v_thick.hh @@ -156,7 +156,7 @@ namespace scribo const V& label_type, unsigned max_thickness) { - trace::entering("scribo::filter::objects_v_thick"); + mln_trace("scribo::filter::objects_v_thick"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -168,7 +168,6 @@ namespace scribo mln_concrete(I) output = internal::compute(input, nbh, label_type, functor); - trace::exiting("scribo::filter::objects_v_thick"); return output; } @@ -179,12 +178,11 @@ namespace scribo objects_v_thick(const component_set<L>& comps, unsigned max_thickness) { - trace::entering("scribo::filter::objects_v_thick"); + mln_trace("scribo::filter::objects_v_thick"); internal::v_thick_object_filter<L> functor(comps, max_thickness); component_set<L> output = internal::compute(comps, functor); - trace::exiting("scribo::filter::objects_v_thick"); return output; } diff --git a/scribo/scribo/filter/objects_v_thin.hh b/scribo/scribo/filter/objects_v_thin.hh index c5364b3..d67881c 100644 --- a/scribo/scribo/filter/objects_v_thin.hh +++ b/scribo/scribo/filter/objects_v_thin.hh @@ -157,7 +157,7 @@ namespace scribo const V& label_type, unsigned min_thinness) { - trace::entering("scribo::filter::objects_v_thin"); + mln_trace("scribo::filter::objects_v_thin"); (void) label_type; const I& input = exact(input_); @@ -170,7 +170,6 @@ namespace scribo mln_concrete(I) output = internal::compute(input, nbh, label_type, fv2b); - trace::exiting("scribo::filter::objects_v_thin"); return output; } @@ -181,13 +180,12 @@ namespace scribo objects_v_thin(const component_set<L>& comps, unsigned min_thinness) { - trace::entering("scribo::filter::objects_v_thin"); + mln_trace("scribo::filter::objects_v_thin"); internal::objects_v_thin_filter<L> is_not_too_v_thin(comps, min_thinness); component_set<L> output = internal::compute(comps, is_not_too_v_thin); - trace::exiting("scribo::filter::objects_v_thin"); return output; } diff --git a/scribo/scribo/filter/objects_with_holes.hh b/scribo/scribo/filter/objects_with_holes.hh index 332cb1d..22d045f 100644 --- a/scribo/scribo/filter/objects_with_holes.hh +++ b/scribo/scribo/filter/objects_with_holes.hh @@ -186,7 +186,7 @@ namespace scribo unsigned min_holes_count, unsigned min_size) { - trace::entering("scribo::filter::objects_with_holes"); + mln_trace("scribo::filter::objects_with_holes"); typedef component_set<L> O; neighb2d nbh = c4(); @@ -325,7 +325,6 @@ namespace scribo if (kept == components.nelements()) { - trace::exiting("scribo::filter::objects_with_holes"); return components; } @@ -334,7 +333,6 @@ namespace scribo // t_ = timer_; // std::cout << "init output = " << t_ << std::endl; - trace::exiting("scribo::filter::objects_with_holes"); return output; } @@ -348,7 +346,7 @@ namespace scribo components_with_two_holes(const component_set<L>& components, unsigned min_size) { - trace::entering("scribo::filter::objects_with_holes"); + mln_trace("scribo::filter::objects_with_holes"); // std::cout << components.nelements() << std::endl; @@ -463,14 +461,12 @@ namespace scribo component_set<L> output; if (kept == components.nelements()) { - trace::exiting("scribo::filter::objects_with_holes"); return components; } output = components.duplicate(); output.update_tags(to_keep, component::Ignored); - trace::exiting("scribo::filter::objects_with_holes"); return output; } diff --git a/scribo/scribo/filter/paragraphs_bbox_overlap.hh b/scribo/scribo/filter/paragraphs_bbox_overlap.hh index 744b1ee..4592612 100644 --- a/scribo/scribo/filter/paragraphs_bbox_overlap.hh +++ b/scribo/scribo/filter/paragraphs_bbox_overlap.hh @@ -100,7 +100,7 @@ namespace scribo paragraph_set<L> paragraphs_bbox_overlap(const paragraph_set<L>& parset) { - trace::entering("scribo::filter::paragraphs_bbox_overlap"); + mln_trace("scribo::filter::paragraphs_bbox_overlap"); mln_precondition(parset.is_valid()); @@ -242,7 +242,6 @@ namespace scribo if (output(p).is_valid()) output(p).force_stats_update(); - trace::exiting("scribo::filter::paragraphs_bbox_overlap"); return output; } diff --git a/scribo/scribo/filter/paragraphs_in_borders.hh b/scribo/scribo/filter/paragraphs_in_borders.hh index c3b9623..e05534c 100644 --- a/scribo/scribo/filter/paragraphs_in_borders.hh +++ b/scribo/scribo/filter/paragraphs_in_borders.hh @@ -80,7 +80,7 @@ namespace scribo void paragraphs_in_borders(document<L>& doc) { - trace::entering("scribo::filter::paragraphs_in_borders"); + mln_trace("scribo::filter::paragraphs_in_borders"); mln_precondition(doc.is_valid()); @@ -130,7 +130,6 @@ namespace scribo doc.set_paragraphs(parset); } - trace::exiting("scribo::filter::paragraphs_in_borders"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/filter/paragraphs_in_image.hh b/scribo/scribo/filter/paragraphs_in_image.hh index d95864d..ba30e11 100644 --- a/scribo/scribo/filter/paragraphs_in_image.hh +++ b/scribo/scribo/filter/paragraphs_in_image.hh @@ -79,7 +79,7 @@ namespace scribo void paragraphs_in_image(document<L>& doc) { - trace::entering("scribo::filter::paragraphs_in_image"); + mln_trace("scribo::filter::paragraphs_in_image"); mln_precondition(doc.has_elements()); mln_precondition(doc.has_text()); @@ -138,7 +138,6 @@ namespace scribo output.invalidate(not_to_ignore); doc.set_paragraphs(output); - trace::exiting("scribo::filter::paragraphs_in_image"); } diff --git a/scribo/scribo/filter/separators_in_borders.hh b/scribo/scribo/filter/separators_in_borders.hh index f5048d2..304e785 100644 --- a/scribo/scribo/filter/separators_in_borders.hh +++ b/scribo/scribo/filter/separators_in_borders.hh @@ -87,7 +87,7 @@ namespace scribo void separators_in_borders(document<L>& doc, float vratio, float hratio) { - trace::entering("scribo::filter::separators_in_borders"); + mln_trace("scribo::filter::separators_in_borders"); mln_precondition(doc.is_valid()); @@ -203,7 +203,6 @@ namespace scribo doc.set_vline_separators(doc.vline_seps(), vline); } - trace::exiting("scribo::filter::separators_in_borders"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/filter/separators_in_element.hh b/scribo/scribo/filter/separators_in_element.hh index d4f587b..89e0014 100644 --- a/scribo/scribo/filter/separators_in_element.hh +++ b/scribo/scribo/filter/separators_in_element.hh @@ -68,7 +68,7 @@ namespace scribo void separators_in_element(document<L>& doc) { - trace::entering("scribo::filter::separators_in_element"); + mln_trace("scribo::filter::separators_in_element"); mln_precondition(doc.is_valid()); mln_precondition(doc.has_elements()); @@ -140,7 +140,6 @@ namespace scribo doc.set_vline_separators(doc.vline_seps(), vline); } - trace::exiting("scribo::filter::separators_in_element"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/filter/separators_in_paragraph.hh b/scribo/scribo/filter/separators_in_paragraph.hh index eae12e9..b920a15 100644 --- a/scribo/scribo/filter/separators_in_paragraph.hh +++ b/scribo/scribo/filter/separators_in_paragraph.hh @@ -74,7 +74,7 @@ namespace scribo separators_in_paragraph(document<L>& doc, unsigned hmin_size, unsigned vmin_size) { - trace::entering("scribo::filter::separators_in_paragraph"); + mln_trace("scribo::filter::separators_in_paragraph"); mln_precondition(doc.is_valid()); mln_precondition(doc.has_elements()); @@ -150,7 +150,6 @@ namespace scribo doc.set_vline_separators(doc.vline_seps(), vline); } - trace::exiting("scribo::filter::separators_in_paragraph"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/filter/separators_vert_in_borders.hh b/scribo/scribo/filter/separators_vert_in_borders.hh index 4f7c070..a20625c 100644 --- a/scribo/scribo/filter/separators_vert_in_borders.hh +++ b/scribo/scribo/filter/separators_vert_in_borders.hh @@ -83,7 +83,7 @@ namespace scribo void separators_vert_in_borders(document<L>& doc) { - trace::entering("scribo::filter::separators_vert_in_borders"); + mln_trace("scribo::filter::separators_vert_in_borders"); mln_precondition(doc.is_valid()); @@ -135,7 +135,6 @@ namespace scribo doc.set_vline_separators(doc.vline_seps(), vline); } - trace::exiting("scribo::filter::separators_vert_in_borders"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/io/img/save.hh b/scribo/scribo/io/img/save.hh index e44b136..07638ea 100644 --- a/scribo/scribo/io/img/save.hh +++ b/scribo/scribo/io/img/save.hh @@ -207,7 +207,7 @@ namespace scribo const std::string& output_name, Format format) { - trace::entering("scribo::io::img::save"); + mln_trace("scribo::io::img::save"); mln_precondition(doc.is_open()); @@ -239,13 +239,11 @@ namespace scribo default: trace::warning("scribo::io::img::save - " "Invalid image format! Skip saving..."); - trace::exiting("scribo::io::img::save"); return; } mln::io::magick::save(output, output_name.c_str()); - trace::exiting("scribo::io::img::save"); } diff --git a/scribo/scribo/io/text_boxes/save.hh b/scribo/scribo/io/text_boxes/save.hh index 1a7842f..cdf1f57 100644 --- a/scribo/scribo/io/text_boxes/save.hh +++ b/scribo/scribo/io/text_boxes/save.hh @@ -61,7 +61,7 @@ namespace scribo const std::string& output_name, const mln_site(L)& crop_shift) { - trace::entering("scribo::io::text_boxes:save"); + mln_trace("scribo::io::text_boxes:save"); mln_precondition(lines.is_valid()); std::ofstream file(output_name.c_str()); @@ -86,7 +86,6 @@ namespace scribo file.close(); - trace::exiting("scribo::io::text_boxes::save"); } diff --git a/scribo/scribo/io/xml/internal/save_image_to_xml.hh b/scribo/scribo/io/xml/internal/save_image_to_xml.hh index 3f38337..72aa7d8 100644 --- a/scribo/scribo/io/xml/internal/save_image_to_xml.hh +++ b/scribo/scribo/io/xml/internal/save_image_to_xml.hh @@ -67,7 +67,7 @@ namespace scribo save_image_to_xml(std::ostream& output, const Image& ima_, const char *qname) { - trace::entering("scribo::io::xml::internal::save_image"); + mln_trace("scribo::io::xml::internal::save_image"); mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); @@ -88,7 +88,6 @@ namespace scribo output << "]]></" << qname << ">" << std::endl; - trace::exiting("scribo::io::xml::internal::save_image"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index cc02c03..cfd0a31 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -128,7 +128,7 @@ namespace scribo const std::string& output_name, Format format) { - trace::entering("scribo::io::xml::save"); + mln_trace("scribo::io::xml::save"); mln_precondition(doc.is_open()); @@ -163,7 +163,6 @@ namespace scribo } output.close(); - trace::exiting("scribo::io::xml::save"); } diff --git a/scribo/scribo/layout/xy_cut.hh b/scribo/scribo/layout/xy_cut.hh index d6818e9..d3d5227 100644 --- a/scribo/scribo/layout/xy_cut.hh +++ b/scribo/scribo/layout/xy_cut.hh @@ -81,7 +81,7 @@ namespace scribo void compute_hist_info_h(const Image& input_, mln_ch_value(I,internal::hist_info)& hist) { - trace::entering("compute_hist_info_h"); + mln_trace("compute_hist_info_h"); const I& input = exact(input_); @@ -102,7 +102,6 @@ namespace scribo } } - trace::exiting("compute_hist_info_h"); } @@ -114,7 +113,7 @@ namespace scribo void compute_hist_info_v(const Image& input_, mln_ch_value(I,internal::hist_info)& hist) { - trace::entering("compute_hist_info_v"); + mln_trace("compute_hist_info_v"); const I& input = exact(input_); @@ -135,7 +134,6 @@ namespace scribo } } - trace::exiting("compute_hist_info_v"); } @@ -148,7 +146,7 @@ namespace scribo int& ws_min_row, int& ws_max_row) { - trace::entering("horizontal_whitespace"); + mln_trace("horizontal_whitespace"); typedef mln_value(H) V; mlc_is(V,internal::hist_info)::check(); @@ -188,7 +186,6 @@ namespace scribo } } - trace::exiting("horizontal_whitespace"); } @@ -200,7 +197,7 @@ namespace scribo int& ws_min_col, int& ws_max_col) { - trace::entering("vertical_whitespace"); + mln_trace("vertical_whitespace"); typedef mln_value(H) V; mlc_is(V,internal::hist_info)::check(); @@ -240,7 +237,6 @@ namespace scribo } } - trace::exiting("vertical_whitespace"); } @@ -253,7 +249,7 @@ namespace scribo const int min_height, const int min_width) { - trace::entering("do_xy_cut"); + mln_trace("do_xy_cut"); typedef mln_value(H) V; mlc_is(V,internal::hist_info)::check(); @@ -336,7 +332,6 @@ namespace scribo } } - trace::exiting("do_xy_cut"); } @@ -366,7 +361,7 @@ namespace scribo mln::util::array<mln_box(I)> xy_cut(const Image& ima_, int min_height, int min_width) { - trace::entering("scribo::layout::xy_cut"); + mln_trace("scribo::layout::xy_cut"); typedef mln_value(I) V; typedef mln_box(I) B; @@ -391,7 +386,6 @@ namespace scribo // Clear temporary data. delete n; - trace::exiting("scribo::layout::xy_cut"); return output; } diff --git a/scribo/scribo/make/influence_zone_graph.hh b/scribo/scribo/make/influence_zone_graph.hh index 9720814..d07f8a0 100644 --- a/scribo/scribo/make/influence_zone_graph.hh +++ b/scribo/scribo/make/influence_zone_graph.hh @@ -81,7 +81,7 @@ namespace scribo const V& label_type, unsigned iz_dmax) { - trace::entering("scribo::make::influence_zone_graph"); + mln_trace("scribo::make::influence_zone_graph"); (void) label_type; I& input = exact(input_); @@ -102,7 +102,6 @@ namespace scribo iz | (pw::value(iz) != pw::cst(literal::zero)), nbh, nlabels); - trace::exiting("scribo::make::influence_zone_graph"); return g; } diff --git a/scribo/scribo/make/text_blocks_image.hh b/scribo/scribo/make/text_blocks_image.hh index fbc16df..b9301d1 100644 --- a/scribo/scribo/make/text_blocks_image.hh +++ b/scribo/scribo/make/text_blocks_image.hh @@ -61,7 +61,7 @@ namespace scribo mln_ch_value(L,bool) text_blocks_image(const document<L>& doc, unsigned min_nlines) { - trace::entering("scribo::make::text_blocks_image"); + mln_trace("scribo::make::text_blocks_image"); mln_precondition(doc.is_open()); @@ -121,7 +121,6 @@ namespace scribo } - trace::exiting("scribo::make::text_blocks_image"); return output; } diff --git a/scribo/scribo/make/text_components_image.hh b/scribo/scribo/make/text_components_image.hh index fc0243c..bce169f 100644 --- a/scribo/scribo/make/text_components_image.hh +++ b/scribo/scribo/make/text_components_image.hh @@ -63,7 +63,7 @@ namespace scribo mln_ch_value(L,bool) text_components_image(const document<L>& doc) { - trace::entering("scribo::make::text_components_image"); + mln_trace("scribo::make::text_components_image"); mln_precondition(doc.is_open()); mln_precondition(doc.has_text()); @@ -90,7 +90,6 @@ namespace scribo } } - trace::exiting("scribo::make::text_components_image"); return output; } diff --git a/scribo/scribo/postprocessing/fill_object_holes.hh b/scribo/scribo/postprocessing/fill_object_holes.hh index 4bf8635..037874d 100644 --- a/scribo/scribo/postprocessing/fill_object_holes.hh +++ b/scribo/scribo/postprocessing/fill_object_holes.hh @@ -162,7 +162,7 @@ namespace scribo fill_object_holes(const object_groups<L>& groups, unsigned min_size) { - trace::entering("scribo::postprocessing::impl::generic::fill_object_holes"); + mln_trace("scribo::postprocessing::impl::generic::fill_object_holes"); // Grouping groups and relabel the underlying labeled image. // Groups are now considered as components. @@ -278,7 +278,6 @@ namespace scribo if (kept == components.nelements()) { - trace::exiting("scribo::postprocessing::impl::generic::fill_object_holes"); return groups.duplicate(); } @@ -288,7 +287,6 @@ namespace scribo output(c) = 0; - trace::exiting("scribo::postprocessing::impl::generic::fill_object_holes"); return output; } @@ -308,14 +306,13 @@ namespace scribo fill_object_holes(const object_groups<L>& groups, unsigned min_size) { - trace::entering("scribo::postprocessing::fill_object_holes"); + mln_trace("scribo::postprocessing::fill_object_holes"); mln_precondition(groups.is_valid()); object_groups<L> output = impl::generic::fill_object_holes(groups, min_size); - trace::exiting("scribo::postprocessing::fill_object_holes"); return output; } @@ -325,7 +322,7 @@ namespace scribo mln_concrete(I) fill_object_holes(const Image& input_, float ratio) { - trace::entering("scribo::postprocessing::fill_object_holes"); + mln_trace("scribo::postprocessing::fill_object_holes"); const I& input = exact(input_); @@ -396,7 +393,6 @@ namespace scribo data::fill((output | pw::value(hole_mask)).rw(), false); - trace::exiting("scribo::postprocessing::fill_object_holes"); return output; } diff --git a/scribo/scribo/postprocessing/images_to_drop_capital.hh b/scribo/scribo/postprocessing/images_to_drop_capital.hh index 727f23c..1a8751d 100644 --- a/scribo/scribo/postprocessing/images_to_drop_capital.hh +++ b/scribo/scribo/postprocessing/images_to_drop_capital.hh @@ -63,7 +63,7 @@ namespace scribo void images_to_drop_capital(document<L>& doc) { - trace::entering("scribo::postprocessing::images_to_drop_capital"); + mln_trace("scribo::postprocessing::images_to_drop_capital"); mln_precondition(doc.is_valid()); @@ -128,7 +128,6 @@ namespace scribo // Ignored components are still in the separator image... doc.set_elements(elts); - trace::exiting("scribo::postprocessing::images_to_drop_capital"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/preprocessing/crop.hh b/scribo/scribo/preprocessing/crop.hh index c289f86..54dd72c 100644 --- a/scribo/scribo/preprocessing/crop.hh +++ b/scribo/scribo/preprocessing/crop.hh @@ -64,13 +64,12 @@ namespace scribo mln_concrete(I) crop(const Image& input, const mln_box(I)& domain) { - trace::entering("scribo::preprocessing::crop"); + mln_trace("scribo::preprocessing::crop"); mln_assertion(exact(input).is_valid()); mln_concrete(I) output(domain); data::paste(input | domain, output); - trace::exiting("scribo::preprocessing::crop"); return output; } diff --git a/scribo/scribo/preprocessing/crop_without_localization.hh b/scribo/scribo/preprocessing/crop_without_localization.hh index 7346aee..78c258e 100644 --- a/scribo/scribo/preprocessing/crop_without_localization.hh +++ b/scribo/scribo/preprocessing/crop_without_localization.hh @@ -67,7 +67,7 @@ namespace scribo crop_without_localization(const Image& input, const mln_box(I)& domain) { - trace::entering("scribo::preprocessing::crop_without_localization"); + mln_trace("scribo::preprocessing::crop_without_localization"); mln_assertion(exact(input).is_valid()); @@ -85,7 +85,6 @@ namespace scribo data::paste_without_localization(input | domain, output); - trace::exiting("scribo::preprocessing::crop_without_localization"); return output; } diff --git a/scribo/scribo/preprocessing/denoise.hh b/scribo/scribo/preprocessing/denoise.hh index 115ac1d..e3f613c 100644 --- a/scribo/scribo/preprocessing/denoise.hh +++ b/scribo/scribo/preprocessing/denoise.hh @@ -82,7 +82,7 @@ namespace scribo denoise(const Image& input_, const Neighborhood<N>& nbh_, unsigned fg_min_card, unsigned bg_min_card) { - trace::entering("scribo::preprocessing::denoise"); + mln_trace("scribo::preprocessing::denoise"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -94,7 +94,6 @@ namespace scribo output = denoise_fg(input, nbh, fg_min_card); output = denoise_bg(output, nbh, bg_min_card); - trace::exiting("scribo::preprocessing::denoise"); return output; } diff --git a/scribo/scribo/preprocessing/denoise_bg.hh b/scribo/scribo/preprocessing/denoise_bg.hh index 1c02f8e..63dff9b 100644 --- a/scribo/scribo/preprocessing/denoise_bg.hh +++ b/scribo/scribo/preprocessing/denoise_bg.hh @@ -122,7 +122,7 @@ namespace scribo denoise_bg(const Image& input_, const Neighborhood<N>& nbh_, unsigned min_card) { - trace::entering("scribo::preprocessing::denoise_bg"); + mln_trace("scribo::preprocessing::denoise_bg"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -145,7 +145,6 @@ namespace scribo mln_concrete(I) output = data::transform(lbl, relabel_f); - trace::exiting("scribo::preprocessing::denoise_bg"); return output; } diff --git a/scribo/scribo/preprocessing/denoise_fg.hh b/scribo/scribo/preprocessing/denoise_fg.hh index 23b838e..0c1d549 100644 --- a/scribo/scribo/preprocessing/denoise_fg.hh +++ b/scribo/scribo/preprocessing/denoise_fg.hh @@ -83,7 +83,7 @@ namespace scribo denoise_fg(const Image& input_, const Neighborhood<N>& nbh_, unsigned min_card) { - trace::entering("scribo::preprocessing::denoise_fg"); + mln_trace("scribo::preprocessing::denoise_fg"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -106,7 +106,6 @@ namespace scribo mln_concrete(I) output = data::transform(lbl, relabel_f); - trace::exiting("scribo::preprocessing::denoise_fg"); return output; } diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index 12fd104..284bd0e 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -409,7 +409,7 @@ namespace scribo { const I& input_gl = exact(input_gl_); - trace::entering("scribo::preprocessing::deskew"); + mln_trace("scribo::preprocessing::deskew"); mln_assertion(input_gl.is_valid()); mlc_is(mln_domain(I), box2d)::check(); mlc_is_not(mln_value(I), bool)::check(); @@ -429,7 +429,6 @@ namespace scribo mln::make::box2d(input_gl.nrows(), input_gl.ncols())); - trace::exiting("scribo::preprocessing::deskew"); return output; } diff --git a/scribo/scribo/preprocessing/deskew_crop.hh b/scribo/scribo/preprocessing/deskew_crop.hh index 2f35932..e504370 100644 --- a/scribo/scribo/preprocessing/deskew_crop.hh +++ b/scribo/scribo/preprocessing/deskew_crop.hh @@ -150,7 +150,7 @@ namespace scribo const I& crop_gl = exact(crop_gl_); const I& input_gl = exact(input_gl_); - trace::entering("scribo::preprocessing::deskew_crop"); + mln_trace("scribo::preprocessing::deskew_crop"); mln_assertion(crop_gl.is_valid()); mln_assertion(input_gl.is_valid()); mlc_is(mln_domain(I), box2d)::check(); @@ -171,7 +171,6 @@ namespace scribo make::box2d(crop_gl.nrows(), crop_gl.ncols())); - trace::exiting("scribo::preprocessing::deskew_crop"); return output; } diff --git a/scribo/scribo/preprocessing/homogeneous_contrast.hh b/scribo/scribo/preprocessing/homogeneous_contrast.hh index b510ecd..73aea73 100644 --- a/scribo/scribo/preprocessing/homogeneous_contrast.hh +++ b/scribo/scribo/preprocessing/homogeneous_contrast.hh @@ -86,7 +86,7 @@ namespace scribo mln_concrete(I) homogeneous_contrast(const Image& input_, unsigned h) { - trace::entering("scribo::preprocessing::homogeneous_contrast"); + mln_trace("scribo::preprocessing::homogeneous_contrast"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -96,7 +96,6 @@ namespace scribo output = morpho::closing::leveling(input, c4(), acc, h); arith::minus_inplace(output, input); - trace::exiting("scribo::preprocessing::homogeneous_contrast"); return output; } diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index 4411439..af2958e 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -76,7 +76,7 @@ namespace scribo mln_concrete(I) rotate_90(const Image& input_, bool positive) { - trace::entering("scribo::preprocessing::rotate_90"); + mln_trace("scribo::preprocessing::rotate_90"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -147,7 +147,6 @@ namespace scribo out_ptr += out_next_offset; } - trace::exiting("scribo::preprocessing::rotate_90"); return output; } diff --git a/scribo/scribo/preprocessing/split_bg_fg.hh b/scribo/scribo/preprocessing/split_bg_fg.hh index b35d04c..4ae4005 100644 --- a/scribo/scribo/preprocessing/split_bg_fg.hh +++ b/scribo/scribo/preprocessing/split_bg_fg.hh @@ -113,7 +113,7 @@ namespace scribo image2d< value::int_u<n> >& g, image2d< value::int_u<n> >& b) { - trace::entering("scribo::preprocessing::internal::split"); + mln_trace("scribo::preprocessing::internal::split"); initialize(r, input); initialize(g, input); initialize(b, input); @@ -145,7 +145,6 @@ namespace scribo p_b.val() = c.blue(); } - trace::exiting("scribo::preprocessing::internal::split"); } @@ -155,7 +154,7 @@ namespace scribo const image2d< value::int_u<n> >& g, const image2d< value::int_u<n> >& b) { - trace::entering("scribo::preprocessing::internal::merge"); + mln_trace("scribo::preprocessing::internal::merge"); image2d< value::rgb<n> > output(r.domain()); // mln_piter(box2d) p(output.domain()); @@ -184,7 +183,6 @@ namespace scribo c.blue() = p_b.val(); } - trace::exiting("scribo::preprocessing::internal::merge"); return output; } @@ -245,7 +243,7 @@ namespace scribo background_analyze(const image2d<rgb8>& input, unsigned lambda, unsigned delta) { - trace::entering("scribo::preprocessing::internal::background_analyze"); + mln_trace("scribo::preprocessing::internal::background_analyze"); image2d<value::int_u8> r, g, b; split(input, r, g, b); @@ -298,7 +296,6 @@ namespace scribo data::fill((output | pw::value(mask)).rw(), data::transform(lab, m)); - trace::exiting("scribo::preprocessing::internal::toggle"); return output; } @@ -314,7 +311,7 @@ namespace scribo mln::util::couple<mln_concrete(I), mln_concrete(I)> split_bg_fg(const Image& input_, unsigned lambda, unsigned delta) { - trace::entering("scribo::preprocessing::split_bg_fg"); + mln_trace("scribo::preprocessing::split_bg_fg"); using namespace mln; @@ -328,7 +325,6 @@ namespace scribo bg = internal::background_analyze(input, lambda, delta); image2d<value::rgb8> fg = internal::inverted_diff_abs(input, bg); - trace::exiting("scribo::preprocessing::split_bg_fg"); return mln::make::couple(bg, fg); } diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 32285ea..4d8c9ad 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -570,7 +570,7 @@ namespace scribo alignments(const document<L>& doc, float dmax_ratio, unsigned delta_pixel) { - trace::entering("scribo::primitive::extract::alignments"); + mln_trace("scribo::primitive::extract::alignments"); mln_precondition(doc.is_valid()); mln_precondition(doc.has_text()); const mln_ch_value(L,bool)& input = doc.binary_image(); @@ -1118,7 +1118,6 @@ namespace scribo debug, "alignments_debug"); # endif // ! SCRIBO_NDEBUG - trace::exiting("scribo::primitive::extract::alignments"); return output; } diff --git a/scribo/scribo/primitive/extract/canvas.hh b/scribo/scribo/primitive/extract/canvas.hh index a2e9b4a..3dd6acd 100644 --- a/scribo/scribo/primitive/extract/canvas.hh +++ b/scribo/scribo/primitive/extract/canvas.hh @@ -87,7 +87,7 @@ namespace scribo const mln::util::array<box<mln_site(I)> >& vlines, unsigned max_dist_lines) { - trace::entering("scribo::primitive::canvas"); + mln_trace("scribo::primitive::canvas"); const I& input = exact(input_); mlc_equal(mln_value(I), bool)::check(); @@ -115,7 +115,6 @@ namespace scribo for_all_elements(i, lines.second()) mln::draw::box(res, lines.second()[i], true); - trace::exiting("scribo::primitive::canvas"); return res; } diff --git a/scribo/scribo/primitive/extract/cells.hh b/scribo/scribo/primitive/extract/cells.hh index 4ae3e49..beca189 100644 --- a/scribo/scribo/primitive/extract/cells.hh +++ b/scribo/scribo/primitive/extract/cells.hh @@ -86,7 +86,7 @@ namespace scribo cells(const Image& input_, const Neighborhood<N>& nbh_, const V& label_type) { - trace::entering("scribo::primitive::cells"); + mln_trace("scribo::primitive::cells"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -113,7 +113,6 @@ namespace scribo mln::util::array<box<mln_site(I)> > cellbboxes = labeling::compute(accu::meta::shape::bbox(), cells, ncells); - trace::exiting("scribo::primitive::cells"); return cellbboxes; } diff --git a/scribo/scribo/primitive/extract/components.hh b/scribo/scribo/primitive/extract/components.hh index cd69f99..ef55c09 100644 --- a/scribo/scribo/primitive/extract/components.hh +++ b/scribo/scribo/primitive/extract/components.hh @@ -99,7 +99,7 @@ namespace scribo const Neighborhood<N>& nbh, V& ncomponents, component::Type type) { - trace::entering("scribo::components"); + mln_trace("scribo::components"); mlc_equal(mln_value(J),bool)::check(); // mlc_is_a(V, mln::value::Symbolic)::check(); @@ -113,7 +113,6 @@ namespace scribo output = estim::components_features(input, binary_input, output); - trace::exiting("scribo::components"); return output; } @@ -125,7 +124,7 @@ namespace scribo const Neighborhood<N>& nbh, V& ncomponents, component::Type type) { - trace::entering("scribo::components"); + mln_trace("scribo::components"); mlc_equal(mln_value(I),bool)::check(); // mlc_is_a(V, mln::value::Symbolic)::check(); @@ -152,7 +151,6 @@ namespace scribo component_set<L> output(results.first(), ncomponents, results.second().second(), type); - trace::exiting("scribo::components"); return output; } diff --git a/scribo/scribo/primitive/extract/horizontal_separators.hh b/scribo/scribo/primitive/extract/horizontal_separators.hh index ff46419..725939b 100644 --- a/scribo/scribo/primitive/extract/horizontal_separators.hh +++ b/scribo/scribo/primitive/extract/horizontal_separators.hh @@ -73,7 +73,7 @@ namespace scribo mln_concrete(I) horizontal_separators(const Image& input_, unsigned line_length) { - trace::entering("scribo::primitive::extract::horizontal_separators"); + mln_trace("scribo::primitive::extract::horizontal_separators"); const I& input = exact(input_); mlc_is(mln_value(I), bool)::check(); @@ -82,7 +82,6 @@ namespace scribo mln_concrete(I) hlines = extract::lines_h_pattern(input, line_length, 3); - trace::exiting("scribo::primitive::extract::horizontal_separators"); return hlines; } diff --git a/scribo/scribo/primitive/extract/lines_discontinued.hh b/scribo/scribo/primitive/extract/lines_discontinued.hh index 8447cbd..7f536cf 100644 --- a/scribo/scribo/primitive/extract/lines_discontinued.hh +++ b/scribo/scribo/primitive/extract/lines_discontinued.hh @@ -124,7 +124,7 @@ namespace scribo const Neighborhood<N>& nbh_, V& nlines, const Window<W>& win_, unsigned rank_k) { - trace::entering("scribo::primitive::extract::lines_discontinued"); + mln_trace("scribo::primitive::extract::lines_discontinued"); internal::lines_discontinued_tests(input_, nbh_, nlines, win_, rank_k); @@ -143,7 +143,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = primitive::extract::components(filter, nbh, nlines); - trace::exiting("scribo::primitive::extract::lines_discontinued"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_discontinued.hh b/scribo/scribo/primitive/extract/lines_h_discontinued.hh index b54f184..1cb0eba 100644 --- a/scribo/scribo/primitive/extract/lines_h_discontinued.hh +++ b/scribo/scribo/primitive/extract/lines_h_discontinued.hh @@ -108,7 +108,7 @@ namespace scribo const Neighborhood<N>& nbh, V& nlines, unsigned line_length, unsigned rank_k) { - trace::entering("scribo::primitive::lines_h_discontinued"); + mln_trace("scribo::primitive::lines_h_discontinued"); internal::lines_h_discontinued_tests(input, nbh, nlines, line_length, rank_k); @@ -118,7 +118,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = lines_discontinued(input, nbh, nlines, win, rank_k); - trace::exiting("scribo::primitive::lines_h_discontinued"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_pattern.hh b/scribo/scribo/primitive/extract/lines_h_pattern.hh index c0cca37..5c26ff4 100644 --- a/scribo/scribo/primitive/extract/lines_h_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_h_pattern.hh @@ -91,7 +91,7 @@ namespace scribo mln_concrete(I) lines_h_pattern(const Image& input, unsigned length, unsigned delta) { - trace::entering("scribo::primitive::extract::lines_h_pattern"); + mln_trace("scribo::primitive::extract::lines_h_pattern"); mlc_is(mln_value(I), bool)::check(); mln_precondition(exact(input).is_valid()); @@ -116,7 +116,6 @@ namespace scribo output = scribo::primitive::internal::rd(output, input * output_dil); - trace::exiting("scribo::primitive::extract::lines_h_pattern"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh index 373c532..c3e5794 100644 --- a/scribo/scribo/primitive/extract/lines_h_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_single.hh @@ -150,7 +150,7 @@ namespace scribo unsigned min_line_length, float w_h_ratio) { - trace::entering("scribo::primitive::lines_h_single"); + mln_trace("scribo::primitive::lines_h_single"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -168,7 +168,6 @@ namespace scribo output.update_tags(is_line, component::Ignored); - trace::exiting("scribo::primitive::lines_h_single"); return output; } @@ -181,7 +180,7 @@ namespace scribo unsigned min_line_length, float w_h_ratio) { - trace::entering("scribo::primitive::lines_h_single"); + mln_trace("scribo::primitive::lines_h_single"); mln_precondition(components.is_valid()); @@ -191,7 +190,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(is_line, component::Ignored); - trace::exiting("scribo::primitive::lines_h_single"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_thick.hh b/scribo/scribo/primitive/extract/lines_h_thick.hh index 68bae43..8a542b2 100644 --- a/scribo/scribo/primitive/extract/lines_h_thick.hh +++ b/scribo/scribo/primitive/extract/lines_h_thick.hh @@ -107,7 +107,7 @@ namespace scribo const Neighborhood<N>& nbh, V& nlines, unsigned line_length) { - trace::entering("scribo::primitive::lines_h_thick"); + mln_trace("scribo::primitive::lines_h_thick"); internal::lines_h_thick_tests(input, nbh, nlines, line_length); @@ -117,7 +117,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = lines_thick(input, nbh, nlines, win); - trace::exiting("scribo::primitive::lines_h_thick"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/scribo/primitive/extract/lines_h_thick_and_single.hh index c7ed4bd..87d4134 100644 --- a/scribo/scribo/primitive/extract/lines_h_thick_and_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_thick_and_single.hh @@ -127,7 +127,7 @@ namespace scribo unsigned min_line_length, float h_w_ratio) { - trace::entering("scribo::primitive::lines_h_thick_and_single"); + mln_trace("scribo::primitive::lines_h_thick_and_single"); internal::lines_h_thick_and_single_tests(input, nbh, nlines, @@ -138,7 +138,6 @@ namespace scribo output = lines_h_single(output, min_line_length, h_w_ratio); - trace::exiting("scribo::primitive::lines_h_thick_and_single"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh index f68f47c..e774bee 100644 --- a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh +++ b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh @@ -476,7 +476,7 @@ namespace scribo float p_few, float p_enough, float ratio) { - trace::entering("scribo::primitive::extract::lines_h_thick_and_thin"); + mln_trace("scribo::primitive::extract::lines_h_thick_and_thin"); mlc_is(mln_value(I), bool)::check(); @@ -525,7 +525,6 @@ namespace scribo output, "lines_h_thick_and_thin_output"); - trace::exiting("scribo::primitive::extract::lines_h_thick_and_thin"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh index 9fd3462..80c6bf7 100644 --- a/scribo/scribo/primitive/extract/lines_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_pattern.hh @@ -91,7 +91,7 @@ namespace scribo lines_pattern(const Image& input_, unsigned length, unsigned dir, const Window<W>& win_) { - trace::entering("scribo::primitive::extract::impl::generic::lines_pattern"); + mln_trace("scribo::primitive::extract::impl::generic::lines_pattern"); const I& input = exact(input_); const W& win = exact(win_); @@ -137,7 +137,6 @@ namespace scribo output(p) = is_foreground; } - trace::exiting("scribo::primitive::extract::impl::generic::lines_pattern"); return output; } @@ -150,7 +149,7 @@ namespace scribo lines_pattern_fast(const Image& input_, unsigned length, unsigned dir, const Window<W>& win_) { - trace::entering("scribo::primitive::extract::impl::lines_pattern_fast"); + mln_trace("scribo::primitive::extract::impl::lines_pattern_fast"); const I& input = exact(input_); const W& win = exact(win_); @@ -212,7 +211,6 @@ namespace scribo } } - trace::exiting("scribo::primitive::extract::impl::lines_pattern_fast"); return output; } @@ -272,7 +270,7 @@ namespace scribo lines_pattern(const Image& input, unsigned length, unsigned dir, const Window<W>& win) { - trace::entering("scribo::primitive::extract::lines_pattern"); + mln_trace("scribo::primitive::extract::lines_pattern"); mlc_is(mln_value(I), bool)::check(); mln_precondition(exact(input).is_valid()); @@ -283,7 +281,6 @@ namespace scribo mln_concrete(I) output = internal::lines_pattern_dispatch(input, length, dir, win); - trace::exiting("scribo::primitive::extract::lines_pattern"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_thick.hh b/scribo/scribo/primitive/extract/lines_thick.hh index 530243f..a9611ec 100644 --- a/scribo/scribo/primitive/extract/lines_thick.hh +++ b/scribo/scribo/primitive/extract/lines_thick.hh @@ -111,7 +111,7 @@ namespace scribo const Neighborhood<N>& nbh_, V& nlines, const Window<W>& win_) { - trace::entering("scribo::primitive::lines_thick"); + mln_trace("scribo::primitive::lines_thick"); internal::lines_thick_tests(input_, nbh_, nlines, win_); @@ -123,7 +123,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = primitive::extract::components(filter, nbh, nlines); - trace::exiting("scribo::primitive::lines_thick"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_v_discontinued.hh b/scribo/scribo/primitive/extract/lines_v_discontinued.hh index f067251..2adda1c 100644 --- a/scribo/scribo/primitive/extract/lines_v_discontinued.hh +++ b/scribo/scribo/primitive/extract/lines_v_discontinued.hh @@ -106,7 +106,7 @@ namespace scribo const Neighborhood<N>& nbh, V& nlines, unsigned line_length, unsigned rank_k) { - trace::entering("scribo::primitive::lines_v_discontinued"); + mln_trace("scribo::primitive::lines_v_discontinued"); internal::lines_v_discontinued_tests(input, nbh, nlines, line_length, rank_k); @@ -116,7 +116,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = lines_discontinued(input, nbh, nlines, win, rank_k); - trace::exiting("scribo::primitive::lines_v_discontinued"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_v_pattern.hh b/scribo/scribo/primitive/extract/lines_v_pattern.hh index 2ad6611..3222c7d 100644 --- a/scribo/scribo/primitive/extract/lines_v_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_v_pattern.hh @@ -79,7 +79,7 @@ namespace scribo mln_concrete(I) lines_v_pattern(const Image& input, unsigned length, unsigned delta) { - trace::entering("scribo::primitive::extract::lines_v_pattern"); + mln_trace("scribo::primitive::extract::lines_v_pattern"); mln_precondition(length % 2 == 1); @@ -102,7 +102,6 @@ namespace scribo output = scribo::primitive::internal::rd(output, input * output_dil); - trace::exiting("scribo::primitive::extract::lines_v_pattern"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_v_single.hh b/scribo/scribo/primitive/extract/lines_v_single.hh index a559558..2d5d88a 100644 --- a/scribo/scribo/primitive/extract/lines_v_single.hh +++ b/scribo/scribo/primitive/extract/lines_v_single.hh @@ -147,7 +147,7 @@ namespace scribo unsigned min_line_length, float h_w_ratio) { - trace::entering("scribo::primitive::lines_v_single"); + mln_trace("scribo::primitive::lines_v_single"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -165,7 +165,6 @@ namespace scribo output.update_tags(is_line, component::Ignored); - trace::exiting("scribo::primitive::lines_v_single"); return output; } @@ -177,7 +176,7 @@ namespace scribo unsigned min_line_length, float h_w_ratio) { - trace::entering("scribo::primitive::lines_v_single"); + mln_trace("scribo::primitive::lines_v_single"); mln_precondition(components.is_valid()); @@ -187,7 +186,6 @@ namespace scribo component_set<L> output = components.duplicate(); output.update_tags(is_line, component::Ignored); - trace::exiting("scribo::primitive::lines_v_single"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_v_thick.hh b/scribo/scribo/primitive/extract/lines_v_thick.hh index 08ec328..1b4a901 100644 --- a/scribo/scribo/primitive/extract/lines_v_thick.hh +++ b/scribo/scribo/primitive/extract/lines_v_thick.hh @@ -106,7 +106,7 @@ namespace scribo const Neighborhood<N>& nbh, V& nlines, unsigned line_length) { - trace::entering("scribo::primitive::extract::lines_v_thick"); + mln_trace("scribo::primitive::extract::lines_v_thick"); internal::lines_v_thick_tests(input, nbh, nlines, line_length); @@ -116,7 +116,6 @@ namespace scribo component_set<mln_ch_value(I,V)> output = lines_thick(input, nbh, nlines, win); - trace::exiting("scribo::primitive::extract::lines_v_thick"); return output; } diff --git a/scribo/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/scribo/primitive/extract/lines_v_thick_and_single.hh index 855e4ac..ce6c406 100644 --- a/scribo/scribo/primitive/extract/lines_v_thick_and_single.hh +++ b/scribo/scribo/primitive/extract/lines_v_thick_and_single.hh @@ -125,7 +125,7 @@ namespace scribo unsigned min_line_length, float h_w_ratio) { - trace::entering("scribo::primitive::lines_v_thick_and_single"); + mln_trace("scribo::primitive::lines_v_thick_and_single"); internal::lines_v_thick_and_single_tests(input, nbh, nlines, @@ -136,7 +136,6 @@ namespace scribo output = lines_v_single(output, min_line_length, h_w_ratio); - trace::exiting("scribo::primitive::lines_v_thick_and_single"); return output; } diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index 2e19bc0..fe81a46 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -303,7 +303,7 @@ namespace scribo component_set<L> non_text(const document<L>& doc, unsigned nlines) { - trace::entering("scribo::primitive::extract::non_text"); + mln_trace("scribo::primitive::extract::non_text"); mln::util::timer t; @@ -353,7 +353,6 @@ namespace scribo "non_text_components"); } - trace::exiting("scribo::primitive::extract::non_text"); return elements; } diff --git a/scribo/scribo/primitive/extract/non_text_hdoc.hh b/scribo/scribo/primitive/extract/non_text_hdoc.hh index b851bde..e506b4b 100644 --- a/scribo/scribo/primitive/extract/non_text_hdoc.hh +++ b/scribo/scribo/primitive/extract/non_text_hdoc.hh @@ -90,7 +90,7 @@ namespace scribo component_set<L> non_text_hdoc(const document<L>& doc, unsigned closing_size) { - trace::entering("scribo::primitive::extract::non_text_hdoc"); + mln_trace("scribo::primitive::extract::non_text_hdoc"); mln_precondition(doc.is_valid()); mln_precondition(doc.has_text()); @@ -143,7 +143,6 @@ namespace scribo "non_text_hdoc_components"); } - trace::exiting("scribo::primitive::extract::non_text_hdoc"); return elements; } diff --git a/scribo/scribo/primitive/extract/non_text_kmean.hh b/scribo/scribo/primitive/extract/non_text_kmean.hh index c76ce11..716e772 100644 --- a/scribo/scribo/primitive/extract/non_text_kmean.hh +++ b/scribo/scribo/primitive/extract/non_text_kmean.hh @@ -109,7 +109,7 @@ namespace scribo component_set<L> non_text_kmean(const document<L>& doc, const Image& input_) { - trace::entering("scribo::primitive::extract::non_text_kmean"); + mln_trace("scribo::primitive::extract::non_text_kmean"); const I& input = exact(input_); mln_precondition(doc.is_valid()); @@ -208,7 +208,6 @@ namespace scribo } } - trace::exiting("scribo::primitive::extract::non_text_kmean"); return output; } diff --git a/scribo/scribo/primitive/extract/separators.hh b/scribo/scribo/primitive/extract/separators.hh index 3b3fb94..a1196dc 100644 --- a/scribo/scribo/primitive/extract/separators.hh +++ b/scribo/scribo/primitive/extract/separators.hh @@ -74,7 +74,7 @@ namespace scribo mln_concrete(I) separators(const Image& input_, unsigned line_length) { - trace::entering("scribo::primitive::extract::separators"); + mln_trace("scribo::primitive::extract::separators"); const I& input = exact(input_); mlc_is(mln_value(I), bool)::check(); @@ -91,7 +91,6 @@ namespace scribo border::resize(hlines, border::thickness); border::resize(input, border::thickness); - trace::exiting("scribo::primitive::extract::separators"); return hlines; } diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 1c9407f..85fc191 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -111,7 +111,7 @@ namespace scribo mln_concrete(I) separators_nonvisible(const Image& in_) { - trace::entering("scribo::primitive::extract::separators_nonvisible"); + mln_trace("scribo::primitive::extract::separators_nonvisible"); const I& in = exact(in_); mln_precondition(in.is_valid()); @@ -473,7 +473,6 @@ namespace scribo // t_ = gt; // std::cout << "Non visible separators: " << t_ << std::endl; - trace::exiting("scribo::primitive::extract::separators_nonvisible"); return scribo::preprocessing::rotate_90(output, true); } } diff --git a/scribo/scribo/primitive/extract/vertical_separators.hh b/scribo/scribo/primitive/extract/vertical_separators.hh index 8936881..f6d8c5b 100644 --- a/scribo/scribo/primitive/extract/vertical_separators.hh +++ b/scribo/scribo/primitive/extract/vertical_separators.hh @@ -73,7 +73,7 @@ namespace scribo mln_concrete(I) vertical_separators(const Image& input_, unsigned line_length) { - trace::entering("scribo::primitive::extract::vertical_separators"); + mln_trace("scribo::primitive::extract::vertical_separators"); const I& input = exact(input_); mlc_is(mln_value(I), bool)::check(); @@ -82,7 +82,6 @@ namespace scribo mln_concrete(I) vlines = extract::lines_v_pattern(input, line_length, 3); - trace::exiting("scribo::primitive::extract::vertical_separators"); return vlines; } diff --git a/scribo/scribo/primitive/group/apply.hh b/scribo/scribo/primitive/group/apply.hh index 4e27cd5..5c33c60 100644 --- a/scribo/scribo/primitive/group/apply.hh +++ b/scribo/scribo/primitive/group/apply.hh @@ -78,7 +78,7 @@ namespace scribo mln::fun::i2v::array<mln_value(L)>& relabel_fun) { - trace::entering("scribo::primitive::group::apply"); + mln_trace("scribo::primitive::group::apply"); mln_precondition(groups.is_valid()); @@ -104,7 +104,6 @@ namespace scribo component_set<L> output(labeled_image, new_nlabels); - trace::exiting("scribo::primitive::group::apply"); return output; } @@ -123,14 +122,13 @@ namespace scribo apply(const object_links<L>& links) { - trace::entering("scribo::primitive::group::apply"); + mln_trace("scribo::primitive::group::apply"); mln_precondition(links.is_valid()); object_groups<L> group = group::from_single_link(links); component_set<L> output = apply(group); - trace::exiting("scribo::primitive::group::apply"); return output; } diff --git a/scribo/scribo/primitive/group/from_double_link.hh b/scribo/scribo/primitive/group/from_double_link.hh index a4d97de..688834a 100644 --- a/scribo/scribo/primitive/group/from_double_link.hh +++ b/scribo/scribo/primitive/group/from_double_link.hh @@ -83,7 +83,7 @@ namespace scribo from_double_link(const object_links<L>& left_link, const object_links<L>& right_link) { - trace::entering("scribo::primitive::group::from_double_link"); + mln_trace("scribo::primitive::group::from_double_link"); mln_precondition(left_link.nelements() == right_link.nelements()); @@ -102,7 +102,6 @@ namespace scribo object_groups<L> result = from_single_link(parent); - trace::exiting("scribo::primitive::group::from_double_link"); return result; } diff --git a/scribo/scribo/primitive/group/from_double_link_any.hh b/scribo/scribo/primitive/group/from_double_link_any.hh index 9e315a3..86a8f38 100644 --- a/scribo/scribo/primitive/group/from_double_link_any.hh +++ b/scribo/scribo/primitive/group/from_double_link_any.hh @@ -97,7 +97,7 @@ namespace scribo from_double_link_any(const object_links<L>& left_link, const object_links<L>& right_link) { - trace::entering("scribo::primitive::group::from_double_link_any"); + mln_trace("scribo::primitive::group::from_double_link_any"); object_links<L> merged_link(left_link.components()); merged_link.init(); @@ -138,7 +138,6 @@ namespace scribo object_groups<L> output(merged_link); - trace::exiting("scribo::primitive::group::from_double_link_any"); return output; } diff --git a/scribo/scribo/primitive/group/from_graph.hh b/scribo/scribo/primitive/group/from_graph.hh index 37a5718..7282f1a 100644 --- a/scribo/scribo/primitive/group/from_graph.hh +++ b/scribo/scribo/primitive/group/from_graph.hh @@ -152,7 +152,7 @@ namespace scribo from_graph(const component_set<L>& comps, const Graph<G>& g_) { - trace::entering("scribo::primitive::group::from_graph"); + mln_trace("scribo::primitive::group::from_graph"); const G& g = exact(g_); @@ -164,7 +164,6 @@ namespace scribo object_groups<L> groups(comps); groups.init_(f.vertextorep); - trace::exiting("scribo::primitive::group::from_graph"); return groups; } diff --git a/scribo/scribo/primitive/group/from_single_link.hh b/scribo/scribo/primitive/group/from_single_link.hh index 0a2cca3..802b3c0 100644 --- a/scribo/scribo/primitive/group/from_single_link.hh +++ b/scribo/scribo/primitive/group/from_single_link.hh @@ -77,13 +77,12 @@ namespace scribo object_groups<L> from_single_link(const object_links<L>& links) { - trace::entering("scribo::primitive::group::from_single_link"); + mln_trace("scribo::primitive::group::from_single_link"); mln_precondition(links.is_valid()); object_groups<L> parent(links); - trace::exiting("scribo::primitive::group::from_single_link"); return parent; } diff --git a/scribo/scribo/primitive/identify.hh b/scribo/scribo/primitive/identify.hh index f4e115b..59678b1 100644 --- a/scribo/scribo/primitive/identify.hh +++ b/scribo/scribo/primitive/identify.hh @@ -45,7 +45,7 @@ namespace scribo component_set<L> identify(const component_set<L> comps) { - mln::trace::entering("scribo::primitive::identify"); + mln::mln_trace("scribo::primitive::identify"); mln_assertion(comps.is_valid()); @@ -65,7 +65,6 @@ namespace scribo // output(c).update_type(component::LineSeparator); // } - mln::trace::exiting("scribo::primitive::identify"); //return output; return comps; } diff --git a/scribo/scribo/primitive/internal/find_graph_link.hh b/scribo/scribo/primitive/internal/find_graph_link.hh index 7176153..ddb6b4d 100644 --- a/scribo/scribo/primitive/internal/find_graph_link.hh +++ b/scribo/scribo/primitive/internal/find_graph_link.hh @@ -82,7 +82,7 @@ namespace scribo int dmax, const mln_site(L)& c) { - trace::entering("scribo::primitive::internal::find_graph_link"); + mln_trace("scribo::primitive::internal::find_graph_link"); G& g = exact(g_); mln_precondition(g.is_valid()); @@ -100,7 +100,6 @@ namespace scribo update_graph_link(comps, g, p, c, current_comp, dmax); - trace::exiting("scribo::primitive::internal::find_graph_link"); } # endif // MLN_INCLUDE_ONLY diff --git a/scribo/scribo/primitive/internal/rd.hh b/scribo/scribo/primitive/internal/rd.hh index 56d6adc..d6f5a22 100644 --- a/scribo/scribo/primitive/internal/rd.hh +++ b/scribo/scribo/primitive/internal/rd.hh @@ -75,7 +75,7 @@ namespace scribo mln_concrete(I) Rd(const Image& f_, const Image<J>& g_, const Neighborhood<N>& nbh_) { - trace::entering("Rd"); + mln_trace("Rd"); const I& f = exact(f_); const J& g = exact(g_); @@ -150,7 +150,6 @@ namespace scribo } } - trace::exiting("Rd"); return output; } @@ -161,7 +160,7 @@ namespace scribo mln_concrete(I) rd(const Image& ima, const Image<J>& constraint) { - trace::entering("scribo::primitive::internal::rd"); + mln_trace("scribo::primitive::internal::rd"); mln_precondition(exact(ima).is_valid()); mln_precondition(exact(constraint).is_valid()); @@ -173,7 +172,6 @@ namespace scribo mln_concrete(I) output = Rd(ima, constraint, nbh); - trace::exiting("scribo::primitive::internal::rd"); return output; } diff --git a/scribo/scribo/primitive/internal/update_graph_link.hh b/scribo/scribo/primitive/internal/update_graph_link.hh index 54e06de..21b2ffa 100644 --- a/scribo/scribo/primitive/internal/update_graph_link.hh +++ b/scribo/scribo/primitive/internal/update_graph_link.hh @@ -73,7 +73,7 @@ namespace scribo const mln_site(I)& p, const mln_site(I)& c, unsigned i, int dmax) { - trace::entering("scribo::primitive::internal::update_graph_link"); + mln_trace("scribo::primitive::internal::update_graph_link"); const I& lbl = exact(lbl_); G& g = exact(g_); @@ -86,7 +86,6 @@ namespace scribo && (math::abs(p.col() - c.col())) < dmax) g.add_edge(lbl(p), i); - trace::exiting("scribo::primitive::internal::update_graph_link"); } diff --git a/scribo/scribo/primitive/link/compute.hh b/scribo/scribo/primitive/link/compute.hh index 8c64171..7e796b5 100644 --- a/scribo/scribo/primitive/link/compute.hh +++ b/scribo/scribo/primitive/link/compute.hh @@ -98,7 +98,7 @@ namespace scribo object_links<scribo_support(F)> compute(Link_Functor<F>& functor_, anchor::Type anchor) { - trace::entering("scribo::primitive::link::compute"); + mln_trace("scribo::primitive::link::compute"); F& functor = exact(functor_); const typename F::component_set_t& @@ -111,7 +111,6 @@ namespace scribo primitive::internal::find_link(functor, current_object, anchor); } - trace::exiting("scribo::primitive::link::compute"); return functor.links(); } diff --git a/scribo/scribo/primitive/link/compute_several.hh b/scribo/scribo/primitive/link/compute_several.hh index 551b16c..ba732cf 100644 --- a/scribo/scribo/primitive/link/compute_several.hh +++ b/scribo/scribo/primitive/link/compute_several.hh @@ -91,7 +91,7 @@ namespace scribo object_links<scribo_support(F)> compute_several(Link_Functor<F>& functor_) { - trace::entering("scribo::primitive::link::compute_several"); + mln_trace("scribo::primitive::link::compute_several"); F& functor = exact(functor_); @@ -101,7 +101,6 @@ namespace scribo internal::find_several_links(functor, current_object); } - trace::exiting("scribo::primitive::link::compute_several"); return functor.links(); } diff --git a/scribo/scribo/primitive/link/merge_double_link.hh b/scribo/scribo/primitive/link/merge_double_link.hh index 2416a77..be523a8 100644 --- a/scribo/scribo/primitive/link/merge_double_link.hh +++ b/scribo/scribo/primitive/link/merge_double_link.hh @@ -85,7 +85,7 @@ namespace scribo merge_double_link(const object_links<L>& left_link, const object_links<L>& right_link) { - trace::entering("scribo::primitive::link::merge_double_link"); + mln_trace("scribo::primitive::link::merge_double_link"); mln_precondition(left_link.is_valid()); mln_precondition(right_link.is_valid()); @@ -110,7 +110,6 @@ namespace scribo } } - trace::exiting("scribo::primitive::link::merge_double_link"); return merge; } diff --git a/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh b/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh index a6143c8..e3221c1 100644 --- a/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh +++ b/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh @@ -70,7 +70,7 @@ namespace scribo const object_links<L>& right, anchor::Type anchor_angle) { - trace::entering("scribo::primitive::link::merge_double_link_closest_aligned"); + mln_trace("scribo::primitive::link::merge_double_link_closest_aligned"); mln_precondition(left.is_valid()); mln_precondition(right.is_valid()); @@ -142,7 +142,6 @@ namespace scribo } } - trace::exiting("scribo::primitive::link::merge_double_link_closest_aligned"); return output; } diff --git a/scribo/scribo/primitive/link/with_graph.hh b/scribo/scribo/primitive/link/with_graph.hh index efe4721..f49f7db 100644 --- a/scribo/scribo/primitive/link/with_graph.hh +++ b/scribo/scribo/primitive/link/with_graph.hh @@ -84,7 +84,7 @@ namespace scribo with_graph(const component_set<L>& comps, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_graph"); + mln_trace("scribo::primitive::link::with_graph"); mln::util::graph g(comps.nelements().next()); @@ -103,7 +103,6 @@ namespace scribo comps(i).mass_center()); } - trace::exiting("scribo::primitive::link::with_graph"); return g; } diff --git a/scribo/scribo/primitive/link/with_rag.hh b/scribo/scribo/primitive/link/with_rag.hh index e66d87e..c24f2b6 100644 --- a/scribo/scribo/primitive/link/with_rag.hh +++ b/scribo/scribo/primitive/link/with_rag.hh @@ -74,7 +74,7 @@ namespace scribo with_rag(const component_set<L>& comps, const Neighborhood<N>& nbh) { - trace::entering("scribo::primitive::link::with_rag"); + mln_trace("scribo::primitive::link::with_rag"); mln_precondition(comps.is_valid()); @@ -87,7 +87,6 @@ namespace scribo nbh, comps.nelements()); - trace::exiting("scribo::primitive::link::with_rag"); return make::couple(g, iz); } diff --git a/scribo/scribo/primitive/link/with_several_graphes.hh b/scribo/scribo/primitive/link/with_several_graphes.hh index acfccbc..ce31a8a 100644 --- a/scribo/scribo/primitive/link/with_several_graphes.hh +++ b/scribo/scribo/primitive/link/with_several_graphes.hh @@ -70,7 +70,7 @@ namespace scribo with_several_graphes(const component_set<L>& comps, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_several_graphes"); + mln_trace("scribo::primitive::link::with_several_graphes"); mln::util::graph g(comps.nelements().next()); @@ -112,7 +112,6 @@ namespace scribo } - trace::exiting("scribo::primitive::link::with_several_graphes"); return g; } diff --git a/scribo/scribo/primitive/link/with_several_left_links.hh b/scribo/scribo/primitive/link/with_several_left_links.hh index e9b53d2..e7f8029 100644 --- a/scribo/scribo/primitive/link/with_several_left_links.hh +++ b/scribo/scribo/primitive/link/with_several_left_links.hh @@ -79,7 +79,7 @@ namespace scribo with_several_left_links(const component_set<L>& comps, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_several_left_links"); + mln_trace("scribo::primitive::link::with_several_left_links"); // ------- // <------X | @@ -117,7 +117,6 @@ namespace scribo - trace::exiting("scribo::primitive::link::with_several_left_links"); return final_link; } diff --git a/scribo/scribo/primitive/link/with_several_right_closest_links.hh b/scribo/scribo/primitive/link/with_several_right_closest_links.hh index da1e75b..a321aff 100644 --- a/scribo/scribo/primitive/link/with_several_right_closest_links.hh +++ b/scribo/scribo/primitive/link/with_several_right_closest_links.hh @@ -119,7 +119,7 @@ namespace scribo with_several_right_closest_links(const component_set<L>& comps, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_several_right_closest_links"); + mln_trace("scribo::primitive::link::with_several_right_closest_links"); extension::fill(comps.labeled_image_(), 0); @@ -182,7 +182,6 @@ namespace scribo final_link[i] = i; } - trace::exiting("scribo::primitive::link::with_several_right_closest_links"); return final_link; } diff --git a/scribo/scribo/primitive/link/with_several_right_links.hh b/scribo/scribo/primitive/link/with_several_right_links.hh index 6590309..b48753f 100644 --- a/scribo/scribo/primitive/link/with_several_right_links.hh +++ b/scribo/scribo/primitive/link/with_several_right_links.hh @@ -82,7 +82,7 @@ namespace scribo with_several_right_links(const component_set<L>& comps, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_several_right_links"); + mln_trace("scribo::primitive::link::with_several_right_links"); // ------- // | X-------> @@ -118,7 +118,6 @@ namespace scribo final_link.clear(i); } - trace::exiting("scribo::primitive::link::with_several_right_links"); return final_link; } diff --git a/scribo/scribo/primitive/link/with_several_right_links_overlap.hh b/scribo/scribo/primitive/link/with_several_right_links_overlap.hh index f9fd5a4..87a2d6e 100644 --- a/scribo/scribo/primitive/link/with_several_right_links_overlap.hh +++ b/scribo/scribo/primitive/link/with_several_right_links_overlap.hh @@ -119,7 +119,7 @@ namespace scribo with_several_right_links_overlap(const object_image(L)& objects, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_several_right_links_overlap"); + mln_trace("scribo::primitive::link::with_several_right_links_overlap"); mln_precondition(objects.is_valid()); @@ -129,7 +129,6 @@ namespace scribo for_all_ncomponents(current_object, objects.nlabels()) internal::find_several_links(functor, current_object); - trace::exiting("scribo::primitive::link::with_several_right_links_overlap"); return functor.links(); } diff --git a/scribo/scribo/primitive/link/with_single_down_link.hh b/scribo/scribo/primitive/link/with_single_down_link.hh index 01c6f7e..a0b5406 100644 --- a/scribo/scribo/primitive/link/with_single_down_link.hh +++ b/scribo/scribo/primitive/link/with_single_down_link.hh @@ -138,14 +138,13 @@ namespace scribo unsigned neighb_max_distance, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_down_link"); + mln_trace("scribo::primitive::link::with_single_down_link"); internal::single_down_functor<L> functor(comps, neighb_max_distance); object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_down_link"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_left_link.hh b/scribo/scribo/primitive/link/with_single_left_link.hh index c4b080f..89b77d3 100644 --- a/scribo/scribo/primitive/link/with_single_left_link.hh +++ b/scribo/scribo/primitive/link/with_single_left_link.hh @@ -128,7 +128,7 @@ namespace scribo with_single_left_link(const component_set<L>& components, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_single_left_link"); + mln_trace("scribo::primitive::link::with_single_left_link"); mln_precondition(components.is_valid()); @@ -137,7 +137,6 @@ namespace scribo object_links<L> output = compute(functor); - trace::exiting("scribo::primitive::link::with_single_left_link"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh index b9a5217..fa88549 100644 --- a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh +++ b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh @@ -160,7 +160,7 @@ namespace scribo const DMax_Functor<F>& dmax_f, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_left_link_dmax_ratio"); + mln_trace("scribo::primitive::link::with_single_left_link_dmax_ratio"); mln_precondition(components.is_valid()); @@ -169,7 +169,6 @@ namespace scribo object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_left_link_dmax_ratio"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh index 9fdae67..f4e802e 100644 --- a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh +++ b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh @@ -169,7 +169,7 @@ namespace scribo float min_angle, float max_angle, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_left_link_dmax_ratio_aligned"); + mln_trace("scribo::primitive::link::with_single_left_link_dmax_ratio_aligned"); mln_precondition(components.is_valid()); @@ -178,7 +178,6 @@ namespace scribo object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_left_link_dmax_ratio_aligned"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_right_link.hh b/scribo/scribo/primitive/link/with_single_right_link.hh index d2d24e3..8af35ba 100644 --- a/scribo/scribo/primitive/link/with_single_right_link.hh +++ b/scribo/scribo/primitive/link/with_single_right_link.hh @@ -132,7 +132,7 @@ namespace scribo unsigned neighb_max_distance, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_right_link"); + mln_trace("scribo::primitive::link::with_single_right_link"); mln_precondition(components.is_valid()); @@ -141,7 +141,6 @@ namespace scribo object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_right_link"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_right_link_bottom.hh b/scribo/scribo/primitive/link/with_single_right_link_bottom.hh index 9b76919..836ea97 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_bottom.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_bottom.hh @@ -130,7 +130,7 @@ namespace scribo with_single_right_link_bottom(const component_set<L>& components, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_single_right_link_bottom"); + mln_trace("scribo::primitive::link::with_single_right_link_bottom"); mln_precondition(components.is_valid()); @@ -139,7 +139,6 @@ namespace scribo object_links<L> output = compute(functor, anchor::Bottom); - trace::exiting("scribo::primitive::link::with_single_right_link_bottom"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh index 03e2840..a8970b9 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh @@ -155,7 +155,7 @@ namespace scribo const DMax_Functor<F>& dmax_f, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio"); + mln_trace("scribo::primitive::link::with_single_right_link_dmax_ratio"); mln_precondition(components.is_valid()); @@ -164,7 +164,6 @@ namespace scribo object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh index f7ed41e..84e0d91 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh @@ -167,7 +167,7 @@ namespace scribo float min_angle, float max_angle, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); + mln_trace("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); mln_precondition(components.is_valid()); @@ -176,7 +176,6 @@ namespace scribo object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_right_link_top.hh b/scribo/scribo/primitive/link/with_single_right_link_top.hh index c8008fc..46fbeee 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_top.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_top.hh @@ -131,7 +131,7 @@ namespace scribo with_single_right_link_top(const component_set<L>& components, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::link::with_single_right_link_top"); + mln_trace("scribo::primitive::link::with_single_right_link_top"); mln_precondition(components.is_valid()); @@ -140,7 +140,6 @@ namespace scribo object_links<L> output = compute(functor, anchor::Top); - trace::exiting("scribo::primitive::link::with_single_right_link_top"); return output; } diff --git a/scribo/scribo/primitive/link/with_single_up_link.hh b/scribo/scribo/primitive/link/with_single_up_link.hh index eccf1fb..e544e7e 100644 --- a/scribo/scribo/primitive/link/with_single_up_link.hh +++ b/scribo/scribo/primitive/link/with_single_up_link.hh @@ -139,14 +139,13 @@ namespace scribo unsigned neighb_max_distance, anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_up_link"); + mln_trace("scribo::primitive::link::with_single_up_link"); internal::single_up_functor<L> functor(comps, neighb_max_distance); object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_up_link"); return output; } diff --git a/scribo/scribo/primitive/merge/components.hh b/scribo/scribo/primitive/merge/components.hh index 72f3e9d..e0bed44 100644 --- a/scribo/scribo/primitive/merge/components.hh +++ b/scribo/scribo/primitive/merge/components.hh @@ -87,7 +87,7 @@ namespace scribo component_set<L> components(const component_set<L>& lhs, const component_set<L>& rhs) { - trace::entering("scribo::primitive::merge::components"); + mln_trace("scribo::primitive::merge::components"); const L& lhs_lbl = lhs.labeled_image(); const L& rhs_lbl = rhs.labeled_image(); @@ -110,7 +110,6 @@ namespace scribo component_set<L> output(lbl_merge, nlabels); - trace::exiting("scribo::primitive::merge::components"); return output; } diff --git a/scribo/scribo/primitive/regroup/from_single_left_link.hh b/scribo/scribo/primitive/regroup/from_single_left_link.hh index c5aea3c..a333ea2 100644 --- a/scribo/scribo/primitive/regroup/from_single_left_link.hh +++ b/scribo/scribo/primitive/regroup/from_single_left_link.hh @@ -99,7 +99,7 @@ namespace scribo from_single_left_link(const object_groups<L>& groups, unsigned neighb_max_distance) { - trace::entering("scribo::primitive::regroup::from_single_left_link"); + mln_trace("scribo::primitive::regroup::from_single_left_link"); mln_precondition(groups.is_valid()); @@ -124,7 +124,6 @@ namespace scribo output(relabel_fun(new_groups(g).component_ids()(0))) .merge(output(relabel_fun(new_groups(g).component_ids()(i)))); - trace::exiting("scribo::primitive::regroup::from_single_left_link"); return output; } diff --git a/scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh b/scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh index 83c1cd4..165d8ef 100644 --- a/scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh +++ b/scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh @@ -103,7 +103,7 @@ namespace scribo unsigned neighb_max_distance, double hratio) { - trace::entering("scribo::primitive::regroup::from_single_left_link_wrt_h_ratio"); + mln_trace("scribo::primitive::regroup::from_single_left_link_wrt_h_ratio"); mln_precondition(groups.is_valid()); @@ -132,7 +132,6 @@ namespace scribo output(relabel_fun(new_groups(g).component_ids()(0))) .merge(output(relabel_fun(new_groups(g).component_ids()(i)))); - trace::exiting("scribo::primitive::regroup::from_single_left_link_wrt_h_ratio"); return output; } diff --git a/scribo/scribo/primitive/remove/separators.hh b/scribo/scribo/primitive/remove/separators.hh index 192867f..9c2e82d 100644 --- a/scribo/scribo/primitive/remove/separators.hh +++ b/scribo/scribo/primitive/remove/separators.hh @@ -78,7 +78,7 @@ namespace scribo mln_concrete(I) separators(const Image& input_, const Image& separators_) { - trace::entering("scribo::primitive::remove::separators"); + mln_trace("scribo::primitive::remove::separators"); const I& input = exact(input_); const I& separators = exact(separators_); @@ -102,7 +102,6 @@ namespace scribo if (*sep_ptr++) *out_ptr = false; - trace::exiting("scribo::primitive::remove::separators"); return output; } diff --git a/scribo/scribo/subsampling/bilinear.hh b/scribo/scribo/subsampling/bilinear.hh index 67ff008..aba09c8 100644 --- a/scribo/scribo/subsampling/bilinear.hh +++ b/scribo/scribo/subsampling/bilinear.hh @@ -64,7 +64,7 @@ namespace scribo mln_concrete(I) bilinear(const Image& input_, int sub_ratio) { - trace::entering("scribo::subsampling::bilinear"); + mln_trace("scribo::subsampling::bilinear"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -108,7 +108,6 @@ namespace scribo } - trace::exiting("scribo::subsampling::bilinear"); return output; } diff --git a/scribo/scribo/subsampling/integral.hh b/scribo/scribo/subsampling/integral.hh index 8cb627b..d8a2e41 100644 --- a/scribo/scribo/subsampling/integral.hh +++ b/scribo/scribo/subsampling/integral.hh @@ -101,7 +101,7 @@ namespace scribo const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::impl::integral_3"); + mln_trace("subsampling::impl::integral_3"); const unsigned scale = 3, @@ -209,7 +209,6 @@ namespace scribo p_isum_2 += b_next; } - trace::exiting("subsampling::impl::integral_3"); return sub; } @@ -222,7 +221,7 @@ namespace scribo const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::impl::integral_2"); + mln_trace("subsampling::impl::integral_2"); const unsigned scale = 2, @@ -328,7 +327,6 @@ namespace scribo p_isum_2 += b_next; } - trace::exiting("subsampling::impl::integral_2"); return sub; } @@ -370,7 +368,7 @@ namespace scribo Image<J>& integral_sum, Image<J>& integral_sum_2, const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::integral"); + mln_trace("subsampling::integral"); const I& input = exact(input_); @@ -382,7 +380,6 @@ namespace scribo output = impl::integral(input, scale, integral_sum, integral_sum_2, output_domain, border_thickness); - trace::exiting("subsampling::integral"); return output; } @@ -392,7 +389,7 @@ namespace scribo integral(const Image& input_, unsigned scale, Image<J>& integral_sum, Image<J>& integral_sum_2) { - trace::entering("subsampling::integral"); + mln_trace("subsampling::integral"); const I& input = exact(input_); @@ -406,7 +403,6 @@ namespace scribo output = integral(input_, scale, integral_sum, integral_sum_2, b, mln::border::thickness); - trace::exiting("subsampling::integral"); return output; } diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index f1c9c18..df158d7 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -100,7 +100,7 @@ namespace scribo const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::impl::integral_3"); + mln_trace("subsampling::impl::integral_3"); const unsigned scale = 3; @@ -205,7 +205,6 @@ namespace scribo p_integ += b_next; } - trace::exiting("subsampling::impl::integral_3"); return sub; } @@ -218,7 +217,7 @@ namespace scribo const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::impl::integral_2"); + mln_trace("subsampling::impl::integral_2"); const unsigned scale = 2; @@ -366,7 +365,6 @@ namespace scribo p_integ += b_next; } - trace::exiting("subsampling::impl::integral_2"); return sub; } @@ -408,7 +406,7 @@ namespace scribo Image<J>& integral_sum_sum_2, const mln_domain(I)& output_domain, unsigned border_thickness) { - trace::entering("subsampling::integral"); + mln_trace("subsampling::integral"); const I& input = exact(input_); @@ -420,7 +418,6 @@ namespace scribo output = impl::integral(input, scale, integral_sum_sum_2, output_domain, border_thickness); - trace::exiting("subsampling::integral"); return output; } @@ -430,7 +427,7 @@ namespace scribo integral(const Image& input_, unsigned scale, Image<J>& integral_sum_sum_2) { - trace::entering("subsampling::integral"); + mln_trace("subsampling::integral"); const I& input = exact(input_); @@ -445,7 +442,6 @@ namespace scribo output = integral(input_, scale, integral_sum_sum_2, b, mln::border::thickness); - trace::exiting("subsampling::integral"); return output; } diff --git a/scribo/scribo/table/align_lines_horizontaly.hh b/scribo/scribo/table/align_lines_horizontaly.hh index 38d14ec..eeea08c 100644 --- a/scribo/scribo/table/align_lines_horizontaly.hh +++ b/scribo/scribo/table/align_lines_horizontaly.hh @@ -83,7 +83,7 @@ namespace scribo component_set<L>& aligned_lines, unsigned max_alignment_diff) { - trace::entering("scribo::table::align_lines_horizontaly"); + mln_trace("scribo::table::align_lines_horizontaly"); mln_precondition(exact(input).is_valid()); mln::util::array<int> @@ -94,7 +94,6 @@ namespace scribo aligned_lines, 0, max_alignment_diff); - trace::exiting("scribo::table::align_lines_horizontaly"); return res; } diff --git a/scribo/scribo/table/align_lines_verticaly.hh b/scribo/scribo/table/align_lines_verticaly.hh index 11770d6..8fdfdaa 100644 --- a/scribo/scribo/table/align_lines_verticaly.hh +++ b/scribo/scribo/table/align_lines_verticaly.hh @@ -78,7 +78,7 @@ namespace scribo mln::util::array<box<mln_site(I)> >& line_bboxes, unsigned max_alignment_diff) { - trace::entering("scribo::table::align_lines_verticaly"); + mln_trace("scribo::table::align_lines_verticaly"); mln_precondition(exact(input).is_valid()); mln::util::array<int> res = internal::align_lines(geom::ncols(input), @@ -87,7 +87,6 @@ namespace scribo line_bboxes, 1, max_alignment_diff); - trace::exiting("scribo::table::align_lines_verticaly"); return res; } diff --git a/scribo/scribo/table/connect_horizontal_lines.hh b/scribo/scribo/table/connect_horizontal_lines.hh index 78088fc..8850285 100644 --- a/scribo/scribo/table/connect_horizontal_lines.hh +++ b/scribo/scribo/table/connect_horizontal_lines.hh @@ -78,13 +78,12 @@ namespace scribo const Image& input, unsigned max_distance) { - trace::entering("scribo::table::connect_horizontal_lines"); + mln_trace("scribo::table::connect_horizontal_lines"); mln_precondition(exact(input).is_valid()); internal::connect_lines(aligned_cols, tablebboxes.second(), 1, exact(input).ncols(), max_distance); - trace::exiting("scribo::table::connect_horizontal_lines"); } diff --git a/scribo/scribo/table/connect_vertical_lines.hh b/scribo/scribo/table/connect_vertical_lines.hh index f885601..3faa8c9 100644 --- a/scribo/scribo/table/connect_vertical_lines.hh +++ b/scribo/scribo/table/connect_vertical_lines.hh @@ -76,13 +76,12 @@ namespace scribo const Image& input, unsigned max_distance) { - trace::entering("scribo::table::connect_vertical_lines"); + mln_trace("scribo::table::connect_vertical_lines"); mln_precondition(exact(input).is_valid()); internal::connect_lines(aligned_rows, tablebboxes.first(), 0, exact(input).nrows(), max_distance); - trace::exiting("scribo::table::connect_vertical_lines"); } diff --git a/scribo/scribo/table/erase.hh b/scribo/scribo/table/erase.hh index 8cdf834..33e8ede 100644 --- a/scribo/scribo/table/erase.hh +++ b/scribo/scribo/table/erase.hh @@ -76,7 +76,7 @@ namespace scribo const component_set<L>& hlines, const component_set<L>& vlines) { - trace::entering("scribo::internal::erase"); + mln_trace("scribo::internal::erase"); mlc_equal(mln_value(I),bool)::check(); mln_precondition(exact(input).is_valid()); @@ -85,7 +85,6 @@ namespace scribo erase_objects(output, vlines); erase_objects(output, hlines); - trace::exiting("scribo::internal::erase"); return output; } diff --git a/scribo/scribo/table/extract.hh b/scribo/scribo/table/extract.hh index a87667f..dbea110 100644 --- a/scribo/scribo/table/extract.hh +++ b/scribo/scribo/table/extract.hh @@ -78,7 +78,7 @@ namespace scribo mln::util::array<box<mln_site(I)> > > > extract(const Image& input_, V& ncells) { - trace::entering("scribo::table::extract"); + mln_trace("scribo::table::extract"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -103,7 +103,6 @@ namespace scribo = scribo::table::rebuild(input, vlines, hlines, 30, ncells); - trace::exiting("scribo::table::extract"); return tables; } diff --git a/scribo/scribo/table/internal/align_lines.hh b/scribo/scribo/table/internal/align_lines.hh index 7aced7d..d85e2cf 100644 --- a/scribo/scribo/table/internal/align_lines.hh +++ b/scribo/scribo/table/internal/align_lines.hh @@ -121,7 +121,7 @@ namespace scribo unsigned dim, unsigned max_alignment_diff) { - trace::entering("scribo::internal::align_lines"); + mln_trace("scribo::internal::align_lines"); mln_precondition(nsites > 0); @@ -182,7 +182,6 @@ namespace scribo --max_nelts; } - trace::exiting("scribo::internal::align_lines"); return newlines; } diff --git a/scribo/scribo/table/internal/connect_lines.hh b/scribo/scribo/table/internal/connect_lines.hh index 73e251e..cec432b 100644 --- a/scribo/scribo/table/internal/connect_lines.hh +++ b/scribo/scribo/table/internal/connect_lines.hh @@ -86,7 +86,7 @@ namespace scribo unsigned dim_size, unsigned max_distance) { - trace::entering("scribo::table::internal::connect_lines"); + mln_trace("scribo::table::internal::connect_lines"); image1d<int> l(dim_size); data::fill(l, -1); @@ -108,7 +108,6 @@ namespace scribo boxes[i].pmax()[dim] = opt::at(l, cp.second()[dim]); } - trace::exiting("scribo::table::internal::connect_lines"); } diff --git a/scribo/scribo/table/internal/repair_lines.hh b/scribo/scribo/table/internal/repair_lines.hh index a07cef1..85c26cd 100644 --- a/scribo/scribo/table/internal/repair_lines.hh +++ b/scribo/scribo/table/internal/repair_lines.hh @@ -101,7 +101,7 @@ namespace scribo mln::util::array<box<mln_site(I)> >& tableboxes, unsigned max_discontinuity) { - trace::entering("scribo::table::internal::repair_lines"); + mln_trace("scribo::table::internal::repair_lines"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -182,7 +182,6 @@ namespace scribo result.append(tableboxes[i]); tableboxes = result; - trace::exiting("scribo::table::internal::repair_lines"); } diff --git a/scribo/scribo/table/rebuild.hh b/scribo/scribo/table/rebuild.hh index e433390..513c108 100644 --- a/scribo/scribo/table/rebuild.hh +++ b/scribo/scribo/table/rebuild.hh @@ -98,7 +98,7 @@ namespace scribo unsigned max_dist_lines, mln_value(L)& ncells) { - trace::entering("scribo::table::rebuild"); + mln_trace("scribo::table::rebuild"); const I& input = exact(input_); mlc_equal(mln_value(I), bool)::check(); @@ -145,7 +145,6 @@ namespace scribo L lbl = labeling::background(res, c8(), ncells); - trace::exiting("scribo::table::rebuild"); return mln::make::couple(lbl, mln::make::couple(vlines, hlines)); } diff --git a/scribo/scribo/table/repair_horizontal_lines.hh b/scribo/scribo/table/repair_horizontal_lines.hh index e6713a0..2ce595e 100644 --- a/scribo/scribo/table/repair_horizontal_lines.hh +++ b/scribo/scribo/table/repair_horizontal_lines.hh @@ -72,12 +72,11 @@ namespace scribo mln::util::array<box<mln_site(I)> > >& tablebboxes, unsigned max_discontinuity) { - trace::entering("scribo::table::repair_horizontal_lines"); + mln_trace("scribo::table::repair_horizontal_lines"); mln_precondition(exact(input).is_valid()); internal::repair_lines<1>(input, tablebboxes.second(), max_discontinuity); - trace::exiting("scribo::table::repair_horizontal_lines"); } diff --git a/scribo/scribo/table/repair_vertical_lines.hh b/scribo/scribo/table/repair_vertical_lines.hh index e9e8f4b..da1ff65 100644 --- a/scribo/scribo/table/repair_vertical_lines.hh +++ b/scribo/scribo/table/repair_vertical_lines.hh @@ -78,12 +78,11 @@ namespace scribo mln::util::array<box<mln_site(I)> > >& tablebboxes, unsigned max_discontinuity) { - trace::entering("scribo::table::repair_vertical_lines"); + mln_trace("scribo::table::repair_vertical_lines"); mln_precondition(exact(input).is_valid()); internal::repair_lines<0>(input, tablebboxes.first(), max_discontinuity); - trace::exiting("scribo::table::repair_vertical_lines"); } diff --git a/scribo/scribo/text/clean.hh b/scribo/scribo/text/clean.hh index 7911852..5d30a04 100644 --- a/scribo/scribo/text/clean.hh +++ b/scribo/scribo/text/clean.hh @@ -99,7 +99,7 @@ namespace scribo mln_concrete(I) clean(const line_info<L>& line, const Image& input_) { - trace::entering("scribo::text::clean"); + mln_trace("scribo::text::clean"); const I& input = exact(input_); mlc_bool(mln_site_(I)::dim == 2)::check(); @@ -111,7 +111,6 @@ namespace scribo clean_inplace(line, output); - trace::exiting("scribo::text::clean"); return output; } diff --git a/scribo/scribo/text/clean_inplace.hh b/scribo/scribo/text/clean_inplace.hh index d217aa5..3955fff 100644 --- a/scribo/scribo/text/clean_inplace.hh +++ b/scribo/scribo/text/clean_inplace.hh @@ -96,7 +96,7 @@ namespace scribo void clean_inplace(const line_info<L>& line, Image& input_) { - trace::entering("scribo::text::clean_inplace"); + mln_trace("scribo::text::clean_inplace"); I& input = exact(input_); mlc_bool(mln_site_(I)::dim == 2)::check(); @@ -133,7 +133,6 @@ namespace scribo // else // std::cout << "not clean_inplaceing text. Seems ok." << std::endl; - trace::exiting("scribo::text::clean_inplace"); } # endif // ! MLN_INCLUDE_ONLY diff --git a/scribo/scribo/text/extract_lines.hh b/scribo/scribo/text/extract_lines.hh index 098cc2c..d1b7d68 100644 --- a/scribo/scribo/text/extract_lines.hh +++ b/scribo/scribo/text/extract_lines.hh @@ -110,7 +110,7 @@ namespace scribo extract_lines(const Image& input_, const Neighborhood<N>& nbh_, const mln_ch_value(I,bool)& separators) { - trace::entering("scribo::text::extract_lines"); + mln_trace("scribo::text::extract_lines"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -134,7 +134,6 @@ namespace scribo line_set<mln_ch_value(I,scribo::def::lbl_type)> lines = extract_lines(comps); - trace::exiting("scribo::text::extract_lines"); return lines; } @@ -143,7 +142,7 @@ namespace scribo line_set<mln_ch_value(L,scribo::def::lbl_type)> extract_lines(const component_set<L>& comps) { - trace::entering("scribo::text::extract_lines"); + mln_trace("scribo::text::extract_lines"); mln_precondition(comps.is_valid()); @@ -177,7 +176,6 @@ namespace scribo line_set<L> lines(groups); lines = text::merging(lines); - trace::exiting("scribo::text::extract_lines"); return lines; } diff --git a/scribo/scribo/text/extract_lines_with_features.hh b/scribo/scribo/text/extract_lines_with_features.hh index 79b91ec..073fe2b 100644 --- a/scribo/scribo/text/extract_lines_with_features.hh +++ b/scribo/scribo/text/extract_lines_with_features.hh @@ -95,7 +95,7 @@ namespace scribo const Neighborhood<N>& nbh_, const mln_ch_value(I,bool)& separators) { - trace::entering("scribo::text::extract_lines_with_features"); + mln_trace("scribo::text::extract_lines_with_features"); const I& input = exact(input_); const J& input_binary = exact(input_binary_); @@ -122,7 +122,6 @@ namespace scribo line_set<mln_ch_value(I,scribo::def::lbl_type)> lines = extract_lines(comps); - trace::exiting("scribo::text::extract_lines_with_features"); return lines; } diff --git a/scribo/scribo/text/extract_lines_wo_merge.hh b/scribo/scribo/text/extract_lines_wo_merge.hh index ab06395..bca1b53 100644 --- a/scribo/scribo/text/extract_lines_wo_merge.hh +++ b/scribo/scribo/text/extract_lines_wo_merge.hh @@ -137,7 +137,7 @@ namespace scribo extract_lines_wo_merge(const Image& input_, const Neighborhood<N>& nbh_, const mln_ch_value(I,bool)& separators) { - trace::entering("scribo::text::extract_lines_wo_merge"); + mln_trace("scribo::text::extract_lines_wo_merge"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -185,7 +185,6 @@ namespace scribo line_set<L> lines(groups); - trace::exiting("scribo::text::extract_lines_wo_merge"); return lines; } diff --git a/scribo/scribo/text/look_like_text_lines.hh b/scribo/scribo/text/look_like_text_lines.hh index 80d9995..98d552d 100644 --- a/scribo/scribo/text/look_like_text_lines.hh +++ b/scribo/scribo/text/look_like_text_lines.hh @@ -99,13 +99,12 @@ namespace scribo void look_like_text_lines_inplace(scribo::line_set<L>& line) { - trace::entering("scribo::text::look_like_text_lines_inplace"); + mln_trace("scribo::text::look_like_text_lines_inplace"); for_all_lines(l, line) if (internal::looks_like_a_text_line(line(l))) line(l).update_type(line::Text); - trace::exiting("scribo::text::look_like_text_lines_inplace"); } template <typename L> @@ -113,12 +112,11 @@ namespace scribo line_set<L> look_like_text_lines(const scribo::line_set<L>& l) { - trace::entering("scribo::text::look_like_text_lines"); + mln_trace("scribo::text::look_like_text_lines"); line_set<L> output = l.duplicate(); look_like_text_lines_inplace(output); - trace::exiting("scribo::text::look_like_text_lines"); return output; } diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh index e29e1c8..578e5db 100644 --- a/scribo/scribo/text/paragraphs_closing.hh +++ b/scribo/scribo/text/paragraphs_closing.hh @@ -188,7 +188,7 @@ namespace scribo mln_concrete(L) paragraphs_closing(const paragraph_set<L>& parset) { - trace::entering("scribo::text::paragraphs_closing"); + mln_trace("scribo::text::paragraphs_closing"); // FIXME: 'debug' may be useless. mln_concrete(L) output, debug; @@ -253,7 +253,6 @@ namespace scribo output, "paragraph_closing"); - trace::exiting("scribo::text::paragraphs_closing"); return output; } diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index d38ee81..dad233b 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -120,7 +120,7 @@ namespace scribo void recognition(line_set<L>& lines, const char *language) { - trace::entering("scribo::text::recognition"); + mln_trace("scribo::text::recognition"); // Tesseract is known to have issues while reading training data // depending on the current locales in use. Training data files use @@ -205,7 +205,6 @@ namespace scribo // Restore default locale. setlocale(LC_ALL, ""); - trace::exiting("scribo::text::recognition"); } @@ -215,7 +214,7 @@ namespace scribo const char *language, const std::string& output_file) { - trace::entering("scribo::text::recognition"); + mln_trace("scribo::text::recognition"); const I& line = exact(line_); mln_precondition(line.is_valid()); @@ -283,7 +282,6 @@ namespace scribo // Restore default locale. setlocale(LC_ALL, ""); - trace::exiting("scribo::text::recognition"); } @@ -296,7 +294,7 @@ namespace scribo void recognition(line_set<L>& lines, const char *language) { - trace::entering("scribo::text::recognition"); + mln_trace("scribo::text::recognition"); // Initialize Tesseract. @@ -365,7 +363,6 @@ namespace scribo delete[] s; } - trace::exiting("scribo::text::recognition"); } @@ -376,7 +373,7 @@ namespace scribo const char *language, const std::string& output_file = std::string()) { - trace::entering("scribo::text::recognition"); + mln_trace("scribo::text::recognition"); const I& line = exact(line_); mln_precondition(line.is_valid()); @@ -430,7 +427,6 @@ namespace scribo // Restore default locale. setlocale(LC_ALL, ""); - trace::exiting("scribo::text::recognition"); } diff --git a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh index e235d25..beac5c4 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh @@ -194,7 +194,7 @@ namespace scribo mln_ch_value(I,bool) text_in_doc_preprocess_functor::operator()(const Image& input_) { - trace::entering("scribo::toolchain::text_in_doc_preprocess"); + mln_trace("scribo::toolchain::text_in_doc_preprocess"); const I& input = exact(input_); mln_precondition(input.is_valid()); diff --git a/scribo/scribo/toolchain/nepomuk/text_extraction.hh b/scribo/scribo/toolchain/nepomuk/text_extraction.hh index 705787a..1d6a075 100644 --- a/scribo/scribo/toolchain/nepomuk/text_extraction.hh +++ b/scribo/scribo/toolchain/nepomuk/text_extraction.hh @@ -90,7 +90,7 @@ namespace scribo QSet<QString> text_extraction(const QImage& input, const QString& language = QString("eng")) { - trace::entering("scribo::toolchain::nepomuk::text_extraction"); + mln_trace("scribo::toolchain::nepomuk::text_extraction"); mln_precondition(!input.isNull()); @@ -162,7 +162,6 @@ namespace scribo output = QSet<QString>::fromList(list); } - trace::exiting("scribo::toolchain::nepomuk::text_extraction"); return output; } diff --git a/scribo/scribo/toolchain/text_in_doc_preprocess.hh b/scribo/scribo/toolchain/text_in_doc_preprocess.hh index c6efd21..881f0d5 100644 --- a/scribo/scribo/toolchain/text_in_doc_preprocess.hh +++ b/scribo/scribo/toolchain/text_in_doc_preprocess.hh @@ -190,7 +190,7 @@ namespace scribo double k2, double k3, double k4, bool enable_fg_bg, Image& fg, bool enable_deskew, bool verbose) { - trace::entering("scribo::toolchain::text_in_doc_preprocess"); + mln_trace("scribo::toolchain::text_in_doc_preprocess"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -210,7 +210,6 @@ namespace scribo mln_ch_value(I,bool) output = f(input); exact(fg) = f.fg; - trace::exiting("scribo::toolchain::text_in_doc_preprocess"); return output; } diff --git a/scribo/scribo/toolchain/text_in_picture.hh b/scribo/scribo/toolchain/text_in_picture.hh index eca4e9b..c25e18c 100644 --- a/scribo/scribo/toolchain/text_in_picture.hh +++ b/scribo/scribo/toolchain/text_in_picture.hh @@ -79,7 +79,7 @@ namespace scribo unsigned max_dim_size, unsigned lambda, bool verbose) { - trace::entering("scribo::toolchain::text_in_picture"); + mln_trace("scribo::toolchain::text_in_picture"); const I& input_rgb = exact(input_rgb_); mln_precondition(input_rgb.is_valid()); @@ -94,7 +94,6 @@ namespace scribo component_set<mln_ch_value(I, def::lbl_type)> output = f(input_rgb); - trace::exiting("scribo::toolchain::text_in_picture"); return output; } diff --git a/scribo/scribo/upsampling/bs2x.hh b/scribo/scribo/upsampling/bs2x.hh index c701e47..d66c713 100644 --- a/scribo/scribo/upsampling/bs2x.hh +++ b/scribo/scribo/upsampling/bs2x.hh @@ -61,7 +61,7 @@ namespace scribo mln_concrete(I) bs2x(const mln::Image& input_) { - trace::entering("scribo::upsampling::bs2x"); + mln_trace("scribo::upsampling::bs2x"); const I& input = exact(input_); @@ -132,7 +132,6 @@ namespace scribo } } - trace::exiting("scribo::upsampling::bs2x"); return output; } diff --git a/scribo/scribo/upsampling/eagle.hh b/scribo/scribo/upsampling/eagle.hh index 6652156..7d5a842 100644 --- a/scribo/scribo/upsampling/eagle.hh +++ b/scribo/scribo/upsampling/eagle.hh @@ -63,7 +63,7 @@ namespace scribo mln_concrete(I) eagle(const Image& input_) { - trace::entering("scribo::upsampling::eagle"); + mln_trace("scribo::upsampling::eagle"); typedef mln_value(I) V; const I& input = exact(input_); @@ -135,7 +135,6 @@ namespace scribo } } - trace::exiting("scribo::upsampling::eagle"); return output; } diff --git a/scribo/scribo/util/box_intersection.hh b/scribo/scribo/util/box_intersection.hh index f090233..99728af 100644 --- a/scribo/scribo/util/box_intersection.hh +++ b/scribo/scribo/util/box_intersection.hh @@ -58,7 +58,7 @@ namespace scribo box box_intersection(const box& lhs, const box& rhs) { - trace::entering("scribo::util::box_intersection"); + mln_trace("scribo::util::box_intersection"); P pmin, pmax; for (unsigned dim = 0; dim < P::dim; ++dim) @@ -72,7 +72,6 @@ namespace scribo box output(pmin, pmax); - trace::exiting("scribo::util::box_intersection"); return output; } diff --git a/scribo/scribo/util/box_is_included.hh b/scribo/scribo/util/box_is_included.hh index dc3f791..96b5448 100644 --- a/scribo/scribo/util/box_is_included.hh +++ b/scribo/scribo/util/box_is_included.hh @@ -55,13 +55,12 @@ namespace scribo bool box_is_included(const box& lhs, const box& rhs) { - trace::entering("scribo::util::box_is_included"); + mln_trace("scribo::util::box_is_included"); for (unsigned i = 0; i < P::dim; ++i) if (!(lhs.pmin()[i] >= rhs.pmin()[i] && lhs.pmax()[i] <= rhs.pmax()[i])) return false; - trace::exiting("scribo::util::box_is_included"); return true; } diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index e4e58d9..cef6096 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -363,7 +363,7 @@ namespace scribo component_precise_outline(const Image& input_, const mln_value(I)& id, bool compress_points) { - trace::entering("scribo::util::component_precise_outline"); + mln_trace("scribo::util::component_precise_outline"); const I& input = exact(input_); typedef mln_site(I) P; @@ -410,11 +410,9 @@ namespace scribo mln::p_array waypoints; internal::filter_points(points, waypoints); - trace::exiting("scribo::util::component_precise_outline"); return waypoints; } - trace::exiting("scribo::util::component_precise_outline"); return points; } diff --git a/scribo/scribo/util/compute_sub_domains.hh b/scribo/scribo/util/compute_sub_domains.hh index 72dc0f0..40e2dde 100644 --- a/scribo/scribo/util/compute_sub_domains.hh +++ b/scribo/scribo/util/compute_sub_domains.hh @@ -66,7 +66,7 @@ namespace scribo mln::util::array<mln::util::couple<mln_domain(I), unsigned> > compute_sub_domains(const Image& ima_, unsigned n_scales, unsigned s) { - trace::entering("scribo::util::compute_sub_domains"); + mln_trace("scribo::util::compute_sub_domains"); const I& ima = exact(ima_); mln_precondition(ima.is_valid()); @@ -98,7 +98,6 @@ namespace scribo out(1).second() = std::max(out(2).first().ncols() * s - ima.ncols(), out(2).first().nrows() * s - ima.nrows()); - trace::exiting("scribo::util::compute_sub_domains"); return out; } diff --git a/scribo/scribo/util/hex_to_color.hh b/scribo/scribo/util/hex_to_color.hh index d1368e2..0ff44be 100644 --- a/scribo/scribo/util/hex_to_color.hh +++ b/scribo/scribo/util/hex_to_color.hh @@ -109,7 +109,7 @@ namespace scribo value::rgb8 hex_to_color(const std::string& hex) { - trace::entering("scribo::util::hex_to_color"); + mln_trace("scribo::util::hex_to_color"); mln_precondition(!hex.empty()); @@ -132,7 +132,6 @@ namespace scribo internal::convert_from_hex(green), internal::convert_from_hex(blue)); - trace::exiting("scribo::util::hex_to_color"); return v; } diff --git a/scribo/scribo/util/init_integral_image.hh b/scribo/scribo/util/init_integral_image.hh index d237236..305a0ee 100644 --- a/scribo/scribo/util/init_integral_image.hh +++ b/scribo/scribo/util/init_integral_image.hh @@ -65,13 +65,12 @@ namespace scribo init_integral_image(const Image& input, unsigned scale, F& f, const mln_box(I)& output_domain, unsigned border) { - trace::entering("scribo::util::impl::generic::init_integral_image"); + mln_trace("scribo::util::impl::generic::init_integral_image"); typedef mln_ch_value(I, mln_result(F)) J; // Not implemented mlc_abort(I)::check(); - trace::exiting("scribo::util::impl::generic::init_integral_image"); return J(); } @@ -83,7 +82,7 @@ namespace scribo init_integral_image_fastest(const Image& input_, unsigned scale, F& f, const mln_box(I)& output_domain, unsigned border) { - trace::entering("scribo::util::impl::init_integral_image_fastest"); + mln_trace("scribo::util::impl::init_integral_image_fastest"); const I& input = exact(input_); typedef mln_ch_value(I, mln_result(F)) J; @@ -164,7 +163,6 @@ namespace scribo p_integ += b_next; } - trace::exiting("scribo::util::impl::init_integral_fastest_image"); return integral_sum_sum_2; } @@ -219,7 +217,7 @@ namespace scribo init_integral_image(const Image& input_, unsigned scale, F& func, const mln_box(I)& output_domain, unsigned border) { - trace::entering("scribo::util::init_integral_image"); + mln_trace("scribo::util::init_integral_image"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -229,7 +227,6 @@ namespace scribo output = internal::init_integral_image_dispatch(input, scale, func, output_domain, border); - trace::exiting("scribo::util::init_integral_image"); return output; } @@ -237,7 +234,7 @@ namespace scribo mln_ch_value(I,mln_result(F)) init_integral_image(const Image& input_, unsigned scale, F& func) { - trace::entering("scribo::util::init_integral_image"); + mln_trace("scribo::util::init_integral_image"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -251,7 +248,6 @@ namespace scribo output = init_integral_image(input, scale, func, output_domain, exact(input).border()); - trace::exiting("scribo::util::init_integral_image"); return output; } diff --git a/scribo/src/binarization/global_threshold.cc b/scribo/src/binarization/global_threshold.cc index 1879de0..be2cbe0 100644 --- a/scribo/src/binarization/global_threshold.cc +++ b/scribo/src/binarization/global_threshold.cc @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned threshold = atoi(options.arg("threshold_value")); @@ -98,5 +98,4 @@ int main(int argc, char *argv[]) io::pbm::save(out, options.arg("output.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/binarization/kim.cc b/scribo/src/binarization/kim.cc index c055a95..3008796 100644 --- a/scribo/src/binarization/kim.cc +++ b/scribo/src/binarization/kim.cc @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); // Window size diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 0769230..a528eb8 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); @@ -102,5 +102,4 @@ int main(int argc, char *argv[]) logical::not_inplace(out); io::magick::save(out, options.arg("output.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index 2231161..b2a9d57 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); bool verbose = options.is_set("verbose"); (void) verbose; @@ -105,5 +105,4 @@ int main(int argc, char *argv[]) io::magick::save(out, options.arg("output.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/binarization/pgm_global_threshold_auto.cc b/scribo/src/binarization/pgm_global_threshold_auto.cc index 568eba2..df60b91 100644 --- a/scribo/src/binarization/pgm_global_threshold_auto.cc +++ b/scribo/src/binarization/pgm_global_threshold_auto.cc @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) "input.pgm output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<int_u8> input; io::pgm::load(input, argv[1]); @@ -59,5 +59,4 @@ int main(int argc, char *argv[]) argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/binarization/pgm_niblack_threshold_image.cc b/scribo/src/binarization/pgm_niblack_threshold_image.cc index 4abd862..3bfcdab 100644 --- a/scribo/src/binarization/pgm_niblack_threshold_image.cc +++ b/scribo/src/binarization/pgm_niblack_threshold_image.cc @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) "input.pgm output.pgm <w> <k>", args_desc); - trace::entering("main"); + mln_trace("main"); unsigned w; if (argc >= 4) @@ -74,5 +74,4 @@ int main(int argc, char *argv[]) io::pgm::save(out, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index 3ea0f8b..aa66565 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); @@ -104,5 +104,4 @@ int main(int argc, char *argv[]) io::magick::save(out, options.arg("output.*")); - trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola_debug.cc b/scribo/src/binarization/sauvola_debug.cc index 0c335a8..e1aeb29 100644 --- a/scribo/src/binarization/sauvola_debug.cc +++ b/scribo/src/binarization/sauvola_debug.cc @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) "alphacond.pbm <mean_factor> <stddev_factor> <alphamfact> <w> <k>", args_desc); - trace::entering("main"); + mln_trace("main"); unsigned w; if (argc >= 12) @@ -128,5 +128,4 @@ int main(int argc, char *argv[]) //io::pgm::save(data::saturate(value::int_u8(), thres), "thres_saturated.pgm"); - trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 9f3e9dd..3b51dad 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); // Window size diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index 9a61f96..d01a4a2 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); // Window size diff --git a/scribo/src/binarization/sauvola_ms_fg.cc b/scribo/src/binarization/sauvola_ms_fg.cc index 2c11636..5566e41 100644 --- a/scribo/src/binarization/sauvola_ms_fg.cc +++ b/scribo/src/binarization/sauvola_ms_fg.cc @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned lambda = atoi(options.opt_value("lambda").c_str()); diff --git a/scribo/src/binarization/sauvola_ms_split.cc b/scribo/src/binarization/sauvola_ms_split.cc index aede1e0..db32908 100644 --- a/scribo/src/binarization/sauvola_ms_split.cc +++ b/scribo/src/binarization/sauvola_ms_split.cc @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); // Window size unsigned w_1 = atoi(options.opt_value("win-size").c_str()); // Scale 1 diff --git a/scribo/src/binarization/singh.cc b/scribo/src/binarization/singh.cc index ee00115..66643e4 100644 --- a/scribo/src/binarization/singh.cc +++ b/scribo/src/binarization/singh.cc @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); @@ -100,5 +100,4 @@ int main(int argc, char *argv[]) io::pbm::save(out, options.arg("output.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index 2c35247..e4819e8 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); unsigned w = atoi(options.opt_value("win-size").c_str()); double k = atof(options.opt_value("k").c_str()); @@ -99,5 +99,4 @@ int main(int argc, char *argv[]) io::magick::save(out, options.arg("output.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 430b309..3922d7a 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) bool verbose = options.is_set("verbose"); - trace::entering("main"); + mln_trace("main"); typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; @@ -202,5 +202,4 @@ int main(int argc, char* argv[]) if (options.opt_value("debug-regions") != "/dev/null") scribo::io::img::save(doc, options.opt_value("debug-regions"), scribo::io::img::DebugWithImage); - trace::exiting("main"); } diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index bdede6a..80e568c 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) scribo::make::internal::debug_filename_prefix = argv[argc - 1]; } - trace::entering("main"); + mln_trace("main"); mln::util::timer t; t.start(); @@ -212,5 +212,4 @@ int main(int argc, char* argv[]) // sleep(10); - trace::exiting("main"); } diff --git a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc index 3ce4f08..176e721 100644 --- a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) "input.* output_dir", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; @@ -117,5 +117,4 @@ int main(int argc, char* argv[]) mln::io::pbm::save(output, ss.str()); } - trace::exiting("main"); } diff --git a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index 796218f..0f0b0e8 100644 --- a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) "input.tif output_dir", args_desc); - trace::entering("main"); + mln_trace("main"); mln::util::timer t; t.start(); @@ -149,5 +149,4 @@ int main(int argc, char* argv[]) } - trace::exiting("main"); } diff --git a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc index 019fd5a..395dcdc 100644 --- a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc +++ b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) "input.tif out.xml", args_desc); - trace::entering("main"); + mln_trace("main"); mln::util::timer t; t.start(); @@ -139,5 +139,4 @@ int main(int argc, char* argv[]) scribo::io::img::DebugWithImage); - trace::exiting("main"); } diff --git a/scribo/src/debug/highlight_text_area.cc b/scribo/src/debug/highlight_text_area.cc index 817effa..54f84ff 100644 --- a/scribo/src/debug/highlight_text_area.cc +++ b/scribo/src/debug/highlight_text_area.cc @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) "input.* ocr_text.txt output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<value::rgb8> input; io::magick::load(input, argv[1]); @@ -93,5 +93,4 @@ int main(int argc, char *argv[]) io::ppm::save(scribo::debug::highlight_text_area(input, bbox), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_info_median_inter_characters.cc b/scribo/src/debug/show_info_median_inter_characters.cc index 2ba240e..9b9b140 100644 --- a/scribo/src/debug/show_info_median_inter_characters.cc +++ b/scribo/src/debug/show_info_median_inter_characters.cc @@ -67,7 +67,7 @@ int main(int argc, char* argv[]) args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; @@ -80,5 +80,4 @@ int main(int argc, char* argv[]) image2d<value::rgb8> output = scribo::debug::char_space_image(input, line); mln::io::ppm::save(output, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_info_x_height.cc b/scribo/src/debug/show_info_x_height.cc index 2997230..7e5502e 100644 --- a/scribo/src/debug/show_info_x_height.cc +++ b/scribo/src/debug/show_info_x_height.cc @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) "input.pbm out.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; @@ -75,5 +75,4 @@ int main(int argc, char* argv[]) image2d<value::rgb8> output = scribo::debug::line_info_image(input, line); mln::io::ppm::save(output, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_lines_boldness.cc b/scribo/src/debug/show_lines_boldness.cc index a49d0e1..3e6a644 100644 --- a/scribo/src/debug/show_lines_boldness.cc +++ b/scribo/src/debug/show_lines_boldness.cc @@ -66,7 +66,7 @@ int main(int argc, char* argv[]) "input.pbm out_prefix", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; mln::io::pbm::load(input, argv[1]); @@ -196,6 +196,5 @@ int main(int argc, char* argv[]) } - trace::exiting("main"); } diff --git a/scribo/src/debug/show_objects_large.cc b/scribo/src/debug/show_objects_large.cc index a09ea78..3ccf5df 100644 --- a/scribo/src/debug/show_objects_large.cc +++ b/scribo/src/debug/show_objects_large.cc @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) "input.pbm min_card output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_objects_large_small.cc b/scribo/src/debug/show_objects_large_small.cc index 35062d3..cb888af 100644 --- a/scribo/src/debug/show_objects_large_small.cc +++ b/scribo/src/debug/show_objects_large_small.cc @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) "input.pbm min_card max_card output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_objects_small.cc b/scribo/src/debug/show_objects_small.cc index ce6ee18..1e9ae1f 100644 --- a/scribo/src/debug/show_objects_small.cc +++ b/scribo/src/debug/show_objects_small.cc @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) "input.pbm min_card output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_objects_thick.cc b/scribo/src/debug/show_objects_thick.cc index 728e55f..1424708 100644 --- a/scribo/src/debug/show_objects_thick.cc +++ b/scribo/src/debug/show_objects_thick.cc @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) "input.pbm max_thickness output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_objects_thin.cc b/scribo/src/debug/show_objects_thin.cc index 3479fd6..9e02520 100644 --- a/scribo/src/debug/show_objects_thin.cc +++ b/scribo/src/debug/show_objects_thin.cc @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) "input.pbm min_thickness output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_paragraph_blocks.cc b/scribo/src/debug/show_paragraph_blocks.cc index 0954964..759cb31 100644 --- a/scribo/src/debug/show_paragraph_blocks.cc +++ b/scribo/src/debug/show_paragraph_blocks.cc @@ -66,7 +66,7 @@ int main(int argc, char* argv[]) "lines.xml out_blocks.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<scribo::def::lbl_type> L; document<L> doc; @@ -183,5 +183,4 @@ int main(int argc, char* argv[]) mln::io::pbm::save(blocks, argv[2]); // mln::io::pgm::save(log, "log.pgm"); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_separators.cc b/scribo/src/debug/show_separators.cc index 5b6e038..1c412f3 100644 --- a/scribo/src/debug/show_separators.cc +++ b/scribo/src/debug/show_separators.cc @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) "input.pbm output.pbm input_wo_seps.pbm output.ppm length delta", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -97,5 +97,4 @@ int main(int argc, char *argv[]) bbox = labeling::compute(accu::shape::bbox<point2d>(), lbl, nlabels); io::ppm::save(scribo::debug::bboxes_image(input, bbox, literal::red), argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_stoppers.cc b/scribo/src/debug/show_stoppers.cc index 0e7fe0f..72a1249 100644 --- a/scribo/src/debug/show_stoppers.cc +++ b/scribo/src/debug/show_stoppers.cc @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) "out_seps_bbox.ppm out_visible_seps.pbm length delta", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -120,5 +120,4 @@ int main(int argc, char *argv[]) v_lines += nonvisible; mln::io::pbm::save(v_lines, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_text_lines.cc b/scribo/src/debug/show_text_lines.cc index 5b7eaff..d4e1cad 100644 --- a/scribo/src/debug/show_text_lines.cc +++ b/scribo/src/debug/show_text_lines.cc @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) "input.pbm input_seps.pbm out_text_boxes.ppm out_text_boxes.pbm out_text_comps.pbm out_lines.xml", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; mln::io::pbm::load(input, argv[1]); @@ -124,5 +124,4 @@ int main(int argc, char* argv[]) scribo::io::xml::save(doc, argv[6], scribo::io::xml::Full); - trace::exiting("main"); } diff --git a/scribo/src/debug/show_text_lines_wo_seps.cc b/scribo/src/debug/show_text_lines_wo_seps.cc index 8031940..0d8d488 100644 --- a/scribo/src/debug/show_text_lines_wo_seps.cc +++ b/scribo/src/debug/show_text_lines_wo_seps.cc @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) "input.pbm output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; mln::io::pbm::load(input, argv[1]); @@ -81,5 +81,4 @@ int main(int argc, char* argv[]) mln::io::ppm::save(output, argv[2]); } - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_large.cc b/scribo/src/filter/objects_large.cc index a017467..af4c84da 100644 --- a/scribo/src/filter/objects_large.cc +++ b/scribo/src/filter/objects_large.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) "input.pbm max_area output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -71,6 +71,5 @@ int main(int argc, char *argv[]) filtered = scribo::filter::components_large(comps, atoi(argv[2])); io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_small.cc b/scribo/src/filter/objects_small.cc index 977c7b1..e240256 100644 --- a/scribo/src/filter/objects_small.cc +++ b/scribo/src/filter/objects_small.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.pbm min_area output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -70,6 +70,5 @@ int main(int argc, char *argv[]) filtered = scribo::filter::components_small(comps, atoi(argv[2])); io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_thick.cc b/scribo/src/filter/objects_thick.cc index 2b0a235..8f0080b 100644 --- a/scribo/src/filter/objects_thick.cc +++ b/scribo/src/filter/objects_thick.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.pbm max_thick output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -70,6 +70,5 @@ int main(int argc, char *argv[]) filtered = scribo::filter::objects_thick(comps, atoi(argv[2])); io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_thin.cc b/scribo/src/filter/objects_thin.cc index b537184..0edfc85 100644 --- a/scribo/src/filter/objects_thin.cc +++ b/scribo/src/filter/objects_thin.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.pbm min_thin output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -70,6 +70,5 @@ int main(int argc, char *argv[]) filtered = scribo::filter::components_thin(comps, atoi(argv[2])); io::pbm::save(data::convert(bool(), filtered.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_with_holes.cc b/scribo/src/filter/objects_with_holes.cc index 20fe839..f339a5b 100644 --- a/scribo/src/filter/objects_with_holes.cc +++ b/scribo/src/filter/objects_with_holes.cc @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) "input.pbm min_holes_count output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -70,6 +70,5 @@ int main(int argc, char *argv[]) io::pbm::save(data::convert(bool(), filtered.valid_comps_image_()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/filter/objects_with_holes_pgm.cc b/scribo/src/filter/objects_with_holes_pgm.cc index 40988c8..5cbb9d0 100644 --- a/scribo/src/filter/objects_with_holes_pgm.cc +++ b/scribo/src/filter/objects_with_holes_pgm.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) "input.pgm min_holes_count output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<value::label_8> I; I input; @@ -71,6 +71,5 @@ int main(int argc, char *argv[]) filtered = scribo::filter::objects_with_holes(comps, atoi(argv[2]), 0); io::pbm::save(data::convert(bool(), filtered.valid_comps_image_()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/misc/negate.cc b/scribo/src/misc/negate.cc index da6fad6..0a1f48c 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.cc @@ -40,7 +40,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::trace::entering("main"); + mln::mln_trace("main"); using namespace mln; if (argc != 3) @@ -54,6 +54,5 @@ int main(int argc, char *argv[]) io::pbm::save(logical::not_(input), argv[2]); - mln::trace::exiting("main"); } diff --git a/scribo/src/misc/superpose.cc b/scribo/src/misc/superpose.cc index 6cb5e1d..47072d2 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.cc @@ -43,7 +43,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::trace::entering("main"); + mln::mln_trace("main"); using namespace mln; if (argc != 4) @@ -60,5 +60,4 @@ int main(int argc, char *argv[]) io::ppm::save(debug::superpose(input, data), argv[3]); - mln::trace::exiting("main"); } diff --git a/scribo/src/non_text_components.cc b/scribo/src/non_text_components.cc index e847b2c..16251e6 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/non_text_components.cc @@ -80,7 +80,7 @@ int main(int argc, char* argv[]) else scribo::debug::logger().set_level(scribo::debug::None); - trace::entering("main"); + mln_trace("main"); typedef image2d<scribo::def::lbl_type> L; image2d<value::rgb8> input; @@ -123,5 +123,4 @@ int main(int argc, char* argv[]) scribo::io::img::save(doc, out_img + "_debug_wo_image.png", scribo::io::img::DebugWoImage); scribo::io::img::save(doc, out_img + "_debug_with_image.png", scribo::io::img::DebugWithImage); - trace::exiting("main"); } diff --git a/scribo/src/pbm_text_in_doc.cc b/scribo/src/pbm_text_in_doc.cc index 511588b..d6889ea 100644 --- a/scribo/src/pbm_text_in_doc.cc +++ b/scribo/src/pbm_text_in_doc.cc @@ -108,7 +108,7 @@ int main(int argc, char* argv[]) bool verbose = options.is_set("verbose"); - trace::entering("main"); + mln_trace("main"); typedef image2d<scribo::def::lbl_type> L; @@ -163,5 +163,4 @@ int main(int argc, char* argv[]) // Specify shift due to potential previous crop. scribo::io::text_boxes::save(lines, options.arg("output.txt"), crop_shift); - trace::exiting("main"); } diff --git a/scribo/src/postprocessing/fill_object_holes.cc b/scribo/src/postprocessing/fill_object_holes.cc index 280eae5..aa08e3e 100644 --- a/scribo/src/postprocessing/fill_object_holes.cc +++ b/scribo/src/postprocessing/fill_object_holes.cc @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) "input.pbm ratio output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -63,5 +63,4 @@ int main(int argc, char *argv[]) io::pbm::save(output, argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/preprocessing/denoise_bg.cc b/scribo/src/preprocessing/denoise_bg.cc index e9d83cf..cce2650 100644 --- a/scribo/src/preprocessing/denoise_bg.cc +++ b/scribo/src/preprocessing/denoise_bg.cc @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) "input.pbm bg_min_card output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -63,5 +63,4 @@ int main(int argc, char *argv[]) io::pbm::save(output, argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/preprocessing/denoise_fg.cc b/scribo/src/preprocessing/denoise_fg.cc index a7a5bea..f183025 100644 --- a/scribo/src/preprocessing/denoise_fg.cc +++ b/scribo/src/preprocessing/denoise_fg.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) "input.pbm fg_min_card output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -64,5 +64,4 @@ int main(int argc, char *argv[]) io::pbm::save(output, argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/preprocessing/preprocess.cc b/scribo/src/preprocessing/preprocess.cc index 0695450..96e6613 100644 --- a/scribo/src/preprocessing/preprocess.cc +++ b/scribo/src/preprocessing/preprocess.cc @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) "input.pgm output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<value::int_u8> I; I input; @@ -79,6 +79,5 @@ int main(int argc, char *argv[]) io::pbm::save(input_bw, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index e759835..b5ba7cc 100644 --- a/scribo/src/preprocessing/split_bg_fg.cc +++ b/scribo/src/preprocessing/split_bg_fg.cc @@ -46,7 +46,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::trace::entering("main"); + mln::mln_trace("main"); using namespace mln; if (argc != 6) @@ -66,5 +66,4 @@ int main(int argc, char *argv[]) io::ppm::save(bg_fg.first(), argv[5]); io::ppm::save(bg_fg.second(), argv[4]); - mln::trace::exiting("main"); } diff --git a/scribo/src/preprocessing/subsample.cc b/scribo/src/preprocessing/subsample.cc index fde31e0..3f4c8c9 100644 --- a/scribo/src/preprocessing/subsample.cc +++ b/scribo/src/preprocessing/subsample.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.* ratio output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<value::rgb8> I; I input; @@ -63,5 +63,4 @@ int main(int argc, char *argv[]) unsigned ratio = atoi(argv[2]); io::ppm::save(mln::subsampling::antialiased(input, ratio), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/preprocessing/unskew.cc b/scribo/src/preprocessing/unskew.cc index 9ac32ec..58eb0a1 100644 --- a/scribo/src/preprocessing/unskew.cc +++ b/scribo/src/preprocessing/unskew.cc @@ -42,7 +42,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::trace::entering("main"); + mln::mln_trace("main"); using namespace mln; if (argc != 3) @@ -56,5 +56,4 @@ int main(int argc, char *argv[]) io::pgm::save(scribo::preprocessing::deskew(input), argv[2]); - mln::trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/alignments.cc b/scribo/src/primitive/extract/alignments.cc index 544322a..24e2259 100644 --- a/scribo/src/primitive/extract/alignments.cc +++ b/scribo/src/primitive/extract/alignments.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.pbm output.pbm [enable_debug]", args_desc); - trace::entering("main"); + mln_trace("main"); if (argc > 3 && atoi(argv[3])) scribo::debug::logger().set_level(scribo::debug::All); @@ -87,5 +87,4 @@ int main(int argc, char *argv[]) mln::io::pbm::save(res.second(), argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/discontinued_hlines.cc b/scribo/src/primitive/extract/discontinued_hlines.cc index 67498af..ab8d0b0 100644 --- a/scribo/src/primitive/extract/discontinued_hlines.cc +++ b/scribo/src/primitive/extract/discontinued_hlines.cc @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) "input.pbm length rank output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -69,5 +69,4 @@ int main(int argc, char *argv[]) atoi(argv[3])); io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/discontinued_lines.cc b/scribo/src/primitive/extract/discontinued_lines.cc index e5f1483..9a14799 100644 --- a/scribo/src/primitive/extract/discontinued_lines.cc +++ b/scribo/src/primitive/extract/discontinued_lines.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) "input.pbm length rank output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -83,5 +83,4 @@ int main(int argc, char *argv[]) data::fill((output | (pw::value(vlines.labeled_image()) != 0u)).rw(), true); io::pbm::save(output, argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/discontinued_vlines.cc b/scribo/src/primitive/extract/discontinued_vlines.cc index 68cd7d9..e911752 100644 --- a/scribo/src/primitive/extract/discontinued_vlines.cc +++ b/scribo/src/primitive/extract/discontinued_vlines.cc @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) "input.pbm length rank output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -70,5 +70,4 @@ int main(int argc, char *argv[]) atoi(argv[3])); io::pbm::save(data::convert(bool(), vlines.labeled_image()), argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index cb56b36..075dca6 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) "input.pbm length delta output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -74,5 +74,4 @@ int main(int argc, char *argv[]) io::pbm::save(v_lines, argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/separators_nonvisible.cc b/scribo/src/primitive/extract/separators_nonvisible.cc index 177047c..9ca3dab 100644 --- a/scribo/src/primitive/extract/separators_nonvisible.cc +++ b/scribo/src/primitive/extract/separators_nonvisible.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) "input.pbm output.pbm [enable_debug]", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -60,5 +60,4 @@ int main(int argc, char *argv[]) io::pbm::save(primitive::extract::separators_nonvisible(input), argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/thick_hlines.cc b/scribo/src/primitive/extract/thick_hlines.cc index 136c2f9..439ae5a 100644 --- a/scribo/src/primitive/extract/thick_hlines.cc +++ b/scribo/src/primitive/extract/thick_hlines.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) "input.pbm length output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -68,5 +68,4 @@ int main(int argc, char *argv[]) atoi(argv[2])); io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/extract/thick_vlines.cc b/scribo/src/primitive/extract/thick_vlines.cc index 7c38268..b58eff3 100644 --- a/scribo/src/primitive/extract/thick_vlines.cc +++ b/scribo/src/primitive/extract/thick_vlines.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) "input.pbm length output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -68,5 +68,4 @@ int main(int argc, char *argv[]) atoi(argv[2])); io::pbm::save(data::convert(bool(), lines.labeled_image()), argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/find/find_discontinued_lines.cc b/scribo/src/primitive/find/find_discontinued_lines.cc index eec579a..59d3e86 100644 --- a/scribo/src/primitive/find/find_discontinued_lines.cc +++ b/scribo/src/primitive/find/find_discontinued_lines.cc @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) "input.pbm length output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -87,5 +87,4 @@ int main(int argc, char *argv[]) io::ppm::save(out, argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/find/find_pattern_lines.cc b/scribo/src/primitive/find/find_pattern_lines.cc index 88d22c0..e59f64e 100644 --- a/scribo/src/primitive/find/find_pattern_lines.cc +++ b/scribo/src/primitive/find/find_pattern_lines.cc @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) "input.pbm length output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -71,5 +71,4 @@ int main(int argc, char *argv[]) io::ppm::save(out, argv[3]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/find/find_single_lines.cc b/scribo/src/primitive/find/find_single_lines.cc index 16e216f..30cfb43 100644 --- a/scribo/src/primitive/find/find_single_lines.cc +++ b/scribo/src/primitive/find/find_single_lines.cc @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) "<output.pbm>", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -91,5 +91,4 @@ int main(int argc, char *argv[]) out = mln::debug::superpose(out, vlines.labeled_image(), literal::green); io::ppm::save(out, argv[6]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/find/find_thick_and_single_lines.cc b/scribo/src/primitive/find/find_thick_and_single_lines.cc index cf88571..d4b674f 100644 --- a/scribo/src/primitive/find/find_thick_and_single_lines.cc +++ b/scribo/src/primitive/find/find_thick_and_single_lines.cc @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) " <hratio> <output.ppm>", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -91,5 +91,4 @@ int main(int argc, char *argv[]) io::ppm::save(out, argv[6]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/find/find_thick_lines.cc b/scribo/src/primitive/find/find_thick_lines.cc index 8966b81..d16be21 100644 --- a/scribo/src/primitive/find/find_thick_lines.cc +++ b/scribo/src/primitive/find/find_thick_lines.cc @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) "<input.pbm> <vlength> <hlength> <output.ppm>", args_desc); - trace::entering("main"); + mln_trace("main"); typedef image2d<bool> I; I input; @@ -87,5 +87,4 @@ int main(int argc, char *argv[]) io::ppm::save(out, argv[4]); - trace::exiting("main"); } diff --git a/scribo/src/primitive/remove/separators.cc b/scribo/src/primitive/remove/separators.cc index 46e977f..17d8fba 100644 --- a/scribo/src/primitive/remove/separators.cc +++ b/scribo/src/primitive/remove/separators.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) "input.pbm output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -59,5 +59,4 @@ int main(int argc, char *argv[]) io::pbm::save(primitive::remove::separators(input, seps), argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/table/erase.cc b/scribo/src/table/erase.cc index 2870798..cab7ce0 100644 --- a/scribo/src/table/erase.cc +++ b/scribo/src/table/erase.cc @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) "input.pbm output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -84,5 +84,4 @@ int main(int argc, char* argv[]) io::pbm::save(input_notables, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/table/extract.cc b/scribo/src/table/extract.cc index c3a7271..466321f 100644 --- a/scribo/src/table/extract.cc +++ b/scribo/src/table/extract.cc @@ -58,7 +58,7 @@ int main(int argc, char* argv[]) "input.pbm output.dump output.ppm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -72,5 +72,4 @@ int main(int argc, char* argv[]) io::dump::save(tables, argv[2]); - trace::exiting("main"); } diff --git a/scribo/src/text/cleantxt.cc b/scribo/src/text/cleantxt.cc index 78aa5e6..20a1d54 100644 --- a/scribo/src/text/cleantxt.cc +++ b/scribo/src/text/cleantxt.cc @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) "input.pbm out.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -92,5 +92,4 @@ int main(int argc, char* argv[]) io::pbm::save(scribo::text::clean(lines(l), input), scribo::make::debug_filename("text.pbm")); - trace::exiting("main"); } diff --git a/scribo/src/text/pbm_lines_recognition.cc b/scribo/src/text/pbm_lines_recognition.cc index 3451449..902e488 100644 --- a/scribo/src/text/pbm_lines_recognition.cc +++ b/scribo/src/text/pbm_lines_recognition.cc @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) "input.pbm [lang] [file]", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; mln::io::pbm::load(input, argv[1]); @@ -107,5 +107,4 @@ int main(int argc, char* argv[]) scribo::io::text_boxes::save(lines, output); - trace::exiting("main"); } diff --git a/scribo/src/text/pbm_recognition.cc b/scribo/src/text/pbm_recognition.cc index b262aab..c0debe9 100644 --- a/scribo/src/text/pbm_recognition.cc +++ b/scribo/src/text/pbm_recognition.cc @@ -58,7 +58,7 @@ int main(int argc, char* argv[]) "input.pbm [lang]", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -75,5 +75,4 @@ int main(int argc, char* argv[]) scribo::text::recognition(input, lang); - trace::exiting("main"); } diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 4409be2..64e1462 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -82,7 +82,7 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); image2d<value::rgb8> input_rgb; io::magick::load(input_rgb, options.arg("input.*")); @@ -111,6 +111,5 @@ int main(int argc, char* argv[]) options.arg("output.ppm")); - trace::exiting("main"); return comps.nelements() != 0; } diff --git a/scribo/src/text_in_picture_dual.cc b/scribo/src/text_in_picture_dual.cc index dcd9754..587a612 100644 --- a/scribo/src/text_in_picture_dual.cc +++ b/scribo/src/text_in_picture_dual.cc @@ -85,7 +85,7 @@ int main(int argc, char* argv[]) } - trace::entering("main"); + mln_trace("main"); image2d<value::rgb8> input_rgb; io::magick::load(input_rgb, argv[1]); diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index 5456263..b5448e5 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -171,7 +171,7 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); } - trace::entering("main"); + mln_trace("main"); typedef image2d<value::rgb8> I; I input_rgb; @@ -218,6 +218,5 @@ int main(int argc, char* argv[]) if (verbose) std::cout << output.nelements() << " text lines found." << std::endl; - trace::exiting("main"); return 0; } diff --git a/scribo/src/util/component_precise_outline.cc b/scribo/src/util/component_precise_outline.cc index 158f8c2..13e6058 100644 --- a/scribo/src/util/component_precise_outline.cc +++ b/scribo/src/util/component_precise_outline.cc @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) "input.pbm output.pbm", args_desc); - trace::entering("main"); + mln_trace("main"); image2d<bool> input; io::pbm::load(input, argv[1]); @@ -87,5 +87,4 @@ int main(int argc, char *argv[]) io::ppm::save(input_rgb, argv[2]); - trace::exiting("main"); } -- 1.7.2.5

11 years, 10 months

branch unstable/scribo updated: olena-2.0-386-g2a9b240

by git＠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 unstable/scribo has been updated via 2a9b240ff2100b6f9d02969deb754f58d701e251 (commit) from 62dbacde6331505524aa418e00c4ec111f679799 (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 ----------------------------------------------------------------- 2a9b240 doc/img/2dgrid.png: New. Add missing file. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/doc/img/2dgrid.png | Bin 0 -> 6092 bytes 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 milena/doc/img/2dgrid.png hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 10 months

olena-2.0-386-g2a9b240 doc/img/2dgrid.png: New. Add missing file.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/doc/img/2dgrid.png | Bin 0 -> 6092 bytes 2 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 milena/doc/img/2dgrid.png diff --git a/milena/ChangeLog b/milena/ChangeLog index d712c79..277a65d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/img/2dgrid.png: New. Add missing file. + +2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> + Update use of math::round. * mln/convert/impl/from_double_to_value.hh, diff --git a/milena/doc/img/2dgrid.png b/milena/doc/img/2dgrid.png new file mode 100644 index 0000000..8442f20 Binary files /dev/null and b/milena/doc/img/2dgrid.png differ -- 1.7.2.5

11 years, 10 months

branch unstable/scribo updated: olena-2.0-385-g62dbacd

by git＠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 unstable/scribo has been updated via 62dbacde6331505524aa418e00c4ec111f679799 (commit) from effa1b7572027494c649d84e43bd0d066b8317e4 (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 ----------------------------------------------------------------- 62dbacd Remove references to external directory. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ Makefile.am | 2 +- configure.ac | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 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