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