* 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. --- scribo/ChangeLog | 15 +++++++++++++++ scribo/scribo/io/text_boxes/save.hh | 4 ++-- scribo/scribo/primitive/extract/components.hh | 6 +++--- .../primitive/link/with_single_right_link.hh | 4 ++-- scribo/scribo/text/recognition.hh | 4 ++-- scribo/scribo/toolchain/content_in_doc.hh | 12 ++++++------ scribo/scribo/toolchain/content_in_hdoc.hh | 10 +++++----- scribo/scribo/toolchain/text_in_doc.hh | 10 +++++----- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 8 ++++---- scribo/scribo/toolchain/text_in_picture.hh | 6 +++--- 10 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4f5b9f..1d0c69d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +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

Work around an overload resolution problem reported by g++ 4.7. diff --git a/scribo/scribo/io/text_boxes/save.hh b/scribo/scribo/io/text_boxes/save.hh index 5bbf97b..1a7842f 100644 --- a/scribo/scribo/io/text_boxes/save.hh +++ b/scribo/scribo/io/text_boxes/save.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. // @@ -59,7 +59,7 @@ namespace scribo void save(const line_set<L>& lines, 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"); mln_precondition(lines.is_valid()); diff --git a/scribo/scribo/primitive/extract/components.hh b/scribo/scribo/primitive/extract/components.hh index fe2b523..45e0a47 100644 --- a/scribo/scribo/primitive/extract/components.hh +++ b/scribo/scribo/primitive/extract/components.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. @@ -97,7 +97,7 @@ namespace scribo component_set<mln_ch_value(I,V)> components(const Image<I>& input, const Image<J>& binary_input, const Neighborhood<N>& nbh, V& ncomponents, - component::Type type = component::Undefined) + component::Type type) { trace::entering("scribo::components");

@@ -123,7 +123,7 @@ namespace scribo component_set<mln_ch_value(I,V)> components(const Image<I>& binary_input, const Neighborhood<N>& nbh, V& ncomponents, - component::Type type = component::Undefined) + component::Type type) { trace::entering("scribo::components");

diff --git a/scribo/scribo/primitive/link/with_single_right_link.hh b/scribo/scribo/primitive/link/with_single_right_link.hh index bc7942b..195a84c 100644 --- a/scribo/scribo/primitive/link/with_single_right_link.hh +++ b/scribo/scribo/primitive/link/with_single_right_link.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. @@ -126,7 +126,7 @@ namespace scribo object_links<L> with_single_right_link(const component_set<L>& components, unsigned neighb_max_distance, - anchor::Type anchor = anchor::MassCenter) + anchor::Type anchor) { trace::entering("scribo::primitive::link::with_single_right_link");

diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 4795511..540a01c 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.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. @@ -218,7 +218,7 @@ namespace scribo void recognition(const Image<I>& line_, const char *language, - const std::string& output_file = std::string()) + const std::string& output_file) { trace::entering("scribo::text::recognition");

diff --git a/scribo/scribo/toolchain/content_in_doc.hh b/scribo/scribo/toolchain/content_in_doc.hh index 0d3430e..4a3f48c 100644 --- a/scribo/scribo/toolchain/content_in_doc.hh +++ b/scribo/scribo/toolchain/content_in_doc.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. // @@ -59,11 +59,11 @@ namespace scribo document<mln_ch_value(I, def::lbl_type)> content_in_doc(const Image<I>& input, const Image<J>& input_preproc, bool denoise, - bool find_line_seps = true, - bool find_whitespace_seps = true, - bool enable_ocr = true, - const std::string& language = std::string("eng"), - bool verbose = false) + bool find_line_seps, + bool find_whitespace_seps, + bool enable_ocr, + const std::string& language, + bool verbose) { mln_precondition(exact(input).is_valid()); mln_precondition(exact(input_preproc).is_valid()); diff --git a/scribo/scribo/toolchain/content_in_hdoc.hh b/scribo/scribo/toolchain/content_in_hdoc.hh index 97233d5..4b8b72a 100644 --- a/scribo/scribo/toolchain/content_in_hdoc.hh +++ b/scribo/scribo/toolchain/content_in_hdoc.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. // @@ -58,10 +58,10 @@ namespace scribo document<mln_ch_value(I, def::lbl_type)> content_in_hdoc(const Image<I>& input, const Image<J>& input_preproc, bool denoise, - bool find_line_seps = true, - bool find_whitespace_seps = true, - bool enable_ocr = true, - const std::string& language = std::string("eng")) + bool find_line_seps, + bool find_whitespace_seps, + bool enable_ocr, + const std::string& language) { mln_precondition(exact(input).is_valid()); mln_precondition(exact(input_preproc).is_valid()); diff --git a/scribo/scribo/toolchain/text_in_doc.hh b/scribo/scribo/toolchain/text_in_doc.hh index 960a22a..0d0ab9f 100644 --- a/scribo/scribo/toolchain/text_in_doc.hh +++ b/scribo/scribo/toolchain/text_in_doc.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. @@ -57,10 +57,10 @@ namespace scribo template <typename I> line_set<mln_ch_value(I, def::lbl_type)> text_in_doc(const Image<I>& input, bool denoise, - const std::string& language = std::string("eng"), - bool find_line_seps = true, - bool find_whitespace_seps = true, - bool verbose = false) + const std::string& language, + bool find_line_seps, + bool find_whitespace_seps, + bool verbose) { internal::text_in_doc_functor<I> f; f.enable_denoising = denoise; diff --git a/scribo/scribo/toolchain/text_in_doc_preprocess.hh b/scribo/scribo/toolchain/text_in_doc_preprocess.hh index 0a99487..a614996 100644 --- a/scribo/scribo/toolchain/text_in_doc_preprocess.hh +++ b/scribo/scribo/toolchain/text_in_doc_preprocess.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -117,7 +117,7 @@ namespace scribo template <typename I> mln_ch_value(I,bool) 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); } @@ -127,7 +127,7 @@ namespace scribo mln_ch_value(I,bool) text_in_doc_preprocess(const Image<I>& input_, bool enable_fg_bg, unsigned lambda, double K, - bool verbose = false) + bool verbose) { const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -146,7 +146,7 @@ namespace scribo template <typename I> mln_ch_value(I,bool) text_in_doc_preprocess(const Image<I>& input, unsigned lambda, - bool verbose = false) + bool verbose) { I tmp; return text_in_doc_preprocess(input, lambda, 0.34, true, tmp, verbose); diff --git a/scribo/scribo/toolchain/text_in_picture.hh b/scribo/scribo/toolchain/text_in_picture.hh index 8d05158..e588c45 100644 --- a/scribo/scribo/toolchain/text_in_picture.hh +++ b/scribo/scribo/toolchain/text_in_picture.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. @@ -57,8 +57,8 @@ namespace scribo component_set<mln_ch_value(I, def::lbl_type)> text_in_picture(const Image<I>& input_rgb_, bool bg_removal, bool multi_scale_bin, - unsigned max_dim_size = 0, unsigned lambda = 0, - bool verbose = false) + unsigned max_dim_size, unsigned lambda, + bool verbose) { trace::entering("scribo::toolchain::text_in_picture");