[Olena-patches] olena: olena-2.0-573-g26bb774 Provide default arguments in function declarations only.

* scribo/core/line_info.hh (scribo::line_info<L>::update_text) * scribo/text/recognition.hh (scribo::text::recognition): Here. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/core/line_info.hh | 6 +++--- scribo/scribo/text/recognition.hh | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b2860f1..c937a09 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2013-06-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Provide default arguments in function declarations only. + + * scribo/core/line_info.hh (scribo::line_info<L>::update_text) + * scribo/text/recognition.hh (scribo::text::recognition): + Here. + +2013-06-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Disable unused arguments. * scribo/binarization/internal/local_threshold_core.hh diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index bdbc18b..717590a 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -243,7 +243,7 @@ namespace scribo float text_confidence() const; const std::string& text() const; const std::string& html_text() const; - void update_text(const std::string& str, float confidence); + void update_text(const std::string& str, float confidence = 100.0f); bool is_valid() const; @@ -783,7 +783,7 @@ namespace scribo template <typename L> void - line_info<L>::update_text(const std::string& str, float confidence = 100.0) + line_info<L>::update_text(const std::string& str, float confidence) { data_->text_confidence_ = confidence; data_->text_ = str; diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index dad233b..a4db088 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -371,7 +371,7 @@ namespace scribo void recognition(const Image<I>& line_, const char *language, - const std::string& output_file = std::string()) + const std::string& output_file) { mln_trace("scribo::text::recognition"); -- 1.7.10.4