August 2013 - Olena-patches

olena: olena-2.0-624-ga38f790 Distribute all Milena test images.
by Roland Levillain 23 Aug '13

23 Aug '13

* tests/Makefile.am (EXTRA_DIST): Add img/example-0.ppm, img/example-1.ppm, img/example-2.ppm and img/example-3.ppm. --- milena/ChangeLog | 7 +++++++ milena/tests/Makefile.am | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 212262f..bca04da 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-08-23 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute all Milena test images. + + * tests/Makefile.am (EXTRA_DIST): Add img/example-0.ppm, + img/example-1.ppm, img/example-2.ppm and img/example-3.ppm. + 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh. diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 499d25c..2bf090e 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -86,8 +86,13 @@ pretty-check: include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += unit_test -EXTRA_DIST += \ - img/lena_ascii.pbm \ +EXTRA_DIST += \ + img/example-0.ppm \ + img/example-1.ppm \ + img/example-2.ppm \ + img/example-3.ppm \ + img/example.pdf \ + img/lena_ascii.pbm \ img/lena_ascii.pgm \ img/lena_raw.pbm \ img/lena_raw.pgm \ @@ -95,4 +100,3 @@ EXTRA_DIST += \ img/test_gl.tif \ img/test_rgb8.tif \ img/tiny.png - -- 1.7.10.4

1 0

olena: branch fixes updated: olena-2.0-623-g8716bcd
by git＠lrde.epita.fr 22 Aug '13

22 Aug '13

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 updated via 8716bcd8173547e67815aa1b4b880b84a2347007 (commit) via 99326dfc6e20de3ff40a8350d0b6c94a78a12d4c (commit) via 90a82b69bd2b155c27df283ad7d4e271c259da62 (commit) via 9f7a6166606c0a3cbdb8e587fd32169ac1d432fc (commit) via 81c6c2e6b710fb51d42c1ea047c9913f515f6033 (commit) via e615bdeb86e5677875e5c3df90fae784832dbec3 (commit) via c6d8ebc31e6efa862b0b5811a01efb7865499cce (commit) via 25a8dca5e7521b075ccad4a0441f15457bb9cd2d (commit) via e6d116ca1f4e598423dafdf3d688be61d844bd17 (commit) via ceaefba14d3ebef881546d8cb3be0f68bd644824 (commit) via 659ad76e5bb9d363f4e963f9d875a02cb7197d5f (commit) via 04de84b6ab4c669321e4a963337d882a77b9b426 (commit) via 0d41013e6d0c232180462e8eebf4f082580041bf (commit) via 4a194de426d8725d97d3c28b7e9488e7b1eb9c6a (commit) via 49d8d8e09b7833223336d1c2796ca67611611f22 (commit) via fc46f1741d5fd9c00f387bbd9f46602c701dcdb5 (commit) via c863caf15812f96a617745ae9e7b3282936c6a1d (commit) via 6c4e67fe20d7e9c4f59fc24e6b36a0bdfe1a62d8 (commit) via 9c986677c88553bc4047b37bc679d75e97e53c25 (commit) via d1978e09f8a57ae5d490e29388481f31d916fb3d (commit) via 1bf45284122288e6327317cc0c4be4c391a834f6 (commit) via 4fdd299187a5b251c4c676aa1e51a8d5e2e4ab5c (commit) via 35cad5a53d8713bc900b669de81c6deca09d9c29 (commit) via 4bacb8c2cd5ad56c3c0f0c716f9f52e00dcc3ec9 (commit) via 1d9de7fd9fe34bc0b0e94973444d51bd2bc63416 (commit) via 18bd74436dd0d3d005b80dd8b7df760c8953990d (commit) via aae7ab92f6af72a1a3c2c97570b18cbeafe853d4 (commit) via 9a523a62a4854dd06b7c70401c55b16587cdb9d3 (commit) via bcdaaffc679c1648a08258ac40d3ab4be7f08c07 (commit) via 414ebb5a18c75fb900a7bf7d5cfa4d20c4d270e4 (commit) via 3e98665c5de7b92298c5a4198b0fc32d2c9338e3 (commit) via 431d249cd536e1b291732df97e4a7c7878672f19 (commit) via 51ebf6b524b55ddd6b471cfb7256421d4c28eec9 (commit) via 3a573b8e140dc092b83e348251083cb68b4604a2 (commit) from 19cf0bfdd73f029d2e92843a587d3d9148c62f6c (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 ----------------------------------------------------------------- 8716bcd Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh. 99326df Slightly improve Scribo's tests/primitive/extract/alignments.cc. 90a82b6 scribo/primitive/extract/alignments.hh: Fix Doxygen comments. 9f7a616 mln/core/image/dmorph/sub_image.hh: Fix indentation. 81c6c2e AUTHORS: Update. e615bde COPYING: Untabify. c6d8ebc Enable tests/fun/v2i. 25a8dca configure.ac: Configure milena/tests/fun/v2i/Makefile. e6d116c Various aesthetic changes in Milena. ceaefba mln/core/point.hh: Fix documentation. 659ad76 mln/morpho/watershed/flooding.hh: Uniformity-related changes. 04de84b mln/data/stretch.hh: Do not name unused arguments. 0d41013 tests/util/line_graph.cc: Wrap long lines. 4a194de Use Doxygen grouping commands uniformly in Milena. 49d8d8e tests/data/transform.cc: Aesthetic changes. fc46f17 Improve the documentation of mln::util::set. c863caf Various fixes related to image properties (traits). 6c4e67f Clean up white space. 9c98667 Typos and aesthetic changes in Milena apps. d1978e0 mln/canvas/all.hh: Sort #include directives. 1bf4528 Aesthetic changes. 4fdd299 mln/io/off/save.hh: Fix documentation. 35cad5a Enforce coding style w.r.t. function declarations. 4bacb8c configure.ac: Typo. 1d9de7f Add Doxygen documentation to a test. 18bd744 Fix Doxygen comments. aae7ab9 Remove a useless comment line. 9a523a6 Wrap long lines. bcdaaff More conversions from C-style casts to C++-style casts. 414ebb5 Use Doxygen comments properly. 3e98665 Typos in comments. 431d249 Reformat a documentation header. 51ebf6b Re-wrap a long line. 3a573b8 Remove useless C casts. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 108 ++++++++---- COPYING | 14 +- ChangeLog | 16 ++ configure.ac | 3 +- milena/ChangeLog | 184 ++++++++++++++++++++ milena/apps/Makefile.am | 1 - milena/apps/graph-morpho/convert.hh | 4 +- milena/apps/graph-morpho/make.hh | 6 +- milena/mln/accu/transform_snake.hh | 2 +- milena/mln/canvas/all.hh | 2 +- milena/mln/core/concept/function.hh | 12 +- milena/mln/core/contract.hh | 11 +- milena/mln/core/image/dmorph/sub_image.hh | 4 +- milena/mln/core/image/graph_elt_neighborhood_if.hh | 8 +- milena/mln/core/image/graph_elt_window_if.hh | 10 +- milena/mln/core/image/imorph/labeled_image.hh | 8 +- milena/mln/core/image/vmorph/fun_image.hh | 24 ++- milena/mln/core/internal/labeled_image_base.hh | 35 ++-- milena/mln/core/point.hh | 2 +- milena/mln/core/site_set/p_edges.hh | 16 +- milena/mln/core/site_set/p_graph_piter.hh | 4 +- milena/mln/data/fill.hh | 3 +- milena/mln/data/stretch.hh | 12 +- milena/mln/fun/i2v/array.hh | 11 +- milena/mln/fun/v2v/rgb8_to_rgbn.hh | 43 ++--- milena/mln/fun/v2v/rgb_to_hsl.hh | 2 +- milena/mln/fun/x2x/rotation.hh | 7 +- milena/mln/io/magick/load.hh | 9 +- milena/mln/io/off/save.hh | 4 +- milena/mln/labeling/flat_zones.hh | 4 +- milena/mln/morpho/tree/data.hh | 22 ++- milena/mln/morpho/watershed/flooding.hh | 25 +-- milena/mln/registration/icp.hh | 5 +- milena/mln/tag/init.hh | 1 - milena/mln/test/positive.hh | 11 +- milena/mln/test/predicate.hh | 8 +- milena/mln/trait/image/props.hh | 2 +- milena/mln/trait/images.hh | 7 +- milena/mln/util/adjacency_matrix.hh | 13 +- milena/mln/util/array.hh | 43 +++-- milena/mln/util/fibonacci_heap.hh | 93 +++++----- milena/mln/util/object_id.hh | 8 +- milena/mln/util/set.hh | 4 +- milena/mln/util/tracked_ptr.hh | 8 +- milena/mln/value/int_u.hh | 12 +- milena/mln/value/lut_vec.hh | 8 +- milena/mln/value/rgb.hh | 38 ++-- milena/tests/data/transform.cc | 18 +- milena/tests/fun/Makefile.am | 1 + milena/tests/topo/complex.cc | 3 + milena/tests/util/line_graph.cc | 22 ++- scribo/ChangeLog | 14 ++ scribo/scribo/primitive/extract/alignments.hh | 8 +- scribo/tests/primitive/extract/alignments.cc | 21 ++- 54 files changed, 641 insertions(+), 323 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

[Olena] #270: Properly use Doxygen grouping commands
by Olena Trac 22 Aug '13

22 Aug '13

#270: Properly use Doxygen grouping commands ----------------------+------------------------ Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: doc | ----------------------+------------------------ Ensure the following style is used uniformly in Olena when documentation grouping is required: {{{ /// \name Code generation. /// \{ /* ... */ /// \} }}} Do not omit the `\name` keyword! -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/270> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 1

olena: olena-2.0-623-g5450736 Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh.
by Roland Levillain 22 Aug '13

22 Aug '13

* mln/fun/v2v/rgb8_to_rgbn.hh: Turn precondition into a static assertion. Remove (dead) debugging code. Rewrite Doxygen comments. Cosmetic changes. --- milena/ChangeLog | 10 +++++++++ milena/mln/fun/v2v/rgb8_to_rgbn.hh | 43 ++++++++++++------------------------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7100701..212262f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh. + + * mln/fun/v2v/rgb8_to_rgbn.hh: Turn precondition into a static + assertion. + Remove (dead) debugging code. + Rewrite Doxygen comments. + Cosmetic changes. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/image/dmorph/sub_image.hh: Fix indentation. 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/fun/v2v/rgb8_to_rgbn.hh b/milena/mln/fun/v2v/rgb8_to_rgbn.hh index 74b713e..29d0d9c 100644 --- a/milena/mln/fun/v2v/rgb8_to_rgbn.hh +++ b/milena/mln/fun/v2v/rgb8_to_rgbn.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -33,8 +33,7 @@ # include <mln/core/contract.hh> /// \file -/// -/// \brief Convert rgb8 value to rgbn, n < 8. +/// \brief Conversion from mln::value::rgb8 to mln::value::rgbn. namespace mln @@ -47,53 +46,39 @@ namespace mln { - /// \brief Convert a rgb8 value to a rgn, n < 8. + /// \brief Convert an mln::value::rgb8 to an mln::value::rgbn. /// - /// \param n defines the output quantification used for the transformation. + /// \tparam n The quantification of the output value (where n < 8). /// /// \ingroup modfunv2v - // template <unsigned n> struct rgb8_to_rgbn : Function_v2v< rgb8_to_rgbn<n> > { - typedef value::rgb8 argument; + typedef value::rgb8 argument; typedef value::rgb<n> result; - /// \brief Convert a rgb8 value to a rgn, n < 8. + /// \brief Perform the conversion. /// - /// \param[in] c the rgb8 value to convert. + /// \pre The parameter (constant) n must be lower than 8. + /// + /// \param[in] c The input value. /// /// Conversion is done by computing the size by which we /// divide each rgb component. - // result operator()(const argument& c) const; - }; # ifndef MLN_INCLUDE_ONLY - /// \brief Convert a rgb8 value to a rgn, n < 8. - /// - /// \param c defines the output quantification used for the transformation. - /// - /// \ingroup modfunv2v - // template <unsigned n> typename rgb8_to_rgbn<n>::result rgb8_to_rgbn<n>::operator()(const argument& c) const { - mln_precondition(8 > n); - - unsigned size = pow(2,(8-n)); - /* - std::cout << "c : " << c << std::endl; - std::cout << "red : " << c.red() << std::endl; - std::cout << "size : " << size << std::endl; - std::cout << "res : " << (c.red() / size) << std::endl; - std::cout << "max : " << (mln_max(mln::value::int_u<n>))<< std::endl; - */ - result res(c.red() / size, c.green() / size, c.blue() / size); + mlc_bool(n < 8)::check(); + + unsigned size = pow(2, (8 - n)); + result res(c.red() / size, c.green() / size, c.blue() / size); return res; } -- 1.7.10.4

1 0

olena: olena-2.0-623-g8716bcd Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh.
by Roland Levillain 22 Aug '13

22 Aug '13

* mln/fun/v2v/rgb8_to_rgbn.hh: Turn precondition into a static assertion. Remove (dead) debugging code. Rewrite Doxygen comments. Cosmetic changes. --- milena/ChangeLog | 10 +++++++++ milena/mln/fun/v2v/rgb8_to_rgbn.hh | 43 ++++++++++++------------------------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7100701..212262f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Improve Milena's mln/fun/v2v/rgb8_to_rgbn.hh. + + * mln/fun/v2v/rgb8_to_rgbn.hh: Turn precondition into a static + assertion. + Remove (dead) debugging code. + Rewrite Doxygen comments. + Cosmetic changes. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/image/dmorph/sub_image.hh: Fix indentation. 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/fun/v2v/rgb8_to_rgbn.hh b/milena/mln/fun/v2v/rgb8_to_rgbn.hh index 74b713e..29d0d9c 100644 --- a/milena/mln/fun/v2v/rgb8_to_rgbn.hh +++ b/milena/mln/fun/v2v/rgb8_to_rgbn.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -33,8 +33,7 @@ # include <mln/core/contract.hh> /// \file -/// -/// \brief Convert rgb8 value to rgbn, n < 8. +/// \brief Conversion from mln::value::rgb8 to mln::value::rgbn. namespace mln @@ -47,53 +46,39 @@ namespace mln { - /// \brief Convert a rgb8 value to a rgn, n < 8. + /// \brief Convert an mln::value::rgb8 to an mln::value::rgbn. /// - /// \param n defines the output quantification used for the transformation. + /// \tparam n The quantification of the output value (where n < 8). /// /// \ingroup modfunv2v - // template <unsigned n> struct rgb8_to_rgbn : Function_v2v< rgb8_to_rgbn<n> > { - typedef value::rgb8 argument; + typedef value::rgb8 argument; typedef value::rgb<n> result; - /// \brief Convert a rgb8 value to a rgn, n < 8. + /// \brief Perform the conversion. /// - /// \param[in] c the rgb8 value to convert. + /// \pre The parameter (constant) n must be lower than 8. + /// + /// \param[in] c The input value. /// /// Conversion is done by computing the size by which we /// divide each rgb component. - // result operator()(const argument& c) const; - }; # ifndef MLN_INCLUDE_ONLY - /// \brief Convert a rgb8 value to a rgn, n < 8. - /// - /// \param c defines the output quantification used for the transformation. - /// - /// \ingroup modfunv2v - // template <unsigned n> typename rgb8_to_rgbn<n>::result rgb8_to_rgbn<n>::operator()(const argument& c) const { - mln_precondition(8 > n); - - unsigned size = pow(2,(8-n)); - /* - std::cout << "c : " << c << std::endl; - std::cout << "red : " << c.red() << std::endl; - std::cout << "size : " << size << std::endl; - std::cout << "res : " << (c.red() / size) << std::endl; - std::cout << "max : " << (mln_max(mln::value::int_u<n>))<< std::endl; - */ - result res(c.red() / size, c.green() / size, c.blue() / size); + mlc_bool(n < 8)::check(); + + unsigned size = pow(2, (8 - n)); + result res(c.red() / size, c.green() / size, c.blue() / size); return res; } -- 1.7.10.4

1 0

olena: olena-2.0-622-g3da3ce7 Slightly improve Scribo's tests/primitive/extract/alignments.cc.
by Roland Levillain 22 Aug '13

22 Aug '13

* tests/primitive/extract/alignments.cc (main): Pass an actual literal float as second argument to scribo::primitive::extract::alignments. Add a Doxygen header. Cosmetic changes. --- scribo/ChangeLog | 10 ++++++++++ scribo/tests/primitive/extract/alignments.cc | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f254cb..88f7ca5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Slightly improve Scribo's tests/primitive/extract/alignments.cc. + + * tests/primitive/extract/alignments.cc (main): Pass an actual + literal float as second argument to + scribo::primitive::extract::alignments. + Add a Doxygen header. + Cosmetic changes. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/tests/primitive/extract/alignments.cc b/scribo/tests/primitive/extract/alignments.cc index a069149..5c6a10a 100644 --- a/scribo/tests/primitive/extract/alignments.cc +++ b/scribo/tests/primitive/extract/alignments.cc @@ -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. // @@ -23,20 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file +/// \file +/// \brief Exercise scribo::primitive::extract::alignments. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <scribo/core/document.hh> + #include <scribo/core/paragraph_set.hh> #include <scribo/text/extract_lines_wo_merge.hh> #include <scribo/primitive/extract/alignments.hh> #include "tests/data.hh" - int main() { using namespace mln; @@ -44,7 +45,7 @@ int main() typedef image2d<scribo::def::lbl_type> L; - for (unsigned i = 1; i < 5; ++i) + for (unsigned i = 1; i <= 4; ++i) { std::ostringstream os; os << SCRIBO_IMG_DIR << "/alignment_" << i << ".pbm"; @@ -53,14 +54,13 @@ int main() doc.open(); doc.set_binary_image(data::convert(bool(), doc.image())); - // Extract lines - line_set<L> - lines = scribo::text::extract_lines_wo_merge(doc, c8()); + // Extract lines. + line_set<L> lines = scribo::text::extract_lines_wo_merge(doc, c8()); doc.set_paragraphs(scribo::make::paragraph(lines)); - // Find alignments - mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> - res = primitive::extract::alignments(doc, 3, 3); + // Find alignments. + mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> res = + primitive::extract::alignments(doc, 3.f, 3); std::ostringstream os_out; image2d<bool> ref; @@ -71,5 +71,4 @@ int main() mln_assertion(ref == res.second()); } - } -- 1.7.10.4

1 0

olena: olena-2.0-622-g99326df Slightly improve Scribo's tests/primitive/extract/alignments.cc.
by Roland Levillain 22 Aug '13

22 Aug '13

* tests/primitive/extract/alignments.cc (main): Pass an actual literal float as second argument to scribo::primitive::extract::alignments. Add a Doxygen header. Cosmetic changes. --- scribo/ChangeLog | 10 ++++++++++ scribo/tests/primitive/extract/alignments.cc | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f254cb..88f7ca5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Slightly improve Scribo's tests/primitive/extract/alignments.cc. + + * tests/primitive/extract/alignments.cc (main): Pass an actual + literal float as second argument to + scribo::primitive::extract::alignments. + Add a Doxygen header. + Cosmetic changes. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/tests/primitive/extract/alignments.cc b/scribo/tests/primitive/extract/alignments.cc index a069149..5c6a10a 100644 --- a/scribo/tests/primitive/extract/alignments.cc +++ b/scribo/tests/primitive/extract/alignments.cc @@ -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. // @@ -23,20 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file +/// \file +/// \brief Exercise scribo::primitive::extract::alignments. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <scribo/core/document.hh> + #include <scribo/core/paragraph_set.hh> #include <scribo/text/extract_lines_wo_merge.hh> #include <scribo/primitive/extract/alignments.hh> #include "tests/data.hh" - int main() { using namespace mln; @@ -44,7 +45,7 @@ int main() typedef image2d<scribo::def::lbl_type> L; - for (unsigned i = 1; i < 5; ++i) + for (unsigned i = 1; i <= 4; ++i) { std::ostringstream os; os << SCRIBO_IMG_DIR << "/alignment_" << i << ".pbm"; @@ -53,14 +54,13 @@ int main() doc.open(); doc.set_binary_image(data::convert(bool(), doc.image())); - // Extract lines - line_set<L> - lines = scribo::text::extract_lines_wo_merge(doc, c8()); + // Extract lines. + line_set<L> lines = scribo::text::extract_lines_wo_merge(doc, c8()); doc.set_paragraphs(scribo::make::paragraph(lines)); - // Find alignments - mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> - res = primitive::extract::alignments(doc, 3, 3); + // Find alignments. + mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> res = + primitive::extract::alignments(doc, 3.f, 3); std::ostringstream os_out; image2d<bool> ref; @@ -71,5 +71,4 @@ int main() mln_assertion(ref == res.second()); } - } -- 1.7.10.4

1 0

olena: olena-2.0-621-g49883e6 scribo/primitive/extract/alignments.hh: Fix Doxygen comments.
by Roland Levillain 22 Aug '13

22 Aug '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/primitive/extract/alignments.hh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e9ab8d1..1f254cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. + 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution of Scribo. diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 7bd9b94..c06880b 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -92,17 +92,17 @@ namespace scribo \pre Separators should be removed from input document image . - \pre Text in \p doc must be constructed from Components + \pre Text in \p doc must be constructed from components grouped by lines with a very strict criterion in order to keep spaces between words and paragraphs. This first grouping is necessary to avoid false positive (e.g. inside the text blocks). - \pre \p doc must have text (has_text() returns true). + \pre \p doc must have text (doc.has_text() returns true). - Internal description : - ---------------------- + Internal description: + --------------------- 1) Build an image of line bboxes 2) For TOP and BOTTOM -- 1.7.10.4

1 0

olena: olena-2.0-621-g90a82b6 scribo/primitive/extract/alignments.hh: Fix Doxygen comments.
by Roland Levillain 22 Aug '13

22 Aug '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/primitive/extract/alignments.hh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e9ab8d1..1f254cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. + 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution of Scribo. diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 7bd9b94..c06880b 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -92,17 +92,17 @@ namespace scribo \pre Separators should be removed from input document image . - \pre Text in \p doc must be constructed from Components + \pre Text in \p doc must be constructed from components grouped by lines with a very strict criterion in order to keep spaces between words and paragraphs. This first grouping is necessary to avoid false positive (e.g. inside the text blocks). - \pre \p doc must have text (has_text() returns true). + \pre \p doc must have text (doc.has_text() returns true). - Internal description : - ---------------------- + Internal description: + --------------------- 1) Build an image of line bboxes 2) For TOP and BOTTOM -- 1.7.10.4

1 0

olena: olena-2.0-620-g733069f mln/core/image/dmorph/sub_image.hh: Fix indentation.
by Roland Levillain 22 Aug '13

22 Aug '13

--- milena/ChangeLog | 4 ++++ milena/mln/core/image/dmorph/sub_image.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 60db9ea..7100701 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/image/dmorph/sub_image.hh: Fix indentation. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Enable tests/fun/v2i. * tests/fun/Makefile.am (SUBDIRS): Add v2i. diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh index 15cf254..253738c 100644 --- a/milena/mln/core/image/dmorph/sub_image.hh +++ b/milena/mln/core/image/dmorph/sub_image.hh @@ -102,8 +102,8 @@ namespace mln // template <typename I, typename S> class sub_image : public internal::image_domain_morpher< I, - S, - sub_image<I,S> > + S, + sub_image<I,S> > { public: /// Skeleton. -- 1.7.10.4

1 0