Commit 6a5f908a authored by Roland Levillain's avatar Roland Levillain
Browse files

Address remaining errors reported by clang++ in Scribo.

	* scribo/debug/alignment_decision_image.hh
	(alignment_decision_image)
	* scribo/debug/bboxes_enlarged_image.hh (bboxes_enlarged_image)
	* scribo/debug/decision_image.hh (decision_image)
	* scribo/debug/links_decision_image.hh (links_decision_image)
	* scribo/debug/links_image.hh (links_image)
	* scribo/debug/looks_like_a_text_line_image.hh
	(looks_like_a_text_line_image):
	Fix the type of the value to be returned by theses functions.
parent 8ae6c4cd
2013-02-06 Roland Levillain <roland@lrde.epita.fr>
Address remaining errors reported by clang++ in Scribo.
* scribo/debug/alignment_decision_image.hh
(alignment_decision_image)
* scribo/debug/bboxes_enlarged_image.hh (bboxes_enlarged_image)
* scribo/debug/decision_image.hh (decision_image)
* scribo/debug/links_decision_image.hh (links_decision_image)
* scribo/debug/links_image.hh (links_image)
* scribo/debug/looks_like_a_text_line_image.hh
(looks_like_a_text_line_image):
Fix the type of the value to be returned by theses functions.
2013-02-06 Roland Levillain <roland@lrde.epita.fr> 2013-02-06 Roland Levillain <roland@lrde.epita.fr>
Address errors reported by clang++ in Scribo. Address errors reported by clang++ in Scribo.
......
// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory // Copyright (C) 2009, 2011, 2013 EPITA Research and Development Laboratory
// (LRDE) // (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
...@@ -91,7 +91,7 @@ namespace scribo ...@@ -91,7 +91,7 @@ namespace scribo
mln_precondition(filtered_links.is_valid()); mln_precondition(filtered_links.is_valid());
/// Fixme: check that components has been computed from input. /// Fixme: check that components has been computed from input.
image2d<value::rgb8> mln_ch_value(I,value::rgb8)
decision_image = data::convert(value::rgb8(), input); decision_image = data::convert(value::rgb8(), input);
for_all_comps(i, components) for_all_comps(i, components)
......
// 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. // This file is part of Olena.
// //
...@@ -100,7 +100,7 @@ namespace scribo ...@@ -100,7 +100,7 @@ namespace scribo
trace::entering("scribo::debug::bboxes_enlarged_image"); trace::entering("scribo::debug::bboxes_enlarged_image");
mln_precondition(exact(input).is_valid()); mln_precondition(exact(input).is_valid());
image2d<value::rgb8> output = data::convert(value::rgb8(), input); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input);
for_all_lines(l, lines) for_all_lines(l, lines)
if (! lines(l).is_hidden()) if (! lines(l).is_hidden())
......
// Copyright (C) 2009, 2010, 2011 EPITA Research and Development // Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development
// Laboratory (LRDE) // Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
...@@ -111,7 +111,7 @@ namespace scribo ...@@ -111,7 +111,7 @@ namespace scribo
mln_precondition(filtered_groups.is_valid()); mln_precondition(filtered_groups.is_valid());
/// Fixme: check that components has been computed from input. /// Fixme: check that components has been computed from input.
image2d<value::rgb8> mln_ch_value(I,value::rgb8)
decision_image = data::convert(value::rgb8(), input); decision_image = data::convert(value::rgb8(), input);
for (unsigned i = 1; i < groups.size(); ++i) for (unsigned i = 1; i < groups.size(); ++i)
...@@ -144,7 +144,7 @@ namespace scribo ...@@ -144,7 +144,7 @@ namespace scribo
mln_precondition(filtered_links.is_valid()); mln_precondition(filtered_links.is_valid());
/// Fixme: check that components has been computed from input. /// Fixme: check that components has been computed from input.
image2d<value::rgb8> mln_ch_value(I,value::rgb8)
decision_image = data::convert(value::rgb8(), input); decision_image = data::convert(value::rgb8(), input);
for_all_comps(i, comps) for_all_comps(i, comps)
......
// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory // Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory
// (LRDE) // (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
...@@ -76,7 +76,7 @@ namespace scribo ...@@ -76,7 +76,7 @@ namespace scribo
mln_precondition(links.size() == filtered_links.size()); mln_precondition(links.size() == filtered_links.size());
/// Fixme: check that objects has been computed from input. /// Fixme: check that objects has been computed from input.
image2d<value::rgb8> mln_ch_value(I,value::rgb8)
links_decision_image = data::convert(value::rgb8(), input); links_decision_image = data::convert(value::rgb8(), input);
for_all_comps(i, comps) for_all_comps(i, comps)
......
// 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. // This file is part of Olena.
// //
...@@ -77,7 +77,7 @@ namespace scribo ...@@ -77,7 +77,7 @@ namespace scribo
const component_set<L>& comps = links.components(); const component_set<L>& comps = links.components();
image2d<value::rgb8> mln_ch_value(I,value::rgb8)
links_image = data::convert(value::rgb8(), input); links_image = data::convert(value::rgb8(), input);
if (draw_bboxes) if (draw_bboxes)
......
// 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. // This file is part of Olena.
// //
...@@ -94,7 +94,7 @@ namespace scribo ...@@ -94,7 +94,7 @@ namespace scribo
trace::entering("scribo::debug::looks_like_a_text_line_image"); trace::entering("scribo::debug::looks_like_a_text_line_image");
mln_precondition(exact(input).is_valid()); mln_precondition(exact(input).is_valid());
image2d<value::rgb8> output = data::convert(value::rgb8(), input); mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input);
for_all_lines(l, lines) for_all_lines(l, lines)
if (! lines(l).is_hidden()) if (! lines(l).is_hidden())
......
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