Commit 4b986216 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

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.
parent 1995b37c
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::*.
......
// 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.");
}
......
// 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;
......
......@@ -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;
}
......
......@@ -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();
......
......@@ -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";
......
// 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;
......
// 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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment