Commit f782485f authored by Roland Levillain's avatar Roland Levillain
Browse files

Address errors reported by clang++ in Scribo.

	* scribo/io/text_boxes/save.hh,
	* scribo/primitive/extract/components.hh,
	* scribo/primitive/link/with_single_right_link.hh,
	* scribo/text/recognition.hh,
	* scribo/toolchain/content_in_doc.hh,
	* scribo/toolchain/content_in_hdoc.hh,
	* scribo/toolchain/text_in_doc.hh,
	* scribo/toolchain/text_in_doc_preprocess.hh,
	* scribo/toolchain/text_in_picture.hh:
	Do not provide default arguments twice.
parent 1f8557cf
2013-02-06 Roland Levillain <roland@lrde.epita.fr>
Address errors reported by clang++ in Scribo.
* scribo/io/text_boxes/save.hh,
* scribo/primitive/extract/components.hh,
* scribo/primitive/link/with_single_right_link.hh,
* scribo/text/recognition.hh,
* scribo/toolchain/content_in_doc.hh,
* scribo/toolchain/content_in_hdoc.hh,
* scribo/toolchain/text_in_doc.hh,
* scribo/toolchain/text_in_doc_preprocess.hh,
* scribo/toolchain/text_in_picture.hh:
Do not provide default arguments twice.
2012-10-09 Roland Levillain <roland@lrde.epita.fr> 2012-10-09 Roland Levillain <roland@lrde.epita.fr>
Work around an overload resolution problem reported by g++ 4.7. Work around an overload resolution problem reported by g++ 4.7.
......
// 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.
// //
...@@ -59,7 +59,7 @@ namespace scribo ...@@ -59,7 +59,7 @@ namespace scribo
void void
save(const line_set<L>& lines, save(const line_set<L>& lines,
const std::string& output_name, const std::string& output_name,
const mln_site(L)& crop_shift = literal::origin) const mln_site(L)& crop_shift)
{ {
trace::entering("scribo::io::text_boxes:save"); trace::entering("scribo::io::text_boxes:save");
mln_precondition(lines.is_valid()); mln_precondition(lines.is_valid());
......
// 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.
...@@ -97,7 +97,7 @@ namespace scribo ...@@ -97,7 +97,7 @@ namespace scribo
component_set<mln_ch_value(I,V)> component_set<mln_ch_value(I,V)>
components(const Image<I>& input, const Image<J>& binary_input, components(const Image<I>& input, const Image<J>& binary_input,
const Neighborhood<N>& nbh, V& ncomponents, const Neighborhood<N>& nbh, V& ncomponents,
component::Type type = component::Undefined) component::Type type)
{ {
trace::entering("scribo::components"); trace::entering("scribo::components");
...@@ -123,7 +123,7 @@ namespace scribo ...@@ -123,7 +123,7 @@ namespace scribo
component_set<mln_ch_value(I,V)> component_set<mln_ch_value(I,V)>
components(const Image<I>& binary_input, components(const Image<I>& binary_input,
const Neighborhood<N>& nbh, V& ncomponents, const Neighborhood<N>& nbh, V& ncomponents,
component::Type type = component::Undefined) component::Type type)
{ {
trace::entering("scribo::components"); trace::entering("scribo::components");
......
// 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.
...@@ -126,7 +126,7 @@ namespace scribo ...@@ -126,7 +126,7 @@ namespace scribo
object_links<L> object_links<L>
with_single_right_link(const component_set<L>& components, with_single_right_link(const component_set<L>& components,
unsigned neighb_max_distance, unsigned neighb_max_distance,
anchor::Type anchor = anchor::MassCenter) anchor::Type anchor)
{ {
trace::entering("scribo::primitive::link::with_single_right_link"); trace::entering("scribo::primitive::link::with_single_right_link");
......
// 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.
...@@ -218,7 +218,7 @@ namespace scribo ...@@ -218,7 +218,7 @@ namespace scribo
void void
recognition(const Image<I>& line_, recognition(const Image<I>& line_,
const char *language, const char *language,
const std::string& output_file = std::string()) const std::string& output_file)
{ {
trace::entering("scribo::text::recognition"); trace::entering("scribo::text::recognition");
......
// 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.
// //
...@@ -59,11 +59,11 @@ namespace scribo ...@@ -59,11 +59,11 @@ namespace scribo
document<mln_ch_value(I, def::lbl_type)> document<mln_ch_value(I, def::lbl_type)>
content_in_doc(const Image<I>& input, const Image<J>& input_preproc, content_in_doc(const Image<I>& input, const Image<J>& input_preproc,
bool denoise, bool denoise,
bool find_line_seps = true, bool find_line_seps,
bool find_whitespace_seps = true, bool find_whitespace_seps,
bool enable_ocr = true, bool enable_ocr,
const std::string& language = std::string("eng"), const std::string& language,
bool verbose = false) bool verbose)
{ {
mln_precondition(exact(input).is_valid()); mln_precondition(exact(input).is_valid());
mln_precondition(exact(input_preproc).is_valid()); mln_precondition(exact(input_preproc).is_valid());
......
// 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.
// //
...@@ -58,10 +58,10 @@ namespace scribo ...@@ -58,10 +58,10 @@ namespace scribo
document<mln_ch_value(I, def::lbl_type)> document<mln_ch_value(I, def::lbl_type)>
content_in_hdoc(const Image<I>& input, const Image<J>& input_preproc, content_in_hdoc(const Image<I>& input, const Image<J>& input_preproc,
bool denoise, bool denoise,
bool find_line_seps = true, bool find_line_seps,
bool find_whitespace_seps = true, bool find_whitespace_seps,
bool enable_ocr = true, bool enable_ocr,
const std::string& language = std::string("eng")) const std::string& language)
{ {
mln_precondition(exact(input).is_valid()); mln_precondition(exact(input).is_valid());
mln_precondition(exact(input_preproc).is_valid()); mln_precondition(exact(input_preproc).is_valid());
......
// 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.
...@@ -57,10 +57,10 @@ namespace scribo ...@@ -57,10 +57,10 @@ namespace scribo
template <typename I> template <typename I>
line_set<mln_ch_value(I, def::lbl_type)> line_set<mln_ch_value(I, def::lbl_type)>
text_in_doc(const Image<I>& input, bool denoise, text_in_doc(const Image<I>& input, bool denoise,
const std::string& language = std::string("eng"), const std::string& language,
bool find_line_seps = true, bool find_line_seps,
bool find_whitespace_seps = true, bool find_whitespace_seps,
bool verbose = false) bool verbose)
{ {
internal::text_in_doc_functor<I> f; internal::text_in_doc_functor<I> f;
f.enable_denoising = denoise; f.enable_denoising = denoise;
......
// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory // Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory
// (LRDE) // (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
...@@ -117,7 +117,7 @@ namespace scribo ...@@ -117,7 +117,7 @@ namespace scribo
template <typename I> template <typename I>
mln_ch_value(I,bool) mln_ch_value(I,bool)
text_in_doc_preprocess(const Image<I>& input, bool enable_fg_bg, text_in_doc_preprocess(const Image<I>& input, bool enable_fg_bg,
bool verbose = false) bool verbose)
{ {
return text_in_doc_preprocess(input, enable_fg_bg, 0.34, verbose); return text_in_doc_preprocess(input, enable_fg_bg, 0.34, verbose);
} }
...@@ -127,7 +127,7 @@ namespace scribo ...@@ -127,7 +127,7 @@ namespace scribo
mln_ch_value(I,bool) mln_ch_value(I,bool)
text_in_doc_preprocess(const Image<I>& input_, bool enable_fg_bg, text_in_doc_preprocess(const Image<I>& input_, bool enable_fg_bg,
unsigned lambda, double K, unsigned lambda, double K,
bool verbose = false) bool verbose)
{ {
const I& input = exact(input_); const I& input = exact(input_);
mln_precondition(input.is_valid()); mln_precondition(input.is_valid());
...@@ -146,7 +146,7 @@ namespace scribo ...@@ -146,7 +146,7 @@ namespace scribo
template <typename I> template <typename I>
mln_ch_value(I,bool) mln_ch_value(I,bool)
text_in_doc_preprocess(const Image<I>& input, unsigned lambda, text_in_doc_preprocess(const Image<I>& input, unsigned lambda,
bool verbose = false) bool verbose)
{ {
I tmp; I tmp;
return text_in_doc_preprocess(input, lambda, 0.34, true, tmp, verbose); return text_in_doc_preprocess(input, lambda, 0.34, true, tmp, verbose);
......
// 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.
...@@ -57,8 +57,8 @@ namespace scribo ...@@ -57,8 +57,8 @@ namespace scribo
component_set<mln_ch_value(I, def::lbl_type)> component_set<mln_ch_value(I, def::lbl_type)>
text_in_picture(const Image<I>& input_rgb_, text_in_picture(const Image<I>& input_rgb_,
bool bg_removal, bool multi_scale_bin, bool bg_removal, bool multi_scale_bin,
unsigned max_dim_size = 0, unsigned lambda = 0, unsigned max_dim_size, unsigned lambda,
bool verbose = false) bool verbose)
{ {
trace::entering("scribo::toolchain::text_in_picture"); trace::entering("scribo::toolchain::text_in_picture");
......
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