March 2013 - Olena-patches

branch exp/trace created: olena-2.0-399-g4b98621
by git＠lrde.epita.fr 19 Mar '13

19 Mar '13

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 exp/trace has been created at 4b986216fbc85d5f86db7b55a85a28a9d25608f2 (commit) - Log ----------------------------------------------------------------- 4b98621 Make use of mln_trace_warning in Scribo. 1995b37 Remove last references to mln::trace::*. e45787c Introduce mln_trace_warning macro. 3164abc Remove last references to mln::trace::*. e435b9b Remove deprecated trace system. d48b8a4 Make use of mln_trace. 24d3d37 Introduce mln_trace. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-396-gb6f5568 demo/xml2doc/main.cc: Kill warnings.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/main.cc | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b0455fc..0121ab4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/xml2doc/main.cc: Kill warnings. + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove references to InitializeMagick(). diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 368e52d..a42d6ab 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -199,15 +199,19 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], argv[3], dir); xmlt.createOpen(); + // FIXME: we should check the return value of system(). + int rvalue; + (void) rvalue; + QString datarootdir = get_datarootdir("html/main.xsl"); - system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %2/out.html") - .arg(datarootdir).arg(dir).toAscii().constData()); + rvalue = system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %2/out.html") + .arg(datarootdir).arg(dir).toAscii().constData()); qDebug() << QString("Open Document output : %1").arg(argv[4]); datarootdir = get_datarootdir("bin/ooconvert"); - system(QString(" \"%1/bin/ooconvert\" \"%2/out.html\" \"%2/out.odt\" > /dev/null") - .arg(datarootdir).arg(dir).toAscii().constData()); + rvalue = system(QString(" \"%1/bin/ooconvert\" \"%2/out.html\" \"%2/out.odt\" > /dev/null") + .arg(datarootdir).arg(dir).toAscii().constData()); QString cur_dir = QDir::currentPath(); QString tmp_dir = dir + "/oo_tmp"; @@ -215,11 +219,11 @@ int main(int argc, char **argv) QDir d; d.mkdir(tmp_dir); qDebug() << "unzip %1/out.odt -d %2 > /dev/null" << dir << tmp_dir; - system(QString("unzip %1/out.odt -d %2 > /dev/null") - .arg(dir).arg(tmp_dir).toAscii().constData()); + rvalue = system(QString("unzip %1/out.odt -d %2 > /dev/null") + .arg(dir).arg(tmp_dir).toAscii().constData()); - system(QString("cat %1/content.xml | sed -re 's!\\.\\./([a-zA-Z0-9])!Pictures/\\1!g' " - ">> %1/tmp.xml").arg(tmp_dir).toAscii().constData()); + rvalue = system(QString("cat %1/content.xml | sed -re 's!\\.\\./([a-zA-Z0-9])!Pictures/\\1!g' " + ">> %1/tmp.xml").arg(tmp_dir).toAscii().constData()); d.mkdir(tmp_dir + "/Pictures"); d.rename(dir + "/*.png", tmp_dir + "/Pictures/"); @@ -227,7 +231,7 @@ int main(int argc, char **argv) d.cd(tmp_dir); qDebug() << "zip zip.odt -r * > /dev/null"; - system("zip zip.odt -r * > /dev/null"); + rvalue = system("zip zip.odt -r * > /dev/null"); QFile::copy("zip.odt", argv[4]); d.cd(cur_dir); -- 1.7.2.5

1 0

olena-2.0-395-g28448a6 tests/trait/op/plus.cc: Kill warnings.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- milena/ChangeLog | 4 ++++ milena/tests/trait/op/plus.cc | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bba5d19..3170851 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/trait/op/plus.cc: Kill warnings. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/magick/internal/init_magick.hh: Add a missing inline. 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/tests/trait/op/plus.cc b/milena/tests/trait/op/plus.cc index 6639a43..01c6eb3 100644 --- a/milena/tests/trait/op/plus.cc +++ b/milena/tests/trait/op/plus.cc @@ -102,12 +102,12 @@ namespace mln template <typename T, typename U> struct set_precise_binary_< op::plus, my_image2d<T>, my_image2d<U> > { - typedef mln_trait_op_plus(T, U) V; + typedef mln_trait_op_plus(T, U) V; typedef my_image2d<V>& ret; }; } - + } int main() @@ -116,11 +116,13 @@ int main() { mln_trait_op_plus_(int, float) tmp; tmp = 5.1f; + (void) tmp; } { my_image2d<float> ima; my_image2d<float>* ptr = &ima; mln_trait_op_plus_(my_image2d<int>, my_image2d<float>) tmp = *ptr; tmp.m(); + (void) tmp; } } -- 1.7.2.5

1 0

olena-2.0-394-gce98413 mln/io/magick/internal/init_magick.hh: Add a missing inline.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- milena/ChangeLog | 4 ++++ milena/mln/io/magick/internal/init_magick.hh | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c979c59..bba5d19 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/magick/internal/init_magick.hh: Add a missing inline. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Make fld tests write in different files. * tests/io/fld/fld1d.cc, diff --git a/milena/mln/io/magick/internal/init_magick.hh b/milena/mln/io/magick/internal/init_magick.hh index 35a64a2..a17e285 100644 --- a/milena/mln/io/magick/internal/init_magick.hh +++ b/milena/mln/io/magick/internal/init_magick.hh @@ -51,6 +51,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline init_magick::init_magick() { Magick::InitializeMagick(0); -- 1.7.2.5

1 0

olena-2.0-393-g3570351 Make fld tests write in different files.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* tests/io/fld/fld1d.cc, * tests/io/fld/fld2d.cc, * tests/io/fld/fld3d.cc: Write in different files to allow those tests to be run simultaneously. --- milena/ChangeLog | 9 +++++++++ milena/tests/io/fld/fld1d.cc | 9 +++++---- milena/tests/io/fld/fld2d.cc | 21 +++++++++++---------- milena/tests/io/fld/fld3d.cc | 9 +++++---- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa4dc0d..c979c59 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Make fld tests write in different files. + + * tests/io/fld/fld1d.cc, + * tests/io/fld/fld2d.cc, + * tests/io/fld/fld3d.cc: Write in different files to allow those + tests to be run simultaneously. + +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> diff --git a/milena/tests/io/fld/fld1d.cc b/milena/tests/io/fld/fld1d.cc index 00dbf29..9792bd6 100644 --- a/milena/tests/io/fld/fld1d.cc +++ b/milena/tests/io/fld/fld1d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,11 +48,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out1d.fld"); + io::fld::load(test, "out1d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out1d.fld"); mln_assertion(ori == test); } diff --git a/milena/tests/io/fld/fld2d.cc b/milena/tests/io/fld/fld2d.cc index 0ab7aa7..33943dd 100644 --- a/milena/tests/io/fld/fld2d.cc +++ b/milena/tests/io/fld/fld2d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,11 +55,11 @@ int main() image2d<int_u8> ori, test; io::pgm::load(ori, MLN_IMG_DIR "/lena.pgm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -69,11 +70,11 @@ int main() image2d<int_u16> ori, test; io::ppm::load(ori, MLN_IMG_DIR "/lena_16.ppm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -92,11 +93,11 @@ int main() ori(p) = random() / RAND_MAX; } - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); { mln_piter_(image2d<float>) p(domain); diff --git a/milena/tests/io/fld/fld3d.cc b/milena/tests/io/fld/fld3d.cc index 2813607..525241d 100644 --- a/milena/tests/io/fld/fld3d.cc +++ b/milena/tests/io/fld/fld3d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,11 +50,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out3d.fld"); + io::fld::load(test, "out3d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out3d.fld"); mln_assertion(ori == test); } -- 1.7.2.5

1 0

olena-2.0-399-g4b98621 Make use of mln_trace_warning in Scribo.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* scribo/canvas/integral_browsing.hh, * scribo/filter/internal/alignment_angle.hh, * scribo/io/img/save.hh, * scribo/io/xml/save.hh, * scribo/make/debug_filename.hh, * scribo/primitive/extract/alignments.hh, * scribo/primitive/link/internal/compute_anchor.hh: Here. --- scribo/ChangeLog | 12 ++++++++++++ scribo/scribo/canvas/integral_browsing.hh | 12 +++++++----- scribo/scribo/filter/internal/alignment_angle.hh | 8 ++++---- scribo/scribo/io/img/save.hh | 4 ++-- scribo/scribo/io/xml/save.hh | 3 ++- scribo/scribo/make/debug_filename.hh | 2 +- scribo/scribo/primitive/extract/alignments.hh | 7 ++++--- .../primitive/link/internal/compute_anchor.hh | 4 ++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 47b0cad..e0d0731 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of mln_trace_warning in Scribo. + + * scribo/canvas/integral_browsing.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/io/img/save.hh, + * scribo/io/xml/save.hh, + * scribo/make/debug_filename.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Here. + +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove last references to mln::trace::*. * demo/xml2doc/main.cc, diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 51cbdf6..c554eaf 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -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. @@ -94,16 +94,18 @@ namespace scribo w = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); if (! (w % 2)) --w; - trace::warning("integral_browsing - Adjusting window width since it" - " was larger than image height."); + mln_trace_warning("integral_browsing - " + "Adjusting window width since it" + " was larger than image height."); } if (h > (ima.domain().nrows() - ima.border())) { h = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); if (! (h % 2)) --h; - trace::warning("integral_browsing - Adjusting window height since it" - " was larger than image width."); + mln_trace_warning("integral_browsing - " + "Adjusting window height since it" + " was larger than image width."); } diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index fcbb892..9b0acd5 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.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. // @@ -161,8 +161,8 @@ namespace scribo break; default: - trace::warning("scribo::filter::internal::alignment_angle," - " Invalid anchor value... Aborting computation."); + mln_trace_warning("scribo::filter::internal::alignment_angle," + " Invalid anchor value... Aborting computation."); } return result; diff --git a/scribo/scribo/io/img/save.hh b/scribo/scribo/io/img/save.hh index 07638ea..5b3da6a 100644 --- a/scribo/scribo/io/img/save.hh +++ b/scribo/scribo/io/img/save.hh @@ -237,8 +237,8 @@ namespace scribo break; default: - trace::warning("scribo::io::img::save - " - "Invalid image format! Skip saving..."); + mln_trace_warning("scribo::io::img::save - " + "Invalid image format! Skip saving..."); return; } diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index cfd0a31..29b722f 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -159,7 +159,8 @@ namespace scribo # endif // ! HAVE_QT default: - trace::warning("scribo::io::xml::save - Invalid XML format! Skip saving..."); + mln_trace_warning("scribo::io::xml::save - " + "Invalid XML format! Skip saving..."); } output.close(); diff --git a/scribo/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh index f7d9b67..95e60b5 100644 --- a/scribo/scribo/make/debug_filename.hh +++ b/scribo/scribo/make/debug_filename.hh @@ -82,7 +82,7 @@ namespace scribo if (! internal::debug_filename_prefix.empty()) os << internal::debug_filename_prefix << "_"; else - mln::trace::warning("You may like to set a default filename prefix."); + mln_trace_warning("You may like to set a default filename prefix."); if (file_id < 10) os << "0"; diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 4d8c9ad..27e2ad6 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -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. // @@ -319,7 +320,7 @@ namespace scribo } default: - trace::warning("anchor not handled!"); + mln_trace_warning("anchor not handled!"); } return false; @@ -422,7 +423,7 @@ namespace scribo } default: - trace::warning("anchor not handled!"); + mln_trace_warning("anchor not handled!"); } return false; diff --git a/scribo/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh index 9afc33f..c7c9592 100644 --- a/scribo/scribo/primitive/link/internal/compute_anchor.hh +++ b/scribo/scribo/primitive/link/internal/compute_anchor.hh @@ -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. @@ -258,7 +258,7 @@ namespace scribo default: - trace::warning("Non handled anchor"); + mln_trace_warning("Non handled anchor"); mln_assertion(anchor < anchor::Invalid); } -- 1.7.2.5

1 0

olena-2.0-398-g1995b37 Remove last references to mln::trace::*.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* demo/xml2doc/main.cc, * scribo/make/debug_filename.hh, * scribo/primitive/identify.hh, * src/afp/regroup.hh, * src/misc/negate.cc, * src/misc/superpose.cc, * src/preprocessing/split_bg_fg.cc, * src/preprocessing/unskew.cc: Here. --- scribo/ChangeLog | 13 +++++++++++++ scribo/demo/xml2doc/main.cc | 1 - scribo/scribo/make/debug_filename.hh | 6 +++--- scribo/scribo/primitive/identify.hh | 7 ++++--- scribo/src/afp/regroup.hh | 5 +++-- scribo/src/misc/negate.cc | 6 +++--- scribo/src/misc/superpose.cc | 6 +++--- scribo/src/preprocessing/split_bg_fg.cc | 2 +- scribo/src/preprocessing/unskew.cc | 6 +++--- 9 files changed, 33 insertions(+), 19 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6bf0607..47b0cad 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove last references to mln::trace::*. + + * demo/xml2doc/main.cc, + * scribo/make/debug_filename.hh, + * scribo/primitive/identify.hh, + * src/afp/regroup.hh, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/preprocessing/split_bg_fg.cc, + * src/preprocessing/unskew.cc: Here. + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> Make use of mln_trace. diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 368e52d..5de03b4 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -23,7 +23,6 @@ #undef MLN_WO_GLOBAL_VARS #include <mln/core/image/image2d.hh> -#include <mln/trace/all.hh> #include "xml_transform.hh" diff --git a/scribo/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh index f3b4962..f7d9b67 100644 --- a/scribo/scribo/make/debug_filename.hh +++ b/scribo/scribo/make/debug_filename.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,8 +32,7 @@ /// Construct and returns a formated output file name. # include <sstream> -# include <mln/trace/all.hh> - +# include <mln/debug/trace.hh> namespace scribo { diff --git a/scribo/scribo/primitive/identify.hh b/scribo/scribo/primitive/identify.hh index 59678b1..f15b495 100644 --- a/scribo/scribo/primitive/identify.hh +++ b/scribo/scribo/primitive/identify.hh @@ -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. // @@ -32,7 +33,7 @@ ...) */ -# include <mln/trace/all.hh> +# include <mln/debug/trace.hh> # include <scribo/core/component_set.hh> namespace scribo @@ -45,7 +46,7 @@ namespace scribo component_set<L> identify(const component_set<L> comps) { - mln::mln_trace("scribo::primitive::identify"); + mln_trace("scribo::primitive::identify"); mln_assertion(comps.is_valid()); diff --git a/scribo/src/afp/regroup.hh b/scribo/src/afp/regroup.hh index aacde7e..3b108ad 100644 --- a/scribo/src/afp/regroup.hh +++ b/scribo/src/afp/regroup.hh @@ -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. // @@ -53,7 +54,7 @@ namespace scribo const object_groups<L>& groups, unsigned dmax) { - trace::entering("scribo::primitive::group::regroup_left"); + mln_trace("scribo::primitive::group::regroup_left"); mln_precondition(groups.is_valid()); diff --git a/scribo/src/misc/negate.cc b/scribo/src/misc/negate.cc index 0a1f48c..3b2fd55 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.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. // @@ -40,7 +40,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 3) diff --git a/scribo/src/misc/superpose.cc b/scribo/src/misc/superpose.cc index 47072d2..78c4aaf 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.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. // @@ -43,7 +43,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 4) diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index b5ba7cc..a2871bf 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::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 6) diff --git a/scribo/src/preprocessing/unskew.cc b/scribo/src/preprocessing/unskew.cc index 58eb0a1..7636d30 100644 --- a/scribo/src/preprocessing/unskew.cc +++ b/scribo/src/preprocessing/unskew.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. // @@ -42,7 +42,7 @@ const char *args_desc[][2] = int main(int argc, char *argv[]) { - mln::mln_trace("main"); + mln_trace("main"); using namespace mln; if (argc != 3) -- 1.7.2.5

1 0

olena-2.0-397-ge45787c Introduce mln_trace_warning macro.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* mln/border/mirror.hh, * mln/canvas/labeling/blobs.hh, * mln/canvas/labeling/generic.hh, * mln/canvas/labeling/sorted.hh, * mln/canvas/labeling/video.hh, * mln/data/stretch.hh, * mln/debug/put_word.hh, * mln/debug/trace.hh, * mln/draw/dashed_line.hh, * mln/draw/line.hh, * mln/labeling/colorize.hh, * mln/subsampling/antialiased.hh: Make use of this macro here. --- milena/ChangeLog | 17 +++++++++++++++++ milena/mln/border/mirror.hh | 2 +- milena/mln/canvas/labeling/blobs.hh | 2 +- milena/mln/canvas/labeling/generic.hh | 2 +- milena/mln/canvas/labeling/sorted.hh | 2 +- milena/mln/canvas/labeling/video.hh | 2 +- milena/mln/data/stretch.hh | 2 +- milena/mln/debug/put_word.hh | 2 +- milena/mln/debug/trace.hh | 10 ++++++++++ milena/mln/draw/dashed_line.hh | 4 ++-- milena/mln/draw/line.hh | 4 ++-- milena/mln/labeling/colorize.hh | 2 +- milena/mln/subsampling/antialiased.hh | 2 +- 13 files changed, 40 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 39d46b9..48577a2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce mln_trace_warning macro. + + * mln/border/mirror.hh, + * mln/canvas/labeling/blobs.hh, + * mln/canvas/labeling/generic.hh, + * mln/canvas/labeling/sorted.hh, + * mln/canvas/labeling/video.hh, + * mln/data/stretch.hh, + * mln/debug/put_word.hh, + * mln/debug/trace.hh, + * mln/draw/dashed_line.hh, + * mln/draw/line.hh, + * mln/labeling/colorize.hh, + * mln/subsampling/antialiased.hh: Make use of this macro here. + +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove last references to mln::trace::*. * mln/arith/min.hh, diff --git a/milena/mln/border/mirror.hh b/milena/mln/border/mirror.hh index 390f581..89a132d 100644 --- a/milena/mln/border/mirror.hh +++ b/milena/mln/border/mirror.hh @@ -197,7 +197,7 @@ namespace mln inline void mirror_(const box3d&, const I& ima) { - debug::trace::warning("border::mirror for 3D image is not implemented," + mln_trace_warning("border::mirror for 3D image is not implemented," " so image borders have not been mirrored!"); (void) ima; // FIXME write it! diff --git a/milena/mln/canvas/labeling/blobs.hh b/milena/mln/canvas/labeling/blobs.hh index 1a30886..7f962db 100644 --- a/milena/mln/canvas/labeling/blobs.hh +++ b/milena/mln/canvas/labeling/blobs.hh @@ -120,7 +120,7 @@ namespace mln // Label this point component. if (nlabels == mln_max(L)) { - debug::trace::warning("labeling aborted! Too many labels \ + mln_trace_warning("labeling aborted! Too many labels \ for this label type: nlabels > max(label_type)."); return output; diff --git a/milena/mln/canvas/labeling/generic.hh b/milena/mln/canvas/labeling/generic.hh index 19aad51..12a4de3 100644 --- a/milena/mln/canvas/labeling/generic.hh +++ b/milena/mln/canvas/labeling/generic.hh @@ -161,7 +161,7 @@ namespace mln if (nlabels == mln_max(L)) { status = false; - debug::trace::warning("labeling aborted! Too many labels \ + mln_trace_warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); diff --git a/milena/mln/canvas/labeling/sorted.hh b/milena/mln/canvas/labeling/sorted.hh index 89ebc82..ff7c97e 100644 --- a/milena/mln/canvas/labeling/sorted.hh +++ b/milena/mln/canvas/labeling/sorted.hh @@ -172,7 +172,7 @@ namespace mln { if (nlabels == mln_max(L)) { - debug::trace::warning("labeling aborted! Too many labels \ + mln_trace_warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); return output; diff --git a/milena/mln/canvas/labeling/video.hh b/milena/mln/canvas/labeling/video.hh index 8d3c65f..0b840a6 100644 --- a/milena/mln/canvas/labeling/video.hh +++ b/milena/mln/canvas/labeling/video.hh @@ -159,7 +159,7 @@ namespace mln { if (nlabels == mln_max(L)) { - debug::trace::warning("labeling aborted! Too many labels for \ + mln_trace_warning("labeling aborted! Too many labels for \ this label type: nlabels > \ max(label_type)."); return output; diff --git a/milena/mln/data/stretch.hh b/milena/mln/data/stretch.hh index 1288376..5b36dbe 100644 --- a/milena/mln/data/stretch.hh +++ b/milena/mln/data/stretch.hh @@ -111,7 +111,7 @@ namespace mln else { initialize(output, input); - debug::trace::warning("output has no significative data!"); + mln_trace_warning("output has no significative data!"); } return output; diff --git a/milena/mln/debug/put_word.hh b/milena/mln/debug/put_word.hh index 335baf0..c91700e 100644 --- a/milena/mln/debug/put_word.hh +++ b/milena/mln/debug/put_word.hh @@ -66,7 +66,7 @@ namespace mln word_end.last_coord() = static_cast<def::coord>(word_end.last_coord() + word.length() - 1); if (! inout.has(word_end)) - debug::trace::warning("Cannot write text outside the image domain"); + mln_trace_warning("Cannot write text outside the image domain"); const unsigned n = word.length(); point2d p = word_start; diff --git a/milena/mln/debug/trace.hh b/milena/mln/debug/trace.hh index 07e9c5e..bddd8a1 100644 --- a/milena/mln/debug/trace.hh +++ b/milena/mln/debug/trace.hh @@ -40,6 +40,8 @@ mln::debug::trace mln_trace_(S); \ (void) mln_trace_; +# define mln_trace_warning(S) \ + mln::debug::trace::warning(S); namespace mln { @@ -61,6 +63,9 @@ namespace mln void my_function() { mln_trace("mln::my_function"); + + /// Your code + /// .... } } \endcode @@ -117,6 +122,7 @@ namespace mln // Implementations. + inline trace::trace(const std::string& scope) { if (quiet) @@ -136,6 +142,7 @@ namespace mln } + inline trace::~trace() { if (quiet) @@ -179,12 +186,14 @@ namespace mln } + inline void trace::resume() { quiet = is_quiet_; } + inline void trace::stop() { is_quiet_ = quiet; @@ -193,6 +202,7 @@ namespace mln } + inline void trace::warning(const std::string& message) { std::cerr << "Warning: " << message << std::endl; diff --git a/milena/mln/draw/dashed_line.hh b/milena/mln/draw/dashed_line.hh index c9fe6b7..d26559b 100644 --- a/milena/mln/draw/dashed_line.hh +++ b/milena/mln/draw/dashed_line.hh @@ -99,9 +99,9 @@ namespace mln mln_precondition(ima.is_valid()); if (! ima.has(beg)) - debug::trace::warning("Begin site is not part of the given image."); + mln_trace_warning("Begin site is not part of the given image."); if (! ima.has(end)) - debug::trace::warning("End site is not part of the given image."); + mln_trace_warning("End site is not part of the given image."); data::fill(((ima | p_line2d(beg, end)).rw() | internal::dashed_line_f<I, 1>()).rw(), v); } diff --git a/milena/mln/draw/line.hh b/milena/mln/draw/line.hh index 08c9920..fb2435f 100644 --- a/milena/mln/draw/line.hh +++ b/milena/mln/draw/line.hh @@ -78,9 +78,9 @@ namespace mln I& ima = exact(ima_); mln_precondition(ima.is_valid()); if (! ima.has(beg)) - debug::trace::warning("Begin site is not part of the given image."); + mln_trace_warning("Begin site is not part of the given image."); if (! ima.has(end)) - debug::trace::warning("End site is not part of the given image."); + mln_trace_warning("End site is not part of the given image."); data::paste(pw::cst(v) | p_line2d(beg, end), safe(ima).rw()); } diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index a3e8f5c..52a76fd 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -144,7 +144,7 @@ namespace mln if (ntries == nelements) { - debug::trace::warning("labeling::colorize - Can't find a new unique color. Returning black."); + mln_trace_warning("labeling::colorize - Can't find a new unique color. Returning black."); return literal::black; } diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index 169eb0b..378f452 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -409,7 +409,7 @@ namespace mln output_domain, border_thickness); else - debug::trace::warning("Not implemented yet."); + mln_trace_warning("Not implemented yet."); mln_concrete(I) output; return output; -- 1.7.2.5

1 0

olena-2.0-396-g3164abc Remove last references to mln::trace::*.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* mln/arith/min.hh, * mln/clustering/kmean_rgb.hh, * mln/world/rgb/invert.spe.hh: Remove duplicate references to mln_trace. * tests/data/fill_with_image.cc, * tests/data/paste.cc, * tests/linear/gaussian.cc, * tests/opt/at.cc, * tests/opt/element.cc, * tests/opt/value.cc: Remove useless include. * tests/unit_test/unit-tests.mk: Remove mln_trace_* tests. --- milena/ChangeLog | 18 ++++++++++++++++++ milena/mln/arith/min.hh | 5 ++--- milena/mln/clustering/kmean_rgb.hh | 7 ------- milena/mln/world/rgb/invert.spe.hh | 4 ++-- milena/tests/data/fill_with_image.cc | 4 ++-- milena/tests/data/paste.cc | 4 ++-- milena/tests/linear/gaussian.cc | 6 ++---- milena/tests/opt/at.cc | 4 ++-- milena/tests/opt/element.cc | 4 ++-- milena/tests/opt/value.cc | 5 ++--- milena/tests/unit_test/unit-tests.mk | 8 -------- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ecc35ee..39d46b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove last references to mln::trace::*. + + * mln/arith/min.hh, + * mln/clustering/kmean_rgb.hh, + * mln/world/rgb/invert.spe.hh: Remove duplicate references to + mln_trace. + + * tests/data/fill_with_image.cc, + * tests/data/paste.cc, + * tests/linear/gaussian.cc, + * tests/opt/at.cc, + * tests/opt/element.cc, + * tests/opt/value.cc: Remove useless include. + + * tests/unit_test/unit-tests.mk: Remove mln_trace_* tests. + 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove deprecated trace system. diff --git a/milena/mln/arith/min.hh b/milena/mln/arith/min.hh index cb2c165..4a6706e 100644 --- a/milena/mln/arith/min.hh +++ b/milena/mln/arith/min.hh @@ -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. // @@ -82,8 +83,6 @@ namespace mln mln_piter(L) p(lhs.domain()); for_all(p) output(p) = lhs(p) < rhs(p) ? lhs(p) : rhs(p); - - mln_trace("data::arith::generic::min_"); } template <typename L, typename R> diff --git a/milena/mln/clustering/kmean_rgb.hh b/milena/mln/clustering/kmean_rgb.hh index 18265ae..f030040 100644 --- a/milena/mln/clustering/kmean_rgb.hh +++ b/milena/mln/clustering/kmean_rgb.hh @@ -698,14 +698,12 @@ namespace mln while (_current_launching < _n_times) { // BEGIN LAUNCH ONE TIME - mln_trace("Launch one time"); { t_result1d old_variance = mln_max(t_result1d); _within_variance = mln_max(t_result1d); _current_step = 0; // BEGIN INIT_MEAN - mln_trace("init mean"); { t_value_comp0 min_comp0 = mln_min(t_value_comp0); t_value_comp0 max_comp0 = mln_max(t_value_comp0); @@ -726,7 +724,6 @@ namespace mln // UPDATE DISTANCE - mln_trace("update distance"); for (unsigned i = 0; i < _k_center; ++i) { @@ -754,7 +751,6 @@ namespace mln old_variance = _within_variance; // BEGIN UPDATE GROUP - mln_trace("update group"); { mln_piter(t_group_img) rgb(_group.domain()); @@ -780,7 +776,6 @@ namespace mln // END UPDATE GROUP // BEGIN UPDATE MEAN - mln_trace("update mean"); { mln_eiter(t_number_img) en(_number); mln_eiter(t_mean_img) em(_mean); @@ -821,7 +816,6 @@ namespace mln break; // UPDATE DISTANCE - mln_trace("update distance"); for (unsigned i = 0; i < _k_center; ++i) { @@ -840,7 +834,6 @@ namespace mln // END UPDATE DISTANCE // BEGIN UPDATE VARIANCE - mln_trace("update variance"); { _within_variance = literal::zero; mln_eiter(t_variance_img) l(_variance); diff --git a/milena/mln/world/rgb/invert.spe.hh b/milena/mln/world/rgb/invert.spe.hh index a63c996..27d87c4 100644 --- a/milena/mln/world/rgb/invert.spe.hh +++ b/milena/mln/world/rgb/invert.spe.hh @@ -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. // @@ -78,7 +79,6 @@ namespace mln op.val().blue() = mln_min(Blue) + (mln_max(Blue) - ip.val().blue()); } - mln_trace("world::rgb::impl::invert_rgb_fastest"); } diff --git a/milena/tests/data/fill_with_image.cc b/milena/tests/data/fill_with_image.cc index b995ee9..2fd8e30 100644 --- a/milena/tests/data/fill_with_image.cc +++ b/milena/tests/data/fill_with_image.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. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/data/paste.cc b/milena/tests/data/paste.cc index e4b1828..b79fd4d 100644 --- a/milena/tests/data/paste.cc +++ b/milena/tests/data/paste.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. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/linear/gaussian.cc b/milena/tests/linear/gaussian.cc index e18959e..7862fc2 100644 --- a/milena/tests/linear/gaussian.cc +++ b/milena/tests/linear/gaussian.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. // @@ -39,8 +39,6 @@ #include "tests/data.hh" -#include <mln/trace/all.hh> - int main() diff --git a/milena/tests/opt/at.cc b/milena/tests/opt/at.cc index 549ab3d..73d573e 100644 --- a/milena/tests/opt/at.cc +++ b/milena/tests/opt/at.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,6 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/opt/element.cc b/milena/tests/opt/element.cc index 2236d45..aa2355f 100644 --- a/milena/tests/opt/element.cc +++ b/milena/tests/opt/element.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -25,7 +26,6 @@ #include <mln/opt/element.hh> #include <mln/core/image/image2d.hh> -#include <mln/trace/all.hh> int main() diff --git a/milena/tests/opt/value.cc b/milena/tests/opt/value.cc index ba044fa..8324b1a 100644 --- a/milena/tests/opt/value.cc +++ b/milena/tests/opt/value.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -27,8 +28,6 @@ #include <mln/core/image/flat_image.hh> #include <mln/core/alias/box2d.hh> -#include <mln/trace/all.hh> - int main() { diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 1817969..fe36139 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1109,14 +1109,6 @@ mln_topo_skeleton_breadth_first_thinning \ mln_topo_skeleton_crest \ mln_topo_skeleton_is_simple_point \ mln_topo_static_n_face_iter \ -mln_trace_all \ -mln_trace_entering \ -mln_trace_essential \ -mln_trace_exiting \ -mln_trace_quiet \ -mln_trace_resume \ -mln_trace_stop \ -mln_trace_warning \ mln_trait_accumulator_print \ mln_trait_accumulator_props \ mln_trait_accumulators \ -- 1.7.2.5

1 0

branch sandbox/anthony updated: olena-2.0-391-g5991f6a
by git＠lrde.epita.fr 19 Mar '13

19 Mar '13

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 sandbox/anthony has been updated via 5991f6ae98c5808deb04d4c611ff86b5fb846c3f (commit) from 5b84ea4fa7255c8b8da3a2a03b397b8ee0dbf141 (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 ----------------------------------------------------------------- 5991f6a [ICDAR] Handle reverse video ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/Makefile | 4 +- scribo/sandbox/icdar_13_table/TODO | 2 + scribo/sandbox/icdar_13_table/src/new.cc | 61 ++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 18 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0