Olena-patches June 2013

olena-patches@lrde.epita.fr

5 participants
104 discussions

olena: olena-2.0-579-g96e67f6 Have configure find rst2html.

by Roland Levillain

* configure.ac: Check for rst2html. Define RST2HTML and use it... * doc/Makefile.am (contributors.html): ...here. --- ChangeLog | 8 ++++++++ configure.ac | 19 +++++++++++++++++++ doc/Makefile.am | 9 ++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3537bea..e4f81c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-06-28 Roland Levillain <roland(a)lrde.epita.fr> + + Have configure find rst2html. + + * configure.ac: Check for rst2html. + Define RST2HTML and use it... + * doc/Makefile.am (contributors.html): ...here. + 2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> Mention bibtex2html and bib2bib as documentation build dependencies. diff --git a/configure.ac b/configure.ac index 08bc85c..8c6b59c 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,25 @@ if test -z "$TESTS_CXXFLAGS_DEBUG"; then fi +## --------------- ## +## Documentation. ## +## --------------- ## + +# Tools used to build the documentation. + +# rst2html can have many names, especially in the MacPorts, where +# py-docutils binaries include their version numbers in their names. +AC_ARG_VAR([RST2HTML], [reStructuredText-to-HTML translator]) +AC_CHECK_PROGS([RST2HTML], + m4_do([rst2html], + [ rst2html.py], + [ rst2html-3.3.py rst2html-3.2.py rst2html-3.1.py], + [ rst2html-2.7.py rst2html-2.6.py rst2html-2.5.py rst2html-2.4.py])) +if test -z "$RST2HTML"; then + AC_MSG_WARN([rst2html not found, documentation rebuild will not be possible]) +fi + + ## ------------------------------ ## ## ``Enable Everything'' Switch. ## ## ------------------------------ ## diff --git a/doc/Makefile.am b/doc/Makefile.am index eeb417c..bab9ffb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -149,9 +149,12 @@ EXTRA_DIST += $(USER_REFMAN) ## -------------- ## contributors.html: $(top_srcdir)/AUTHORS - rst2html --stylesheet-path=$(srcdir)/doxygen.css --link-stylesheet \ - --input-encoding=latin1 --output-encoding=latin1 \ - $(top_srcdir)/AUTHORS > contributors.html + @test -n "$(RST2HTML)" \ + || { echo "error: rst2html not found during configure" >&2; \ + exit 1; } + $(RST2HTML) --input-encoding=latin1 --output-encoding=latin1 \ + --stylesheet-path=$(srcdir)/doxygen.css --link-stylesheet \ + $< >$@ ## -------------- ## -- 1.7.10.4

10 years, 10 months

olena: branch fixes created: olena-2.0-578-gc2c03cd

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 fixes has been created at c2c03cdaebcc00a452fbf8c36fabf877caab3767 (commit) - Log ----------------------------------------------------------------- c2c03cd Aesthetic changes in mln/world/binary_2d/subsample.hh. 074b98c Fix two bugs in mln/world/binary_2d/subsample.hh. 056a7da scribo/text/recognition.hh: Aesthetic changes. a594568 Restrict workaround-related locale changes to LC_NUMERIC. 508408f More locale-related Tesseract workarounds. 26bb774 Provide default arguments in function declarations only. d3418e8 Disable unused arguments. 4cdfb68 Address compiler warnings about unused variables and arguments. cd5f19d Avoid comparisons between signed and unsigned values. cf8f392 Aesthetic changes. 129176c Resolve ambiguous calls to operator* in value::qt::rgb32. fbed673 Fix mln::value::hsl_'s dependencies. 0da19ec Fix mutual dependencies between value::int_u and value::qt::rgb32. 96efae2 doc/Doxyfile.in: Help Emacs fontify this file. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 10 months

olena: olena-2.0-578-gc2c03cd Aesthetic changes in mln/world/binary_2d/subsample.hh.

by Roland Levillain

* mln/world/binary_2d/subsample.hh: Here. --- milena/ChangeLog | 6 ++++++ milena/mln/world/binary_2d/subsample.hh | 18 ++++-------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ae13399..52abb9b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-06-28 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes in mln/world/binary_2d/subsample.hh. + + * mln/world/binary_2d/subsample.hh: Here. + +2013-06-28 Roland Levillain <roland(a)lrde.epita.fr> + Fix two bugs in mln/world/binary_2d/subsample.hh. * mln/world/binary_2d/subsample.hh diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index fd8684a..3ea041a 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -40,6 +40,7 @@ # include <mln/data/convert.hh> # include <mln/value/int_u8.hh> + namespace mln { @@ -55,7 +56,6 @@ namespace mln /// \param[in] n Linear subsampling coefficient. /// /// \return A gray level image. - // image2d<value::int_u8> subsample(const image2d<bool>& input, unsigned n); @@ -73,12 +73,7 @@ namespace mln using value::int_u8; if (n == 0) - { - image2d<value::int_u8> - output = data::convert(int_u8(), input); - - return output; - } + return data::convert(int_u8(), input); const bool** ptr = new const bool*[n]; const unsigned nrows = input.nrows() / n; @@ -86,7 +81,6 @@ namespace mln image2d<int_u8> output(nrows, ncols); const unsigned delta_row = input.delta_offset(down); - unsigned count = 0; for (unsigned row = 0; row < nrows; ++row) { @@ -95,16 +89,12 @@ namespace mln ptr[i] = ptr[i - 1] + delta_row; for (unsigned col = 0; col < ncols; ++col) { - count = 0; + unsigned count = 0; for (unsigned i = 0; i < n; ++i) - { for (unsigned j = 0; j < n; ++j, ++(ptr[i])) - { if (*(ptr[i])) ++count; - } - } - output(point2d(row, col)) = count * 255 / n / n; + output(point2d(row, col)) = count * mln_max(int_u8) / n / n; } } -- 1.7.10.4

10 years, 10 months

olena: olena-2.0-577-g074b98c Fix two bugs in mln/world/binary_2d/subsample.hh.

by Roland Levillain

* mln/world/binary_2d/subsample.hh (world::binary_2d::subsample(const image2d<bool>&, unsigned)): Properly initialize (and deallocate) the sliding window (array of pointers). Fix the size of the output image. Have the declaration of this function match its definition. * tests/world/binary_2d/subsample.cc: New test. * tests/world/binary_2d/Makefile.am (check_PROGRAMS): Add subsample. (MOSTLYCLEANFILES): Add subsample-small.pgm. --- milena/ChangeLog | 15 +++++++++++++++ milena/mln/world/binary_2d/subsample.hh | 9 +++++---- milena/tests/world/binary_2d/Makefile.am | 11 +++++++---- .../height.cc => world/binary_2d/subsample.cc} | 19 ++++++++++--------- 4 files changed, 37 insertions(+), 17 deletions(-) copy milena/tests/{morpho/closing/height.cc => world/binary_2d/subsample.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 11fa869..ae13399 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,18 @@ +2013-06-28 Roland Levillain <roland(a)lrde.epita.fr> + + Fix two bugs in mln/world/binary_2d/subsample.hh. + + * mln/world/binary_2d/subsample.hh + (world::binary_2d::subsample(const image2d<bool>&, unsigned)): + Properly initialize (and deallocate) the sliding window (array of + pointers). + Fix the size of the output image. + Have the declaration of this function match its definition. + * tests/world/binary_2d/subsample.cc: New test. + * tests/world/binary_2d/Makefile.am + (check_PROGRAMS): Add subsample. + (MOSTLYCLEANFILES): Add subsample-small.pgm. + 2013-06-24 Roland Levillain <roland(a)lrde.epita.fr> Address compiler warnings about unused variables and arguments. diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index d8d1aa3..fd8684a 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -57,7 +57,7 @@ namespace mln /// \return A gray level image. // image2d<value::int_u8> - subsample(image2d<bool>& input, unsigned n); + subsample(const image2d<bool>& input, unsigned n); # ifndef MLN_INCLUDE_ONLY @@ -80,11 +80,10 @@ namespace mln return output; } - const bool** ptr; + const bool** ptr = new const bool*[n]; const unsigned nrows = input.nrows() / n; const unsigned ncols = input.ncols() / n; - image2d<int_u8> output; - initialize(output, input); + image2d<int_u8> output(nrows, ncols); const unsigned delta_row = input.delta_offset(down); unsigned count = 0; @@ -109,6 +108,8 @@ namespace mln } } + delete[] ptr; + return output; } diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am index c741183..cb73266 100644 --- a/milena/tests/world/binary_2d/Makefile.am +++ b/milena/tests/world/binary_2d/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,8 +18,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - enlarge -# enlarge_hq2x - + enlarge \ + subsample TESTS = $(check_PROGRAMS) + +MOSTLYCLEANFILES = \ + subsample-small.pgm diff --git a/milena/tests/morpho/closing/height.cc b/milena/tests/world/binary_2d/subsample.cc similarity index 78% copy from milena/tests/morpho/closing/height.cc copy to milena/tests/world/binary_2d/subsample.cc index 6863355..f7aa4ef 100644 --- a/milena/tests/morpho/closing/height.cc +++ b/milena/tests/world/binary_2d/subsample.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,14 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// Exercise mln::world::binary_2d::subsample. + #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/core/alias/neighb2d.hh> -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> +#include <mln/world/binary_2d/subsample.hh> -#include <mln/morpho/closing/height.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> #include "tests/data.hh" @@ -41,7 +42,7 @@ int main() using namespace mln; using value::int_u8; - image2d<int_u8> lena; - io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); - io::pgm::save(morpho::closing::height(lena, c4(), 20), "height-out.pgm"); + image2d<bool> input = io::pbm::load(MLN_IMG_DIR "/small.pbm"); + image2d<int_u8> output = world::binary_2d::subsample(input, 3); + io::pgm::save(output, "subsample-small.pgm"); } -- 1.7.10.4

10 years, 10 months