* 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. --- scribo/ChangeLog | 14 ++++++++++++++ scribo/scribo/debug/alignment_decision_image.hh | 4 ++-- scribo/scribo/debug/bboxes_enlarged_image.hh | 4 ++-- scribo/scribo/debug/decision_image.hh | 6 +++--- scribo/scribo/debug/links_decision_image.hh | 4 ++-- scribo/scribo/debug/links_image.hh | 4 ++-- .../scribo/debug/looks_like_a_text_line_image.hh | 4 ++-- 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1d0c69d..054429c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,19 @@ 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 + Address errors reported by clang++ in Scribo.

* scribo/io/text_boxes/save.hh, diff --git a/scribo/scribo/debug/alignment_decision_image.hh b/scribo/scribo/debug/alignment_decision_image.hh index 450091d..2e6f06a 100644 --- a/scribo/scribo/debug/alignment_decision_image.hh +++ b/scribo/scribo/debug/alignment_decision_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2009, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -91,7 +91,7 @@ namespace scribo mln_precondition(filtered_links.is_valid()); /// Fixme: check that components has been computed from input.

- image2dvalue::rgb8 + mln_ch_value(I,value::rgb8) decision_image = data::convert(value::rgb8(), input);

for_all_comps(i, components) diff --git a/scribo/scribo/debug/bboxes_enlarged_image.hh b/scribo/scribo/debug/bboxes_enlarged_image.hh index 24fea2f..102f458 100644 --- a/scribo/scribo/debug/bboxes_enlarged_image.hh +++ b/scribo/scribo/debug/bboxes_enlarged_image.hh @@ -1,4 +1,4 @@ -// 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. // @@ -100,7 +100,7 @@ namespace scribo trace::entering("scribo::debug::bboxes_enlarged_image"); mln_precondition(exact(input).is_valid());

- image2dvalue::rgb8 output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input);

for_all_lines(l, lines) if (! lines(l).is_hidden()) diff --git a/scribo/scribo/debug/decision_image.hh b/scribo/scribo/debug/decision_image.hh index ff298e6..f32e168 100644 --- a/scribo/scribo/debug/decision_image.hh +++ b/scribo/scribo/debug/decision_image.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. @@ -111,7 +111,7 @@ namespace scribo mln_precondition(filtered_groups.is_valid()); /// Fixme: check that components has been computed from input.

- image2dvalue::rgb8 + mln_ch_value(I,value::rgb8) decision_image = data::convert(value::rgb8(), input);

for (unsigned i = 1; i < groups.size(); ++i) @@ -144,7 +144,7 @@ namespace scribo mln_precondition(filtered_links.is_valid()); /// Fixme: check that components has been computed from input.

- image2dvalue::rgb8 + mln_ch_value(I,value::rgb8) decision_image = data::convert(value::rgb8(), input);

for_all_comps(i, comps) diff --git a/scribo/scribo/debug/links_decision_image.hh b/scribo/scribo/debug/links_decision_image.hh index 387cd7f..5c5a759 100644 --- a/scribo/scribo/debug/links_decision_image.hh +++ b/scribo/scribo/debug/links_decision_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -76,7 +76,7 @@ namespace scribo mln_precondition(links.size() == filtered_links.size()); /// Fixme: check that objects has been computed from input.

- image2dvalue::rgb8 + mln_ch_value(I,value::rgb8) links_decision_image = data::convert(value::rgb8(), input);

for_all_comps(i, comps) diff --git a/scribo/scribo/debug/links_image.hh b/scribo/scribo/debug/links_image.hh index 47394be..0c8b23a 100644 --- a/scribo/scribo/debug/links_image.hh +++ b/scribo/scribo/debug/links_image.hh @@ -1,4 +1,4 @@ -// 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. // @@ -77,7 +77,7 @@ namespace scribo

const component_set<L>& comps = links.components();

- image2dvalue::rgb8 + mln_ch_value(I,value::rgb8) links_image = data::convert(value::rgb8(), input);

if (draw_bboxes) 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 376baae..e4407e2 100644 --- a/scribo/scribo/debug/looks_like_a_text_line_image.hh +++ b/scribo/scribo/debug/looks_like_a_text_line_image.hh @@ -1,4 +1,4 @@ -// 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. // @@ -94,7 +94,7 @@ namespace scribo trace::entering("scribo::debug::looks_like_a_text_line_image"); mln_precondition(exact(input).is_valid());

- image2dvalue::rgb8 output = data::convert(value::rgb8(), input); + mln_ch_value(I,value::rgb8) output = data::convert(value::rgb8(), input);

for_all_lines(l, lines) if (! lines(l).is_hidden())