June 2013 - Olena-patches

olena: olena-2.0-576-g056a7da scribo/text/recognition.hh: Aesthetic changes.
by Roland Levillain 25 Jun '13

25 Jun '13

--- scribo/ChangeLog | 4 + scribo/scribo/text/recognition.hh | 171 ++++++++++++++++++------------------- 2 files changed, 89 insertions(+), 86 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 412f271..bd66473 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-06-25 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/text/recognition.hh: Aesthetic changes. + +2013-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Restrict workaround-related locale changes to LC_NUMERIC. * scribo/text/recognition.hh: Here. diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index d74ae5c..00e18d5 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -38,9 +38,9 @@ # define HAVE_TESSERACT_2 # endif +# include <clocale> # include <ostream> -# include <clocale> # include <mln/core/image/dmorph/image_if.hh> # include <mln/core/concept/neighborhood.hh> @@ -79,13 +79,11 @@ namespace scribo namespace text { - using namespace mln; - /*! \brief Passes the text bboxes to Tesseract (OCR). \param[in] lines The lines of text. \param[in] language The language which should be recognized by - Tesseract. (fra, en, ...) + Tesseract. (fra, en, ...) \ingroup grpocr */ @@ -98,9 +96,9 @@ namespace scribo \param[in] line Image of text line. \param[in] language The language which should be recognized by - Tesseract. (fra, en, ...) + Tesseract. (fra, en, ...) \param[in] output_file If set, store the recognized text in - this file. + this file. \ingroup grpocr */ @@ -114,12 +112,15 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY - # ifdef HAVE_TESSERACT_2 + + template <typename L> void recognition(line_set<L>& lines, const char *language) { + using namespace mln; + mln_trace("scribo::text::recognition"); /* Tesseract is known to have issues while reading training @@ -142,8 +143,7 @@ namespace scribo typedef mln_ch_value(L,bool) I; - - /// Use text bboxes with Tesseract + /// Use text bboxes with Tesseract. for_all_lines(i, lines) { if (! lines(i).is_textline()) @@ -158,12 +158,13 @@ namespace scribo I text_ima(box); data::fill(text_ima, false); - // Careful : background is set to 'False' + // Careful: background is set to 'false'. const component_set<L>& comp_set = lines.components(); const L& lbl = comp_set.labeled_image(); - // Extract each character components to create the line image. - const mln::util::array<component_id_t>& comps = lines(i).component_ids(); + // Extract each character component to create the line image. + const mln::util::array<component_id_t>& comps = + lines(i).component_ids(); for_all_elements(e, lines(i).component_ids()) { unsigned comp_id = comps(e); @@ -192,10 +193,10 @@ namespace scribo // Recognize characters. char* s = TessBaseAPI::TesseractRect( (unsigned char*) line_image.buffer(), - sizeof (bool), // Pixel size. - line_image.ncols() * sizeof (bool), // Row_offset - 0, // Left - 0, // Top + sizeof (bool), // pixel size + line_image.ncols() * sizeof (bool), // row offset + 0, // left + 0, // top line_image.ncols(), // n cols line_image.nrows()); // n rows @@ -207,12 +208,11 @@ namespace scribo } // The string has been allocated by Tesseract. It must be released. - delete [] s; + delete[] s; } // Restore the default locale from the environment. setlocale(LC_NUMERIC, ""); - } @@ -222,6 +222,8 @@ namespace scribo const char *language, const std::string& output_file) { + using namespace mln; + mln_trace("scribo::text::recognition"); const I& line = exact(line_); @@ -252,52 +254,51 @@ namespace scribo // Recognize characters. char* s = TessBaseAPI::TesseractRect( (unsigned char*) text_ima.buffer(), - sizeof (bool), // Pixel size. - text_ima.ncols() * sizeof (bool), // Row_offset - 0, // Left - 0, // Top + sizeof (bool), // pixel size + text_ima.ncols() * sizeof (bool), // row offset + 0, // left + 0, // top text_ima.ncols(), // n cols text_ima.nrows()); // n rows - if (s != 0) + if (s != 0) { if (!output_file.empty()) - { - std::string str(s); - str = str.substr(0, str.length() - 1); - file << line.domain().bbox().pmin().row() - << " " - << line.domain().bbox().pmin().col() - << " " - << line.domain().bbox().pmax().row() - << " " - << line.domain().bbox().pmax().col() - << " " - << str; - } + { + std::string str(s); + str = str.substr(0, str.length() - 1); + file << line.domain().bbox().pmin().row() + << " " + << line.domain().bbox().pmin().col() + << " " + << line.domain().bbox().pmax().row() + << " " + << line.domain().bbox().pmax().col() + << " " + << str; + } } - // The string has been allocated by Tesseract. We must free it. - delete [] s; + // The string has been allocated by Tesseract. We must free it. + delete[] s; - if (!output_file.empty()) - file.close(); - - // See the above explanations about setlocale. - setlocale(LC_NUMERIC, ""); + if (!output_file.empty()) + file.close(); + // See the above explanations about setlocale. + setlocale(LC_NUMERIC, ""); } - # else // HAVE_TESSERACT_3 - template <typename L> void recognition(line_set<L>& lines, const char *language) { + using namespace mln; + mln_trace("scribo::text::recognition"); // See the above explanations about setlocale. @@ -314,8 +315,7 @@ namespace scribo typedef mln_ch_value(L,bool) I; - - /// Use text bboxes with Tesseract + // Use text bboxes with Tesseract. for_all_lines(i, lines) { if (! lines(i).is_textline()) @@ -332,12 +332,13 @@ namespace scribo I text_ima(box); data::fill(text_ima, false); - // Careful : background is set to 'False' + // Careful: background is set to 'false'. const component_set<L>& comp_set = lines.components(); const L& lbl = comp_set.labeled_image(); - // Extract each character components to create the line image. - const mln::util::array<component_id_t>& comps = lines(i).component_ids(); + // Extract each character component to create the line image. + const mln::util::array<component_id_t>& comps = + lines(i).component_ids(); for_all_elements(e, lines(i).component_ids()) { unsigned comp_id = comps(e); @@ -352,10 +353,11 @@ namespace scribo // Recognize characters. tess.SetImage( (unsigned char*) &text_ima(text_ima.domain().pmin()), - text_ima.ncols(), // n cols - text_ima.nrows(), // n rows - sizeof (bool), // Pixel size. - text_ima.ncols() * sizeof (bool) + 2 * text_ima.border()); // Row_offset + text_ima.ncols(), // n cols + text_ima.nrows(), // n rows + sizeof (bool), // pixel size + text_ima.ncols() * sizeof (bool) + + 2 * text_ima.border()); // row offset char *s = tess.GetUTF8Text(); if (s != 0) @@ -374,13 +376,14 @@ namespace scribo } - template <typename I> void recognition(const Image& line_, const char *language, const std::string& output_file) { + using namespace mln; + mln_trace("scribo::text::recognition"); const I& line = exact(line_); @@ -404,48 +407,44 @@ namespace scribo // Recognize characters. char* s = tess.TesseractRect( (unsigned char*) &line(line.domain().pmin()), - sizeof (bool), // Pixel size. - line.ncols() * sizeof (bool) + line.border() * 2, // Row_offset - 0, // Left - 0, // Top - line.ncols(), // n cols - line.nrows()); // n rows - - if (s != 0) + sizeof (bool), // pixel size + line.ncols() * sizeof (bool) + line.border() * 2, // row offset + 0, // left + 0, // top + line.ncols(), // n cols + line.nrows()); // n rows + + if (s != 0) { if (!output_file.empty()) - { - std::string str(s); - str = str.substr(0, str.length() - 1); - file << line.domain().bbox().pmin().row() - << " " - << line.domain().bbox().pmin().col() - << " " - << line.domain().bbox().pmax().row() - << " " - << line.domain().bbox().pmax().col() - << " " - << str; - } + { + std::string str(s); + str = str.substr(0, str.length() - 1); + file << line.domain().bbox().pmin().row() + << " " + << line.domain().bbox().pmin().col() + << " " + << line.domain().bbox().pmax().row() + << " " + << line.domain().bbox().pmax().col() + << " " + << str; + } } - // The string has been allocated by Tesseract. We must free it. - delete [] s; + // The string has been allocated by Tesseract. We must free it. + delete[] s; - if (!output_file.empty()) - file.close(); - - // Restore the default locale from the environment. - setlocale(LC_NUMERIC, ""); + if (!output_file.empty()) + file.close(); + // Restore the default locale from the environment. + setlocale(LC_NUMERIC, ""); } # endif // ! HAVE_TESSERACT_2 - - - # endif // ! MLN_INCLUDE_ONLY } // end of namespace scribo::text -- 1.7.10.4

1 0

olena: olena-2.0-575-ga594568 Restrict workaround-related locale changes to LC_NUMERIC.
by Roland Levillain 25 Jun '13

25 Jun '13

* scribo/text/recognition.hh: Here. --- scribo/ChangeLog | 6 ++++ scribo/scribo/text/recognition.hh | 60 +++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4b8d9be..412f271 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2013-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Restrict workaround-related locale changes to LC_NUMERIC. + + * scribo/text/recognition.hh: Here. + +2013-06-25 Roland Levillain <roland(a)lrde.epita.fr> + More locale-related Tesseract workarounds. * scribo/text/recognition.hh: Here. diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 614975b..d74ae5c 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -122,12 +122,20 @@ namespace scribo { mln_trace("scribo::text::recognition"); - // Tesseract is known to have issues while reading training data - // depending on the current locales in use. Training data files use - // float data and the decimal separator can be either '.' or ',' - // causing errors. - // Setting locale to "C" fix that issue. - setlocale(LC_ALL, "C"); + /* Tesseract is known to have issues while reading training + data, depending on the locale in use. Training data files + contain floating-point values and the decimal separator may + either be '.' or ',' which may trigger a fatal error with the + following message: + + Error: Illegal min or max specification! + + The recommended solution is to set the locale of LC_NUMERIC + to "C". For more information, see: + + http://code.google.com/p/tesseract-ocr/wiki/FAQ#Error:_Illegal_min_or_max_s… + */ + setlocale(LC_NUMERIC, "C"); // Initialize Tesseract. TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); @@ -202,8 +210,8 @@ namespace scribo delete [] s; } - // Restore default locale. - setlocale(LC_ALL, ""); + // Restore the default locale from the environment. + setlocale(LC_NUMERIC, ""); } @@ -219,12 +227,8 @@ namespace scribo const I& line = exact(line_); mln_precondition(line.is_valid()); - // Tesseract is known to have issues while reading training data - // depending on the current locales in use. Training data files use - // float data and the decimal separator can be either '.' or ',' - // causing errors. - // Setting locale to "C" fix that issue. - setlocale(LC_ALL, "C"); + // See the above explanations about setlocale. + setlocale(LC_NUMERIC, "C"); // Initialize Tesseract. TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); @@ -279,8 +283,8 @@ namespace scribo if (!output_file.empty()) file.close(); - // Restore default locale. - setlocale(LC_ALL, ""); + // See the above explanations about setlocale. + setlocale(LC_NUMERIC, ""); } @@ -296,12 +300,8 @@ namespace scribo { mln_trace("scribo::text::recognition"); - // Tesseract is known to have issues while reading training data - // depending on the current locales in use. Training data files use - // float data and the decimal separator can be either '.' or ',' - // causing errors. - // Setting locale to "C" fix that issue. - setlocale(LC_ALL, "C"); + // See the above explanations about setlocale. + setlocale(LC_NUMERIC, "C"); // Initialize Tesseract. tesseract::TessBaseAPI tess; @@ -369,8 +369,8 @@ namespace scribo delete[] s; } - // Restore default locale. - setlocale(LC_ALL, ""); + // Restore the default locale from the environment. + setlocale(LC_NUMERIC, ""); } @@ -386,12 +386,8 @@ namespace scribo const I& line = exact(line_); mln_precondition(line.is_valid()); - // Tesseract is known to have issues while reading training data - // depending on the current locales in use. Training data files use - // float data and the decimal separator can be either '.' or ',' - // causing errors. - // Setting locale to "C" fix that issue. - setlocale(LC_ALL, "C"); + // Restore the default locale from the environment. + setlocale(LC_NUMERIC, "C"); // Initialize Tesseract. tesseract::TessBaseAPI tess; @@ -439,8 +435,8 @@ namespace scribo if (!output_file.empty()) file.close(); - // Restore default locale. - setlocale(LC_ALL, ""); + // Restore the default locale from the environment. + setlocale(LC_NUMERIC, ""); } -- 1.7.10.4

1 0

olena: olena-2.0-574-g508408f More locale-related Tesseract workarounds.
by Roland Levillain 25 Jun '13

25 Jun '13

* scribo/text/recognition.hh: Here. --- scribo/ChangeLog | 6 ++++++ scribo/scribo/text/recognition.hh | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c937a09..4b8d9be 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2013-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + More locale-related Tesseract workarounds. + + * scribo/text/recognition.hh: Here. + 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> Provide default arguments in function declarations only. diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index a4db088..614975b 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -296,6 +296,12 @@ namespace scribo { mln_trace("scribo::text::recognition"); + // Tesseract is known to have issues while reading training data + // depending on the current locales in use. Training data files use + // float data and the decimal separator can be either '.' or ',' + // causing errors. + // Setting locale to "C" fix that issue. + setlocale(LC_ALL, "C"); // Initialize Tesseract. tesseract::TessBaseAPI tess; @@ -363,6 +369,8 @@ namespace scribo delete[] s; } + // Restore default locale. + setlocale(LC_ALL, ""); } @@ -378,6 +386,13 @@ namespace scribo const I& line = exact(line_); mln_precondition(line.is_valid()); + // Tesseract is known to have issues while reading training data + // depending on the current locales in use. Training data files use + // float data and the decimal separator can be either '.' or ',' + // causing errors. + // Setting locale to "C" fix that issue. + setlocale(LC_ALL, "C"); + // Initialize Tesseract. tesseract::TessBaseAPI tess; if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) -- 1.7.10.4

1 0

olena: olena-2.0-573-g26bb774 Provide default arguments in function declarations only.
by Roland Levillain 24 Jun '13

24 Jun '13

* 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 <roland(a)lrde.epita.fr> + 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 <roland(a)lrde.epita.fr> + 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& 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

1 0

olena: olena-2.0-572-gd3418e8 Disable unused arguments.
by Roland Levillain 24 Jun '13

24 Jun '13

* scribo/binarization/internal/local_threshold_core.hh (scribo::binarization::internal::impl::generic::local_threshold_core) * scribo/core/internal/doc_serializer.hh (scribo::doc_serializer<E>::visit) * scribo/filter/internal/component_aligned.hh (scribo::filter::internal::component_aligned) * scribo/filter/internal/compute.hh (scribo::filter::internal::compute) * scribo/primitive/link/internal/link_functor_base.hh (internal::link_functor_base<L,E>::start_processing_object_) * scribo/util/init_integral_image.hh (scribo::util::impl::generic::init_integral_image): Here. --- scribo/ChangeLog | 18 ++++++++++++++++++ .../binarization/internal/local_threshold_core.hh | 3 ++- scribo/scribo/core/internal/doc_serializer.hh | 18 +++++++++--------- scribo/scribo/filter/internal/component_aligned.hh | 4 ++-- scribo/scribo/filter/internal/compute.hh | 4 ++-- .../primitive/link/internal/link_functor_base.hh | 4 ++-- scribo/scribo/util/init_integral_image.hh | 5 +++-- 7 files changed, 38 insertions(+), 18 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6330a23..b2860f1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,21 @@ +2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + + Disable unused arguments. + + * scribo/binarization/internal/local_threshold_core.hh + (scribo::binarization::internal::impl::generic::local_threshold_core) + * scribo/core/internal/doc_serializer.hh + (scribo::doc_serializer<E>::visit) + * scribo/filter/internal/component_aligned.hh + (scribo::filter::internal::component_aligned) + * scribo/filter/internal/compute.hh + (scribo::filter::internal::compute) + * scribo/primitive/link/internal/link_functor_base.hh + (internal::link_functor_base<L,E>::start_processing_object_) + * scribo/util/init_integral_image.hh + (scribo::util::impl::generic::init_integral_image): + Here. + 2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> Shell-related portability fixes in Scribo's Makefiles. diff --git a/scribo/scribo/binarization/internal/local_threshold_core.hh b/scribo/scribo/binarization/internal/local_threshold_core.hh index 16dc1be..5c5245c 100644 --- a/scribo/scribo/binarization/internal/local_threshold_core.hh +++ b/scribo/scribo/binarization/internal/local_threshold_core.hh @@ -108,7 +108,8 @@ namespace scribo template <typename I, typename F> void - local_threshold_core(const Image& input, unsigned window_size) + local_threshold_core(const Image& /* input */, + unsigned /* window_size */) { mln_trace("scribo::binarization::internal::impl::generic::local_threshold_core"); diff --git a/scribo/scribo/core/internal/doc_serializer.hh b/scribo/scribo/core/internal/doc_serializer.hh index 606716b..69edd32 100644 --- a/scribo/scribo/core/internal/doc_serializer.hh +++ b/scribo/scribo/core/internal/doc_serializer.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. // @@ -81,56 +81,56 @@ namespace scribo template <typename E> template <typename L> void - doc_serializer<E>::visit(const document<L>& doc) const + doc_serializer<E>::visit(const document<L>& /* doc */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const line_links<L>& llinks) const + doc_serializer<E>::visit(const line_links<L>& /* llinks */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const object_groups<L>& groups) const + doc_serializer<E>::visit(const object_groups<L>& /* groups */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const object_links<L>& links) const + doc_serializer<E>::visit(const object_links<L>& /* links */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const component_set<L>& comp_set) const + doc_serializer<E>::visit(const component_set<L>& /* comp_set */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const component_info<L>& info) const + doc_serializer<E>::visit(const component_info<L>& /* info */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const paragraph_set<L>& parset) const + doc_serializer<E>::visit(const paragraph_set<L>& /* parset */) const { } template <typename E> template <typename L> void - doc_serializer<E>::visit(const line_info<L>& line) const + doc_serializer<E>::visit(const line_info<L>& /* line */) const { } diff --git a/scribo/scribo/filter/internal/component_aligned.hh b/scribo/scribo/filter/internal/component_aligned.hh index 210b0ea..ef810db 100644 --- a/scribo/scribo/filter/internal/component_aligned.hh +++ b/scribo/scribo/filter/internal/component_aligned.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -73,7 +73,7 @@ namespace scribo template <typename L> bool component_aligned(const component_set<L>& comps, - unsigned current_object, unsigned nbh_object, + unsigned current_object, unsigned /* nbh_object */, anchor::Type anchor, float max_alpha) { float max_alpha_rad = (max_alpha / 180.0f) * math::pi; diff --git a/scribo/scribo/filter/internal/compute.hh b/scribo/scribo/filter/internal/compute.hh index 133cd3c..2c620a3 100644 --- a/scribo/scribo/filter/internal/compute.hh +++ b/scribo/scribo/filter/internal/compute.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. @@ -91,7 +91,7 @@ namespace scribo mln_concrete(I) compute(const Image& input_, const Neighborhood<N>& nbh_, - const V& label_type, + const V& /* label_type */, const Function_v2b<F>& filter) { mln_trace("scribo::filter::internal::compute"); diff --git a/scribo/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh index e63096f..399faba 100644 --- a/scribo/scribo/primitive/link/internal/link_functor_base.hh +++ b/scribo/scribo/primitive/link/internal/link_functor_base.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. @@ -512,7 +512,7 @@ namespace scribo inline void link_functor_base<L,E>::start_processing_object_( - unsigned current_object) + unsigned /* current_object */) { // No-Op } diff --git a/scribo/scribo/util/init_integral_image.hh b/scribo/scribo/util/init_integral_image.hh index 305a0ee..b1af24c 100644 --- a/scribo/scribo/util/init_integral_image.hh +++ b/scribo/scribo/util/init_integral_image.hh @@ -62,8 +62,9 @@ namespace scribo template <typename I, typename F> mln_ch_value(I, mln_result(F)) - init_integral_image(const Image& input, unsigned scale, F& f, - const mln_box(I)& output_domain, unsigned border) + init_integral_image(const Image& /* input */, unsigned /* scale */, + F& /* f */, const mln_box(I)& /* output_domain */, + unsigned /* border */) { mln_trace("scribo::util::impl::generic::init_integral_image"); typedef mln_ch_value(I, mln_result(F)) J; -- 1.7.10.4

1 0

olena: olena-2.0-571-g4cdfb68 Address compiler warnings about unused variables and arguments.
by Roland Levillain 24 Jun '13

24 Jun '13

* mln/algebra/mat.hh (mln::algebra::impl::det) * mln/linear/gaussian.hh (mln::linear::impl::generic_filter_) * mln/registration/icp.hh (mln::registration::remove_too_far_sites_debug) (mln::registration::compute_distance_criteria) * tests/io/magick/load.cc (main) * tests/io/magick/save.cc (main): Here. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/algebra/mat.hh | 4 ++-- milena/mln/linear/gaussian.hh | 3 ++- milena/mln/registration/icp.hh | 10 +++++++--- milena/tests/io/magick/load.cc | 2 +- milena/tests/io/magick/save.cc | 2 +- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7c2871f..11fa869 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2013-06-24 Roland Levillain <roland(a)lrde.epita.fr> + + Address compiler warnings about unused variables and arguments. + + * mln/algebra/mat.hh (mln::algebra::impl::det) + * mln/linear/gaussian.hh (mln::linear::impl::generic_filter_) + * mln/registration/icp.hh + (mln::registration::remove_too_far_sites_debug) + (mln::registration::compute_distance_criteria) + * tests/io/magick/load.cc (main) + * tests/io/magick/save.cc (main): + Here. + 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> Avoid comparisons between signed and unsigned values. diff --git a/milena/mln/algebra/mat.hh b/milena/mln/algebra/mat.hh index 6deafe9..9e763ca 100644 --- a/milena/mln/algebra/mat.hh +++ b/milena/mln/algebra/mat.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2006, 2008, 2009, 2012 EPITA Research and Development +// Copyright (C) 2006, 2008, 2009, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -907,7 +907,7 @@ namespace mln template<unsigned n, typename T> mln_sum_product(T,T) - det(const mat<n,n,T>& m) + det(const mat<n,n,T>& /* m */) { // Not implemented. mlc_abort(T)::check(); diff --git a/milena/mln/linear/gaussian.hh b/milena/mln/linear/gaussian.hh index 0e1d5a9..0a4b71f 100644 --- a/milena/mln/linear/gaussian.hh +++ b/milena/mln/linear/gaussian.hh @@ -1,5 +1,5 @@ // Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011, -// 2012 EPITA Research and Development Laboratory (LRDE) +// 2012, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -378,6 +378,7 @@ namespace mln Image& img_, const F& coef, int dir) { I& img = exact(img_); + (void) dir; mln_precondition(dir < I::site::dim); diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 7c82202..40c19d3 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -343,7 +343,10 @@ namespace mln for_all(p) { vec3d_f Pk_i = pair.first.rotate(p) + pair.second; + // FIXME: Unused variable; remove? +#if 0 vec3d_f Yk_i = closest_point(Pk_i); +#endif int d_i = closest_point.dmap_X_(Pk_i); if (d_i >= d_min && d_i <= d_max) @@ -370,12 +373,13 @@ namespace mln } + /* FIXME: Unused argument `r'; remove? */ template <typename P, typename F> void compute_distance_criteria(const p_array& P_, - const F& closest_point, - const std::pair<algebra::quat,mln_vec(P)>& pair, - unsigned r, int& d_min, int& d_max) + const F& closest_point, + const std::pair<algebra::quat,mln_vec(P)>& pair, + unsigned /* r */, int& d_min, int& d_max) { mln_piter(p_array) p(P_); accu::histo<value::int_u8> h; diff --git a/milena/tests/io/magick/load.cc b/milena/tests/io/magick/load.cc index 34af3f8..1b094f2 100644 --- a/milena/tests/io/magick/load.cc +++ b/milena/tests/io/magick/load.cc @@ -39,7 +39,7 @@ #include "tests/data.hh" -int main(int /* argc */, char* argv[]) +int main() { using namespace mln; diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index d650180..4430db8 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -66,7 +66,7 @@ test(const image2d<T>& lena_mln, const std::string& temp_filename) } -int main(int /* argc */, char* argv[]) +int main() { using namespace mln; -- 1.7.10.4

1 0

olena: olena-2.0-570-gcd5f19d Avoid comparisons between signed and unsigned values.
by Roland Levillain 24 Jun '13

24 Jun '13

* apps/morphers/iz.cc: Here. Add a copyright notice and a Doxygen header. --- milena/ChangeLog | 7 +++++++ milena/apps/morphers/iz.cc | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cd0b401..7c2871f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Avoid comparisons between signed and unsigned values. + + * apps/morphers/iz.cc: Here. + Add a copyright notice and a Doxygen header. + +2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes. * mln/value/int_u.hh: Here. diff --git a/milena/apps/morphers/iz.cc b/milena/apps/morphers/iz.cc index 4216dc5..1603d38 100644 --- a/milena/apps/morphers/iz.cc +++ b/milena/apps/morphers/iz.cc @@ -1,3 +1,32 @@ +// Copyright (C) 2012, 2013 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// \brief Application of the lazy recorder morpher to the computation +/// of influence zones. + #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> @@ -120,7 +149,7 @@ int main(int argc, char* argv[]) { image2d<value::rgb8> ws_ = data::convert(value::rgb8(), input); - data::fill((ws_ | (pw::value(ws) == pw::cst(0))).rw(), literal::red); + data::fill((ws_ | (pw::value(ws) == pw::cst(0u))).rw(), literal::red); io::ppm::save(ws_, "tmp_ws_superpose.ppm"); // test% g++ -I. main.cc -DNDEBUG -O2 @@ -156,8 +185,8 @@ int main(int argc, char* argv[]) image_if< decorated_image< image2d<unsigned int>, lazy_recorder< image2d<unsigned int> > >, fun::eq_v2b_expr_< pw::value_< image2d<unsigned int> >, - pw::cst_<int> > > rec_iz = - transform::influence_zone_front(rec_lab | (pw::value(ws) == pw::cst(0)), + pw::cst_<unsigned int> > > rec_iz = + transform::influence_zone_front(rec_lab | (pw::value(ws) == pw::cst(0u)), c8(), make::w_window2d(ww)); data::paste(rec_iz, lab); -- 1.7.10.4

1 0

olena: olena-2.0-569-gcf8f392 Aesthetic changes.
by Roland Levillain 24 Jun '13

24 Jun '13

* mln/value/int_u.hh: Here. * mln/value/internal/gray_f.hh: Typo in comment. --- milena/ChangeLog | 7 +++++++ milena/mln/value/int_u.hh | 24 ++++++++++++------------ milena/mln/value/internal/gray_f.hh | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a402ccd..cd0b401 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes. + + * mln/value/int_u.hh: Here. + * mln/value/internal/gray_f.hh: Typo in comment. + +2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Resolve ambiguous calls to operator* in value::qt::rgb32. * mln/value/qt/rgb32.hh: Here. diff --git a/milena/mln/value/int_u.hh b/milena/mln/value/int_u.hh index 7744b96..27e3b1d 100644 --- a/milena/mln/value/int_u.hh +++ b/milena/mln/value/int_u.hh @@ -46,13 +46,17 @@ namespace mln { - // Forward declarations. - namespace value { - namespace qt { - struct rgb32; - } + /// Forward declarations. + /// \{ + namespace value + { template <unsigned n> struct int_u; template <unsigned n> struct rgb; + + namespace qt + { + struct rgb32; + } } namespace literal @@ -60,7 +64,8 @@ namespace mln struct zero_t; struct one_t; } - // End of forward declarations + /// \} + namespace trait { @@ -192,21 +197,17 @@ namespace mln template <unsigned n> void from_to_(const int_u<n>& from, unsigned& to_); - /// \internal Conversion: int_u -> bool. template <unsigned n> void from_to_(const int_u<n>& from, bool& to_); - /// \internal Conversion: int_u -> float. template <unsigned n> void from_to_(const int_u<n>& from, float& to_); - /// \internal Conversion: int_u -> double. template <unsigned n> - void - from_to_(const int_u<n>& from, double& to_); + void from_to_(const int_u<n>& from, double& to_); /// \internal Conversion: Conversion: int_u -> rgb. template <unsigned m> @@ -232,4 +233,3 @@ namespace mln #endif // ! MLN_VALUE_INT_U_HH - diff --git a/milena/mln/value/internal/gray_f.hh b/milena/mln/value/internal/gray_f.hh index a24c2b5..f9ae43a 100644 --- a/milena/mln/value/internal/gray_f.hh +++ b/milena/mln/value/internal/gray_f.hh @@ -29,7 +29,7 @@ /// \file /// -/// Declarations of the mln::value::internal::gray_f class. +/// Declaration of the mln::value::internal::gray_f class. # include <iostream> -- 1.7.10.4

1 0

olena: olena-2.0-568-g129176c Resolve ambiguous calls to operator* in value::qt::rgb32.
by Roland Levillain 24 Jun '13

24 Jun '13

* mln/value/qt/rgb32.hh: Here. --- milena/ChangeLog | 6 ++++++ milena/mln/value/qt/rgb32.hh | 48 +++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 93c5893..a402ccd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Resolve ambiguous calls to operator* in value::qt::rgb32. + + * mln/value/qt/rgb32.hh: Here. + +2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix mln::value::hsl_'s dependencies. * mln/value/hsl.hh: Here. diff --git a/milena/mln/value/qt/rgb32.hh b/milena/mln/value/qt/rgb32.hh index f26c070..361702c 100644 --- a/milena/mln/value/qt/rgb32.hh +++ b/milena/mln/value/qt/rgb32.hh @@ -468,27 +468,27 @@ namespace mln inline rgb32::rgb32(const mln::literal::light_gray_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.75); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.75); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.75); + this->v_[0] = unsigned(mln_max(int_u<8>)) * 3 / 4; + this->v_[1] = unsigned(mln_max(int_u<8>)) * 3 / 4; + this->v_[2] = unsigned(mln_max(int_u<8>)) * 3 / 4; } inline rgb32::rgb32(const mln::literal::medium_gray_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.50); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.50); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 2; + this->v_[1] = unsigned(mln_max(int_u<8>)) / 2; + this->v_[2] = unsigned(mln_max(int_u<8>)) / 2; } inline rgb32::rgb32(const mln::literal::dark_gray_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.25); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.25); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.25); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 4; + this->v_[1] = unsigned(mln_max(int_u<8>)) / 4; + this->v_[2] = unsigned(mln_max(int_u<8>)) / 4; } @@ -522,9 +522,9 @@ namespace mln inline rgb32::rgb32(const mln::literal::brown_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.25); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.50); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.75); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 4; + this->v_[1] = unsigned(mln_max(int_u<8>)) / 2; + this->v_[2] = unsigned(mln_max(int_u<8>)) * 3 / 4; } @@ -533,7 +533,7 @@ namespace mln { this->v_[0] = 0; this->v_[1] = mln_max(int_u<8>); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.75); + this->v_[2] = unsigned(mln_max(int_u<8>)) * 3 / 4; } @@ -541,7 +541,7 @@ namespace mln rgb32::rgb32(const mln::literal::orange_t&) { this->v_[0] = 0; - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[1] = unsigned(mln_max(int_u<8>)) / 2; this->v_[2] = mln_max(int_u<8>); } @@ -549,8 +549,8 @@ namespace mln inline rgb32::rgb32(const mln::literal::pink_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.75); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.75); + this->v_[0] = unsigned(mln_max(int_u<8>)) * 3 / 4; + this->v_[1] = unsigned(mln_max(int_u<8>)) * 3 / 4; this->v_[2] = mln_max(int_u<8>); } @@ -558,17 +558,17 @@ namespace mln inline rgb32::rgb32(const mln::literal::purple_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.25); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 4; this->v_[1] = 0; - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.75); + this->v_[2] = unsigned(mln_max(int_u<8>)) * 3 / 4; } inline rgb32::rgb32(const mln::literal::teal_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.50); - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 2; + this->v_[1] = unsigned(mln_max(int_u<8>)) / 2; this->v_[2] = 0; } @@ -576,9 +576,9 @@ namespace mln inline rgb32::rgb32(const mln::literal::violet_t&) { - this->v_[0] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[0] = unsigned(mln_max(int_u<8>)) / 2; this->v_[1] = 0; - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[2] = unsigned(mln_max(int_u<8>)) / 2; } @@ -613,8 +613,8 @@ namespace mln rgb32::rgb32(const mln::literal::olive_t&) { this->v_[0] = 0; - this->v_[1] = unsigned(mln_max(int_u<8>) * 0.50); - this->v_[2] = unsigned(mln_max(int_u<8>) * 0.50); + this->v_[1] = unsigned(mln_max(int_u<8>)) / 2; + this->v_[2] = unsigned(mln_max(int_u<8>)) / 2; } -- 1.7.10.4

1 0

olena: olena-2.0-567-gfbed673 Fix mln::value::hsl_'s dependencies.
by Roland Levillain 24 Jun '13

24 Jun '13

* mln/value/hsl.hh: Here. [MLN_INCLUDE_ONLY]: Fix closing #endif statement. --- milena/ChangeLog | 7 +++++++ milena/mln/value/hsl.hh | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e48a450..93c5893 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix mln::value::hsl_'s dependencies. + + * mln/value/hsl.hh: Here. + [MLN_INCLUDE_ONLY]: Fix closing #endif statement. + +2013-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix mutual dependencies between value::int_u and value::qt::rgb32. * mln/value/int_u.hh: Move definitions... diff --git a/milena/mln/value/hsl.hh b/milena/mln/value/hsl.hh index 2cbcbe0..344d644 100644 --- a/milena/mln/value/hsl.hh +++ b/milena/mln/value/hsl.hh @@ -30,7 +30,6 @@ #include <mln/value/ops.hh> #include <mln/value/concept/vectorial.hh> -#include <mln/value/int_u.hh> #include <mln/algebra/vec.hh> @@ -42,6 +41,7 @@ namespace mln namespace qt { struct rgb32; } + template <unsigned n> struct int_u; template <typename H, typename S, typename L> class hsl_; } @@ -291,8 +291,9 @@ namespace mln } // end of namespace mln -// Used in from_to +// Required by mln::values::hsl_'s from_to_ routines. # include <mln/value/rgb.hh> +# include <mln/value/qt/rgb32.hh> # include <mln/fun/v2v/hsl_to_rgb.hh> @@ -425,10 +426,8 @@ namespace mln } // end of namespace mln::value +} // end of namespace mln # endif // ! MLN_INCLUDE_ONLY - -} // end of namespace mln - #endif // ! MLN_VALUE_HSL_HH -- 1.7.10.4

1 0