Olena-patches December 2011

olena-patches@lrde.epita.fr

2 participants
54 discussions

olena-2.0-78-g91060da Change path to .bib files.

by Guillaume Lazzara

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 4 ++-- scribo/doc/Makefile.am | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e266b39..f369bec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-12-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Change path to .bib files. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 1986828..bd28b0f 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -124,8 +124,8 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO INPUT_ENCODING = ISO-8859-1 -CITE_BIB_FILES = @top_srcdir@/doc/doc \ - @top_srcdir@/doc/olena +CITE_BIB_FILES = @abs_srcdir@/doc/doc \ + @abs_srcdir@/doc/olena LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- # configuration options related to source browsing diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 3963182..bef0fa5 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -63,6 +63,7 @@ edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' \ + -e 's,@abs_srcdir\@,$(abs_srcdir),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@srcdir\@,$(srcdir),g' \ -e 's,@builddir\@,$(builddir),g' -- 1.7.2.5

12 years, 4 months

branch exp/newdoc updated: olena-2.0-77-ge0226cb

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via e0226cbab4a078b353231ef52dfbaf9b47097706 (commit) from 08a4b36404bd942bddf4428725218a155275f023 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- e0226cb doc/Makefile.am: Add missing files in EXTRA_DIST. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 4 months

olena-2.0-77-ge0226cb doc/Makefile.am: Add missing files in EXTRA_DIST.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ doc/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 872cb72..48495bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add missing files in EXTRA_DIST. + 2011-10-28 Guillaume Lazzara <z(a)lrde.epita.fr> Add more content in general documentation. diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a45e4e..8da072b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -82,7 +82,7 @@ REFMAN_deps = $(srcdir)/footer.html \ lrde_olena.html \ $(REFMAN_IMAGES) - +EXTRA_DIST += $(REFMAN_deps) # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. -- 1.7.2.5

12 years, 4 months

branch exp/newdoc updated: olena-2.0-76-g08a4b36

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via 08a4b36404bd942bddf4428725218a155275f023 (commit) from 0f3f15ef53d14ec0faf6a87e9a39ffcdaee950ee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 08a4b36 tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid filename. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 5 +++++ scribo/tests/binarization/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 4 months

olena-2.0-76-g08a4b36 tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid filename.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/tests/binarization/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7b4d55e..e266b39 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/binarization/Makefile.am (EXTRA_DIST): Fix invalid + filename. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix deprecated dist files. diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index a2962bb..bab3e35 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ - niblack.res.pbm \ + niblack.ref.pbm \ sauvola_ms.ref.pbm \ sauvola.ref.pbm \ otsu.ref.pbm -- 1.7.2.5

12 years, 4 months

branch exp/newdoc updated: olena-2.0-75-g0f3f15e

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via 0f3f15ef53d14ec0faf6a87e9a39ffcdaee950ee (commit) via 4869c40759411527fbe11083861a5b4be0ba7664 (commit) from 7e06ee92589629b6063e7da288fe07061647253c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 0f3f15e doc/Makefile.am: Fix deprecated dist files. 4869c40 Fix doxygen warnings. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 11 +++++++++++ milena/mln/accu/compute.hh | 4 ++-- milena/mln/convert/to_p_set.hh | 2 +- milena/mln/data/compute.hh | 12 +++++++----- milena/mln/debug/filename.hh | 4 ++-- milena/mln/labeling/blobs.hh | 10 +++++----- milena/mln/morpho/tree/filter/all.hh | 5 +++-- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 3 --- 9 files changed, 35 insertions(+), 20 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 4 months

olena-2.0-75-g0f3f15e doc/Makefile.am: Fix deprecated dist files.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index db9fca4..7b4d55e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Fix deprecated dist files. + 2011-11-30 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/text/recognition.hh: Make some includes conditional. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 6469ab9..3963182 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -195,9 +195,6 @@ EXTRA_DIST += \ $(DOXYFILE).in \ doxyfuns.sty \ scribo.sty \ - tools/clearbanner.sh \ - tools/sample_utils.hh \ - tools/split_sample.sh \ tools/todoxygen.sh -- 1.7.2.5

12 years, 4 months

olena-2.0-74-g4869c40 Fix doxygen warnings.

by Guillaume Lazzara

* mln/accu/compute.hh, * mln/convert/to_p_set.hh, * mln/data/compute.hh, * mln/debug/filename.hh, * mln/labeling/blobs.hh, * mln/morpho/tree/filter/all.hh: Here. --- milena/ChangeLog | 11 +++++++++++ milena/mln/accu/compute.hh | 4 ++-- milena/mln/convert/to_p_set.hh | 2 +- milena/mln/data/compute.hh | 12 +++++++----- milena/mln/debug/filename.hh | 4 ++-- milena/mln/labeling/blobs.hh | 10 +++++----- milena/mln/morpho/tree/filter/all.hh | 5 +++-- 7 files changed, 31 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2454245..bb6b125 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix doxygen warnings. + + * mln/accu/compute.hh, + * mln/convert/to_p_set.hh, + * mln/data/compute.hh, + * mln/debug/filename.hh, + * mln/labeling/blobs.hh, + * mln/morpho/tree/filter/all.hh: Here. + 2011-11-30 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/accu/math/sumpow.hh: New accumulator. diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 9c0e6b1..bf513f9 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -46,8 +46,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a An accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); @@ -62,8 +62,8 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// - /// \param[in] input The input image. /// \param[in] a A meta accumulator. + /// \param[in] input The input image. /// /// This routine runs: \n /// a.take(make::pix(input, p)); diff --git a/milena/mln/convert/to_p_set.hh b/milena/mln/convert/to_p_set.hh index 3f5f8c4..46cd5e7 100644 --- a/milena/mln/convert/to_p_set.hh +++ b/milena/mln/convert/to_p_set.hh @@ -69,7 +69,7 @@ namespace mln p_set<P> to_p_set(const std::set<P, C>& s); - /// Convert any site set \p ps into a 'mln::p_set' site set. + /// Convert any site set \p ps into a 'mln::p_set<>' site set. template <typename S> p_set<mln_psite(S)> to_p_set(const Site_Set<S>& ps); diff --git a/milena/mln/data/compute.hh b/milena/mln/data/compute.hh index 0ab146e..6fe4925 100644 --- a/milena/mln/data/compute.hh +++ b/milena/mln/data/compute.hh @@ -42,9 +42,9 @@ namespace mln namespace data { - /// Compute an accumulator onto the pixel values of the image \p input. - /// Be ware that the given accumulator won't be modified and won't - /// store any result. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. Be ware that the given accumulator won't be + /// modified and won't store any result. /// /// \param[in] a An accumulator. /// \param[in] input The input image. @@ -57,7 +57,8 @@ namespace mln compute(const Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in, out] a An accumulator. /// \param[in] input The input image. @@ -70,7 +71,8 @@ namespace mln compute(Accumulator<A>& a, const Image<I>& input); - /// Compute an accumulator onto the pixel values of the image \p input. + /// \brief Compute an accumulator onto the pixel values of the + /// image \p input. /// /// \param[in] a A meta-accumulator. /// \param[in] input The input image. diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index 1fc268b..954e516 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -50,9 +50,9 @@ namespace mln ** ** Where: ** - `filename_prefix` can be set through the global variable - ** debug::internal::filename_prefix. + ** debug::internal::filename_prefix. ** - `postfix_id` is autoincremented by default. Its value can be - forced. + forced. ** - `filename` is the given filename */ std::string diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index 12462c8..ce06b7d 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -48,11 +48,11 @@ namespace mln namespace labeling { - /// Connected component labeling of the binary objects of a binary - /// image. + /// \brief Connected component labeling of the binary objects of a + /// binary image. /// - /// \param[in] input The input image. - /// \param[in] nbh The connexity of the objects. + /// \param[in] input The input image. + /// \param[in] nbh The connexity of the objects. /// \param[out] nlabels The Number of labels. Its value is set in the /// algorithms. /// \return The label image. @@ -61,7 +61,7 @@ namespace mln /// /// A fast queue is used so that the algorithm is not recursive and /// can handle large binary objects (blobs). - /// + // template <typename I, typename N, typename L> mln_ch_value(I, L) blobs(const Image<I>& input, const Neighborhood<N>& nbh, diff --git a/milena/mln/morpho/tree/filter/all.hh b/milena/mln/morpho/tree/filter/all.hh index 1271b06..97b0e92 100644 --- a/milena/mln/morpho/tree/filter/all.hh +++ b/milena/mln/morpho/tree/filter/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -27,7 +28,7 @@ # define MLN_MORPHO_TREE_FILTER_ALL_HH /** -** \file mln/morpho/tree/filter.hh +** \file ** ** Methods to handle component tree filtering strategies with ** non-increasing attribute. Nevertheless, it works on increasing -- 1.7.2.5

12 years, 4 months

branch next updated: olena-2.0-24-g1a7b4fc

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 1a7b4fcf3f2e141a6b59bc39db3ae2298329b379 (commit) from 0a1c1c9af1b82c13146555ce8caca89030e7af58 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 1a7b4fc Ensure current locale is C while calling Tesseract. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/main.cc | 14 -------------- scribo/scribo/text/recognition.hh | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 4 months

olena-2.0-24-g1a7b4fc Ensure current locale is C while calling Tesseract.

by Guillaume Lazzara

* demo/viewer/main.cc: Move call to setLocale... * scribo/text/recognition.hh: ... Here. --- scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/main.cc | 14 -------------- scribo/scribo/text/recognition.hh | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d14af81..a9b71f0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + Ensure current locale is C while calling Tesseract. + + * demo/viewer/main.cc: Move call to setLocale... + * scribo/text/recognition.hh: ... Here. + 2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr> * README: update requirements information. diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index 704dfe7..0c50c7b 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -18,10 +18,6 @@ #include <QtGui> #include <iostream> -# ifdef HAVE_TESSERACT_2 -#include <clocale> -# endif // ! HAVE_TESSERACT_2 - #undef MLN_WO_GLOBAL_VARS #include "viewer.hh" #include <mln/labeling/colorize.hh> @@ -49,15 +45,5 @@ int main(int argc, char** argv) if (!viewer) return -1; - -# ifdef HAVE_TESSERACT_2 - // Tesseract 2.x 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"); -# endif // ! HAVE_TESSERACT_2 - return viewer->exec(); } diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index b7e5c91..e116d58 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -35,6 +35,7 @@ /// \todo Do not store the result in an image? # include <ostream> +# include <clocale> # include <mln/core/image/dmorph/image_if.hh> # include <mln/core/concept/neighborhood.hh> @@ -106,6 +107,12 @@ namespace scribo { trace::entering("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. # ifdef HAVE_TESSERACT_2 @@ -215,6 +222,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. # ifdef HAVE_TESSERACT_2 TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); -- 1.7.2.5

12 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches December 2011