Olena-patches April 2009

olena-patches@lrde.epita.fr

11 participants
187 discussions

[PATCH 3/7] Add a tautology and an antilogy p2b functors.

by Roland Levillain

* mln/fun/p2b/tautology.hh, * mln/fun/p2b/antilogy.hh: New files. Include them... * mln/fun/p2b/all.hh: ...here. --- milena/ChangeLog | 10 +++++ milena/mln/fun/p2b/all.hh | 5 ++- milena/mln/fun/p2b/{all.hh => antilogy.hh} | 51 +++++++++++++++++++------- milena/mln/fun/p2b/{all.hh => tautology.hh} | 51 +++++++++++++++++++------- 4 files changed, 88 insertions(+), 29 deletions(-) copy milena/mln/fun/p2b/{all.hh => antilogy.hh} (57%) copy milena/mln/fun/p2b/{all.hh => tautology.hh} (57%) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb1e5da..b637f0a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-04-07 Roland Levillain <roland(a)lrde.epita.fr> + Add a tautology and an antilogy p2b functors. + + * mln/fun/p2b/tautology.hh, + * mln/fun/p2b/antilogy.hh: + New files. + Include them... + * mln/fun/p2b/all.hh: ...here. + +2009-04-07 Roland Levillain <roland(a)lrde.epita.fr> + Add minima simplification to apps/statues/mesh-complex-skel. * apps/statues/mesh-complex-skel.cc (main): Take the second diff --git a/milena/mln/fun/p2b/all.hh b/milena/mln/fun/p2b/all.hh index ed6e926..e1c75f3 100644 --- a/milena/mln/fun/p2b/all.hh +++ b/milena/mln/fun/p2b/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -51,6 +52,8 @@ namespace mln # include <mln/fun/p2b/chess.hh> # include <mln/fun/p2b/has.hh> +# include <mln/fun/p2b/tautology.hh> +# include <mln/fun/p2b/antilogy.hh> diff --git a/milena/mln/fun/p2b/all.hh b/milena/mln/fun/p2b/antilogy.hh similarity index 57% copy from milena/mln/fun/p2b/all.hh copy to milena/mln/fun/p2b/antilogy.hh index ed6e926..5a7744f 100644 --- a/milena/mln/fun/p2b/all.hh +++ b/milena/mln/fun/p2b/antilogy.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,13 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_P2B_ALL_HH -# define MLN_FUN_P2B_ALL_HH +#ifndef MLN_FUN_P2B_ANTILOGY_HH +# define MLN_FUN_P2B_ANTILOGY_HH -/*! \file mln/fun/p2b/all.hh - * - * \brief File that includes all functions from point to boolean. - */ +/// \file mln/fun/p2b/antilogy.hh +/// \brief Definition of a p2b function always returning \c false. + +# include <mln/core/concept/function.hh> +# include <mln/core/alias/point2d.hh> namespace mln @@ -40,18 +41,40 @@ namespace mln namespace fun { - /// Namespace of functions from point to boolean. namespace p2b { - } - } -} + /// \brief A p2b function always returning \c false. + /// + /// A simpler name would be `false', but this is not a valid C++ + /// identifier, as \c false is a keyword of the language. + struct antilogy : public Function_p2b< antilogy > + { + typedef bool result; + + template <typename P> + bool operator()(const P& p) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + bool + antilogy::operator()(const P& /* p */) const + { + return false; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::p2b -# include <mln/fun/p2b/chess.hh> -# include <mln/fun/p2b/has.hh> + } // end of namespace mln::fun +} // end of namespace mln -#endif // ! MLN_FUN_P2B_ALL_HH +#endif // ! MLN_FUN_P2B_ANTILOGY_HH diff --git a/milena/mln/fun/p2b/all.hh b/milena/mln/fun/p2b/tautology.hh similarity index 57% copy from milena/mln/fun/p2b/all.hh copy to milena/mln/fun/p2b/tautology.hh index ed6e926..20d03d5 100644 --- a/milena/mln/fun/p2b/all.hh +++ b/milena/mln/fun/p2b/tautology.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,13 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_P2B_ALL_HH -# define MLN_FUN_P2B_ALL_HH +#ifndef MLN_FUN_P2B_TAUTOLOGY_HH +# define MLN_FUN_P2B_TAUTOLOGY_HH -/*! \file mln/fun/p2b/all.hh - * - * \brief File that includes all functions from point to boolean. - */ +/// \file mln/fun/p2b/tautology.hh +/// \brief Definition of a p2b function always returning \c true. + +# include <mln/core/concept/function.hh> +# include <mln/core/alias/point2d.hh> namespace mln @@ -40,18 +41,40 @@ namespace mln namespace fun { - /// Namespace of functions from point to boolean. namespace p2b { - } - } -} + /// \brief A p2b function always returning \c true. + /// + /// A simpler name would be `true', but this is not a valid C++ + /// identifier, as \c true is a keyword of the language. + struct tautology : public Function_p2b< tautology > + { + typedef bool result; + + template <typename P> + bool operator()(const P& p) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + bool + tautology::operator()(const P& /* p */) const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::p2b -# include <mln/fun/p2b/chess.hh> -# include <mln/fun/p2b/has.hh> + } // end of namespace mln::fun +} // end of namespace mln -#endif // ! MLN_FUN_P2B_ALL_HH +#endif // ! MLN_FUN_P2B_TAUTOLOGY_HH -- 1.6.1.2

15 years, 1 month

[PATCH 2/7] Add minima simplification to apps/statues/mesh-complex-skel.

by Roland Levillain

* apps/statues/mesh-complex-skel.cc (main): Take the second command line parameter into account. Apply an area closing on the input before computing minima. Propagate minima information to egdes and vertices. * apps/statues/test-mesh-complex-skel.in: Adjust values passed as second parameter (lambda) to mesh-complex-skel. --- milena/ChangeLog | 11 +++ milena/apps/statues/mesh-complex-skel.cc | 101 +++++++++++++++++++------ milena/apps/statues/test-mesh-complex-skel.in | 8 +- 3 files changed, 93 insertions(+), 27 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9b9ea06..fb1e5da 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-04-07 Roland Levillain <roland(a)lrde.epita.fr> + Add minima simplification to apps/statues/mesh-complex-skel. + + * apps/statues/mesh-complex-skel.cc (main): Take the second + command line parameter into account. + Apply an area closing on the input before computing minima. + Propagate minima information to egdes and vertices. + * apps/statues/test-mesh-complex-skel.in: Adjust values passed as + second parameter (lambda) to mesh-complex-skel. + +2009-04-07 Roland Levillain <roland(a)lrde.epita.fr> + * apps/statues/mesh-complex-skel.cc: Remove dead code. 2009-04-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/milena/apps/statues/mesh-complex-skel.cc b/milena/apps/statues/mesh-complex-skel.cc index ca8ff8a..1fa460e 100644 --- a/milena/apps/statues/mesh-complex-skel.cc +++ b/milena/apps/statues/mesh-complex-skel.cc @@ -49,7 +49,10 @@ #include <mln/literal/white.hh> #include <mln/core/routine/duplicate.hh> + #include <mln/labeling/regional_minima.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/closing/area.hh> #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> @@ -554,9 +557,7 @@ int main(int argc, char* argv[]) std::string input_filename = argv[1]; // FIXME: Use lambda to filter the input. -#if 0 unsigned lambda = atoi(argv[2]); -#endif std::string output_filename = argv[3]; /*----------------. @@ -582,6 +583,16 @@ int main(int argc, char* argv[]) for_all(e) input(e) = mln_max(float); + /*-----------------. + | Simplification. | + `-----------------*/ + + /// Adjacent triangles are connected by shared edges. + typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; + nbh_t nbh; + + ima_t closed_input = mln::morpho::closing::area(input, nbh, lambda); + /*---------------. | Local minima. | `---------------*/ @@ -589,38 +600,82 @@ int main(int argc, char* argv[]) typedef mln::value::label_16 label_t; label_t nminima; - typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; - nbh_t nbh; - /* FIXME: We should use something like `ima_t | p_n_faces(2)' instead of `ima_t' here. Or better: `input' should only associate data to 2-faces. */ - mln_ch_value_(ima_t, label_t) minima = - mln::labeling::regional_minima(input, nbh, nminima); + typedef mln_ch_value_(ima_t, label_t) label_ima_t; + label_ima_t minima = + mln::labeling::regional_minima(closed_input, nbh, nminima); + + typedef mln::complex_higher_neighborhood<D, G> higher_nbh_t; + higher_nbh_t higher_nbh; + + // Propagate minima values from triangles to edges. + // FIXME: Factor this inside a function. + mln_niter_(higher_nbh_t) adj_t(higher_nbh, e); + for_all(e) + { + label_t ref_adj_minimum = mln::literal::zero; + for_all(adj_t) + if (minima(adj_t) == mln::literal::zero) + { + // If E is adjcent to a non-minimal triangle, then it must + // not belong to a minima. + ref_adj_minimum = mln::literal::zero; + break; + } + else + { + if (ref_adj_minimum == mln::literal::zero) + // If this is the first minimum seen, use it as a reference. + ref_adj_minimum = minima(adj_t); + else + // If this is not the first time a minimum is encountered, + // ensure it is REF_ADJ_MINIMUM. + mln_assertion(minima(adj_t) == ref_adj_minimum); + } + minima(e) = ref_adj_minimum; + } + + // Likewise from edges to edges to vertices. + mln_niter_(higher_nbh_t) adj_e(higher_nbh, v); + for_all(v) + { + label_t ref_adj_minimum = mln::literal::zero; + for_all(adj_e) + if (minima(adj_e) == mln::literal::zero) + { + // If V is adjcent to a non-minimal triangle, then it must + // not belong to a minima. + ref_adj_minimum = mln::literal::zero; + break; + } + else + { + if (ref_adj_minimum == mln::literal::zero) + // If this is the first minimum seen, use it as a reference. + ref_adj_minimum = minima(adj_e); + else + // If this is not the first time a minimum is encountered, + // ensure it is REF_ADJ_MINIMUM. + mln_assertion(minima(adj_e) == ref_adj_minimum); + } + minima(v) = ref_adj_minimum; + } /*-----------------------. | Initial binary image. | `-----------------------*/ typedef mln_ch_value_(ima_t, bool) bin_ima_t; - bin_ima_t surface(input.domain()); + bin_ima_t surface(minima.domain()); mln::data::fill(surface, true); // Dig ``holes'' in the surface surface by setting minima faces to false. -#if 0 - /* FIXME: The `is_n_face<2>' predicate is required because the - domain of SURFACE also comprises 0-faces and 1-faces... */ - mln::data::fill(surface - | is_n_face<2>() - | mln::pw::value(minima) != mln::pw::cst(mln::literal::zero), - false); -#endif - /* FIXME: The code above does not compile (yet). Probably because - of an incompatibility between complex_image and image_if. Use - this hand-made filling for the moment. */ - mln::p_n_faces_fwd_piter<D, G> t(input.domain(), 2); - for_all(t) - if (minima(t) != mln::literal::zero) - surface(t) = false; + // FIXME: Use fill with an image_if instead, when available/working. + mln_piter_(bin_ima_t) f(minima.domain()); + for_all(f) + if (minima(f) != mln::literal::zero) + surface(f) = false; /*-----------. | Skeleton. | diff --git a/milena/apps/statues/test-mesh-complex-skel.in b/milena/apps/statues/test-mesh-complex-skel.in index 1f8a184..9b34767 100644 --- a/milena/apps/statues/test-mesh-complex-skel.in +++ b/milena/apps/statues/test-mesh-complex-skel.in @@ -4,7 +4,7 @@ set -ex mesh_dir=@top_srcdir@/milena/mesh -time ./mesh-complex-skel $mesh_dir/three-triangles.off 25 three-triangles-skel.off -time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 25 socket-max-curv-skel.off -time ./mesh-complex-skel $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-skel.off -time ./mesh-complex-skel $mesh_dir/bunny-holefilled-pinv-curv.off 500 bunny-holefilled-pinv-curv-skel.off +time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off +time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off +time ./mesh-complex-skel $mesh_dir/teapot-max-curv.off 20 teapot-max-curv-skel.off +time ./mesh-complex-skel $mesh_dir/bunny-holefilled-pinv-curv.off 50 bunny-holefilled-pinv-curv-skel.off -- 1.6.1.2

15 years, 1 month

[PATCH 1/7] apps/statues/mesh-complex-skel.cc: Remove dead code.

by Roland Levillain

--- milena/ChangeLog | 4 ++ milena/apps/statues/mesh-complex-skel.cc | 61 ------------------------------ 2 files changed, 4 insertions(+), 61 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e173b6b..9b9ea06 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-04-07 Roland Levillain <roland(a)lrde.epita.fr> + + * apps/statues/mesh-complex-skel.cc: Remove dead code. + 2009-04-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. diff --git a/milena/apps/statues/mesh-complex-skel.cc b/milena/apps/statues/mesh-complex-skel.cc index e58c5cd..ca8ff8a 100644 --- a/milena/apps/statues/mesh-complex-skel.cc +++ b/milena/apps/statues/mesh-complex-skel.cc @@ -39,7 +39,6 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/image/image_if.hh> #include <mln/core/site_set/p_set.hh> @@ -174,13 +173,9 @@ cell(const complex_psite<D, G>& f) for_all(g) { f_hat.insert(g); -// // FIXME: Debug. -// std::cerr << g << std::endl; } } f_hat.insert(f); -// // FIXME: Debug. -// std::cerr << f << std::endl; return f_hat; } @@ -208,8 +203,6 @@ attachment(const mln::complex_psite<D, G>& f, typedef p_set<psite> faces_t; faces_t f_hat = cell(f); -// // FIXME: Debug. -// std::cerr << "f_hat.nsites() = " << f_hat.nsites() << std::endl; faces_t att_f; typedef complex_lower_higher_neighborhood<D, G> adj_nbh_t; @@ -223,8 +216,6 @@ attachment(const mln::complex_psite<D, G>& f, att_f.insert(g); break; } -// // FIXME: Debug. -// std::cerr << "att_f.nsites() = " << att_f.nsites() << std::endl; return att_f; } @@ -311,9 +302,6 @@ public: // Based on the algorithm A2 from couprie.08.pami. bool operator()(const psite& p) const { -// // FIXME: Debug. -// std::cerr << "is_simple_cell(" < faces_t; @@ -471,9 +459,6 @@ skeleton(const mln::bin_2complex_image3df& input, typedef mln::p_set<psite> set_t; set_t set; -// // FIXME: Debug. -// unsigned count = 0; - // Populate the set with candiate simple points. mln_piter(I) p(output.domain()); for_all(p) @@ -487,37 +472,12 @@ skeleton(const mln::bin_2complex_image3df& input, if (p.unproxy_().n() != I::dim) continue; -// // FIXME: Debug. -// std::cerr << "skeleton: Iteration (for_all(p)) : " -// << count++ << std::endl; - -// // FIXME: Debug. -// std::cerr << " output(p) = " << output(p) << std::endl; -// std::cerr << " is_simple(p) = " << is_simple(p) << std::endl; - if (output(p) && is_simple(p)) set.insert(p); } -// // FIXME: Debug. -// std::cerr << "skeleton: set.nsites() = " << set.nsites() << std::endl; - -// // FIXME: Debug. -// count = 0; - while (!set.is_empty()) { -// // FIXME: Debug. -// mln_piter(set_t) ps(set); -// std::cerr << "set = " << std::endl; -// for_all(ps) -// std::cerr << " " << static_cast<psite>(ps) << std::endl; -// std::cerr << std::endl; - -// // FIXME: Debug. -// std::cerr << "skeleton: Iteration (while (!set.is_empty())) : " -// << count++ << std::endl; - set_t next_set; // FIXME: Use a piter on SET instead of this hand-made iteration. for (unsigned i = 0; i < set.nsites(); ++i) @@ -662,27 +622,6 @@ int main(int argc, char* argv[]) if (minima(t) != mln::literal::zero) surface(t) = false; -// #if 0 -// /* FIXME: Debug. But alas, this does not work (yet). -// Use workaround mln::io::off::save_bin_salt instead (bad!) */ -// # if 0 -// mln::io::off::save(surface | mln::pw::value(surface) == mln::pw::cst(true), -// "surface.off"); -// # endif -// mln::io::off::save_bin_alt(surface, "surface.off"); -// #endif - -// // FIXME: Debug. -// typedef mln_ch_value_(ima_t, bool) bin_ima_t; -// bin_ima_t surface; -// mln::io::off::load(surface, -// "/Users/roland/src/olena/milena/mesh/two-triangles.off"); -// // Set one of the two triangle to false. -// p_n_faces_fwd_piter<D, G> t(surface.domain(), 2); -// t.start(); -// mln_precondition(t.is_valid()); -// surface(t) = false; - /*-----------. | Skeleton. | `-----------*/ -- 1.6.1.2

15 years, 1 month

3632: Add icdar2ppm.

by Guillaume Lazzara

* icdar/2009/hsc/icdar2ppm.cc, * icdar/2009/hsc/icdar2ppm.hh: new tool to convert icdar .dat files to ppm. --- milena/sandbox/ChangeLog | 8 ++++++ milena/sandbox/icdar/2009/hsc/icdar2ppm.cc | 16 ++++++++++++ milena/sandbox/icdar/2009/hsc/icdar2ppm.hh | 35 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/icdar/2009/hsc/icdar2ppm.cc create mode 100644 milena/sandbox/icdar/2009/hsc/icdar2ppm.hh diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index c6a6156..681b6bf 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add icdar2ppm. + + * icdar/2009/hsc/icdar2ppm.cc, + * icdar/2009/hsc/icdar2ppm.hh: new tool to convert icdar .dat files to + ppm. + +2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Update ICDAR code. * icdar/2009/hsc/lines_to_words.cc: Move some code... diff --git a/milena/sandbox/icdar/2009/hsc/icdar2ppm.cc b/milena/sandbox/icdar/2009/hsc/icdar2ppm.cc new file mode 100644 index 0000000..c4ba321 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/icdar2ppm.cc @@ -0,0 +1,16 @@ +#include "icdar2ppm.hh" + +int main(int argc, char *argv[]) +{ + if (argc < 3) + { + std::cout << "Usage: " << argv[0] << " <input.pbm> <input.dat> <output.ppm>" << std::endl + << " HSC @ ICDAR'2009" << std::endl + << "input.pbm The original image. It is used to get the image dimension." << std::endl + << "input.dat The \"Ground truth\" data" << std::endl + << "output.ppm The PPM version of input.dat." << std::endl; + return 1; + } + + mln::icdar2ppm(argv[1], argv[2], argv[3]); +} diff --git a/milena/sandbox/icdar/2009/hsc/icdar2ppm.hh b/milena/sandbox/icdar/2009/hsc/icdar2ppm.hh new file mode 100644 index 0000000..eca8c84 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/icdar2ppm.hh @@ -0,0 +1,35 @@ +#ifndef ICDAR2PPM_HH +# define ICDAR2PPM_HH + +# include <mln/core/image/image2d.hh> +# include <mln/value/label_8.hh> +# include <mln/value/rgb8.hh> +# include <mln/level/compute.hh> +# include <mln/accu/count_labels.hh> +# include <mln/debug/colorize.hh> +# include <mln/io/ppm/save.hh> +# include <mln/io/pbm/load.hh> + +# include "io/icdar/load.hh" + +namespace mln +{ + + void + icdar2ppm(const std::string& pbmfile, const std::string& icdarfile, + const std::string& ppmfile) + { + image2d<bool> ref; + io::pbm::load(ref, pbmfile); + + image2d<value::label_8> ima; + io::icdar::load(ima, icdarfile, ref.nrows(), ref.ncols()); + + value::label_8 nlines = level::compute(accu::meta::count_labels(), ima); + + io::ppm::save(debug::colorize(value::rgb8(), ima, nlines), ppmfile); + } + +} + +#endif // ! ICDAR2PPM_HH -- 1.5.6.5

15 years, 1 month

3631: Update ICDAR code.

by Guillaume Lazzara

* icdar/2009/hsc/lines_to_words.cc: Move some code... * icdar/2009/hsc/get_line_images.hh: ... here. new routine. --- milena/sandbox/ChangeLog | 7 +++ milena/sandbox/icdar/2009/hsc/get_line_images.hh | 62 ++++++++++++++++++++++ milena/sandbox/icdar/2009/hsc/lines_to_words.cc | 62 +++------------------- 3 files changed, 76 insertions(+), 55 deletions(-) create mode 100644 milena/sandbox/icdar/2009/hsc/get_line_images.hh diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 01e3f9b..c6a6156 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update ICDAR code. + + * icdar/2009/hsc/lines_to_words.cc: Move some code... + * icdar/2009/hsc/get_line_images.hh: ... here. new routine. + 2009-04-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment ICDAR-HSC. diff --git a/milena/sandbox/icdar/2009/hsc/get_line_images.hh b/milena/sandbox/icdar/2009/hsc/get_line_images.hh new file mode 100644 index 0000000..07ae749 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/get_line_images.hh @@ -0,0 +1,62 @@ +#ifndef GET_LINE_IMAGES_HH +# define GET_LINE_IMAGES_HH + +#include <mln/core/concept/image.hh> +#include <mln/core/site_set/box.hh> +#include <mln/core/image/extended.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/data/fill.hh> + +#include <mln/accu/bbox.hh> + +#include <mln/geom/bbox.hh> + +#include <mln/labeling/compute.hh> + +#include <mln/util/array.hh> + +#include <mln/pw/all.hh> +#include <mln/core/image/image_if.hh> + + +namespace mln +{ + + template <typename L> + util::array<mln_ch_value(L,bool)> + inline + get_line_images(const Image<L>& lines_, const mln_value(L)& nlines, + unsigned bbox_line_enlarge) + { + trace::entering("get_line_images"); + + const L& lines = exact(lines_); + mln_precondition(lines.is_valid()); + + util::array<box<mln_site(L)> > + bboxes = labeling::compute(accu::meta::bbox(), lines, nlines); + + util::array<mln_ch_value(L,bool)> result; + + for (unsigned i = 1; i < nlines; ++i) + { + typedef mln_ch_value(L,bool) line_t; + box<mln_site(L)> b = bboxes[i]; + b.enlarge(bbox_line_enlarge); + line_t line(b); + data::fill(((line | bboxes[i]).rw() | (pw::value(lines) == i)).rw(), true); + + result.append(line); + } + + trace::exiting("get_line_images"); + return result; + } + + +} // end of namespace mln + +#endif // ! GET_LINE_IMAGES_HH diff --git a/milena/sandbox/icdar/2009/hsc/lines_to_words.cc b/milena/sandbox/icdar/2009/hsc/lines_to_words.cc index cd4b1c3..5381d41 100644 --- a/milena/sandbox/icdar/2009/hsc/lines_to_words.cc +++ b/milena/sandbox/icdar/2009/hsc/lines_to_words.cc @@ -1,31 +1,16 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/alias/neighb2d.hh> + #include <mln/value/int_u8.hh> -#include <mln/value/label_8.hh> #include <mln/value/label_16.hh> + #include <mln/io/pgm/all.hh> #include <mln/io/pbm/all.hh> #include <mln/io/ppm/all.hh> -#include <mln/accu/bbox.hh> -#include <mln/labeling/compute.hh> -#include <mln/pw/all.hh> -#include <mln/core/image/image_if.hh> -#include <mln/data/fill.hh> -#include <mln/core/routine/extend.hh> -#include <mln/transform/distance_geodesic.hh> -#include <mln/win/disk2d.hh> -#include <mln/morpho/watershed/flooding.hh> -#include <mln/morpho/closing/structural.hh> -#include <mln/transform/distance_geodesic.hh> -#include <mln/core/image/extended.hh> -#include <mln/core/var.hh> + #include <mln/level/convert.hh> -#include <mln/level/compute.hh> -#include <mln/accu/count_labels.hh> #include <mln/labeling/relabel.hh> -#include <mln/labeling/wrap.hh> -#include <mln/core/routine/extend.hh> -#include <mln/morpho/watershed/superpose.hh> + +#include "get_line_images.hh" void usage(char* argv[]) { @@ -56,43 +41,10 @@ int main(int argc, char *argv[]) io::pgm::load(lines_, argv[2]); image2d<label_16> lines = level::convert(label_16(), lines_); - unsigned delta = 10; - label_16 nlines; labeling::relabel_inplace(lines, nlines); + util::array<image2d<bool> > result = get_line_images(lines, nlines, 10); - std::cout << "nlines = " << nlines << std::endl; - util::array<box2d> bboxes = labeling::compute(accu::meta::bbox(), lines, nlines); - - std::cout << "BBoxes computed" << std::endl; - - for (unsigned i = 1; i < nlines; ++i) - { - std::cout << "* Processing line " < line_t; - line_t line = duplicate((pw::value(lines) == i) | (lines | bboxes[i]).domain()); -// io::pbm::save(line, "l2w_line.pbm"); - - box2d b = geom::bbox(line); - b.enlarge(delta); - - mln_VAR(line_ext, extended_to(extend(line,false),b)); - -// io::pbm::save(line_ext, "l2w_line_ext.pbm"); - - std::cout << " Distance geodesic" << std::endl; - mln_VAR(line_dmap, transform::distance_geodesic(line_ext, c4(), mln_max(unsigned))); - - std::cout << " closing structural" << std::endl; - mln_VAR(line_clo, morpho::closing::structural(line_dmap, win::disk2d(21))); - - - std::cout << " Watershed" << std::endl; - label_16 nwords; - mln_VAR(wst, morpho::watershed::flooding(line_clo, c4(), nwords)); - -// io::ppm::save(morpho::watershed::superpose(input | bboxes[i], wst), "l2w_wst.ppm"); -// abort(); - } + io::pbm::save(result[2], argv[3]); } -- 1.5.6.5

15 years, 1 month

3630: Augment ICDAR-HSC.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment ICDAR-HSC. * icdar/2009/hsc/line_to_words.hh: New. * icdar/2009/hsc/input_to_wsl.cc: Add some log. * icdar/2009/hsc/line_to_words.cc: New. * icdar/2009/hsc/ws_to_wsl.hh (pass): New. (ws_to_wslines): Use the 'pass' routine. * theo/icdar/hsc/reduce.sh: New. * theo/icdar/hsc/words.sh: New. icdar/2009/hsc/input_to_wsl.cc | 5 + icdar/2009/hsc/line_to_words.cc | 45 +++++++++++++++ icdar/2009/hsc/line_to_words.hh | 114 ++++++++++++++++++++++++++++++++++++++++ icdar/2009/hsc/ws_to_wsl.hh | 48 ++++++++++++++-- theo/icdar/hsc/reduce.sh | 4 + theo/icdar/hsc/words.sh | 7 ++ 6 files changed, 215 insertions(+), 8 deletions(-) Index: icdar/2009/hsc/line_to_words.hh --- icdar/2009/hsc/line_to_words.hh (revision 0) +++ icdar/2009/hsc/line_to_words.hh (revision 0) @@ -0,0 +1,114 @@ + +#include <mln/value/int_u.hh> + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/transform/distance_front.hh> +#include <mln/make/w_window2d_int.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/closing/area.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/watershed/flooding.hh> + + + +namespace mln +{ + + + image2d<bool> // Fwd decl. + reduce_negate(const image2d<bool>& input); + + + + template <typename L> + image2d<L> + line_to_words(const image2d<bool>& input, L& n_words) + { + // Parameters. + + const unsigned + height = 5, + width = 11, + l_area = 500; + + // end of Parameters. + + + image2d<bool> + sub = reduce_negate(input), + clo = morpho::closing::structural(sub, + win::rectangle2d(height, + width)); + + int ww[] = { 00, 11, 0, 11, 0, + 11, 7, 5, 7, 11, + 00, 5, 0, 5, 0, + 11, 7, 5, 7, 11, + 00, 11, 0, 11, 0 }; + + typedef value::int_u<12> int_u12; + image2d<int_u12> + dmap = transform::distance_front(clo, + c4(), make::w_window2d_int(ww), + mln_max(int_u12)), + dmap_ = morpho::closing::area(dmap, c4(), l_area); + + image2d<L> ws = morpho::elementary::dilation(morpho::watershed::flooding(dmap_, + c4(), + n_words), + c4()); + + image2d<L> output(input.domain()); + + { + const int + min_row = input.domain().pmin().row(), + min_col = input.domain().pmin().col(); + + mln_piter_(box2d) p(input.domain()); + for_all(p) + if (input(p)) + output(p) = 0; + else + output(p) = ws.at_((p.row() - min_row) / 2, + (p.col() - min_col) / 2); + } + + return output; + } + + + + image2d<bool> + reduce_negate(const image2d<bool>& input) + { + const int + min_row = input.domain().pmin().row(), + min_col = input.domain().pmin().col(), + max_row = input.domain().pmax().row(), + max_col = input.domain().pmax().col(); + + image2d<bool> output(input.nrows() / 2, + input.ncols() / 2); + + for (int row = min_row; row <= max_row; row += 2) + for (int col = min_col; col <= max_col; col += 2) + { + unsigned count = 0; + if (input.at_(row, col) == false) ++count; + if (input.at_(row, col + 1) == false) ++count; + if (input.at_(row + 1, col) == false) ++count; + if (input.at_(row + 1, col + 1) == false) ++count; + output.at_((row - min_row) / 2, + (col - min_col) / 2) = (count >= 2); + } + return output; + } + + + +} // ! mln Index: icdar/2009/hsc/input_to_wsl.cc --- icdar/2009/hsc/input_to_wsl.cc (revision 3629) +++ icdar/2009/hsc/input_to_wsl.cc (working copy) @@ -115,6 +115,11 @@ int_u8 n_basins; ws = morpho::watershed::flooding(clo, c4(), n_basins); +# ifdef LOG + io::pgm::save(ws, "tmp_ws.pgm"); + io::ppm::save(debug::colorize(rgb8(), ws, n_basins), "tmp_ws.ppm"); +# endif + image2d<int_u8> wsl = ws_to_wslines(input, small, ws, n_basins); Index: icdar/2009/hsc/line_to_words.cc --- icdar/2009/hsc/line_to_words.cc (revision 0) +++ icdar/2009/hsc/line_to_words.cc (revision 0) @@ -0,0 +1,45 @@ +#include <mln/value/int_u8.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <sandbox/icdar/2009/hsc/line_to_words.hh> + + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " line.pbm output.pgm" << std::endl + << " HSC @ ICDAR'2009" << std::endl + << " line.pbm: a 2D image of a line (text is black; background is white)" << std::endl + << " output.pgm: output image where words are labeled (int_u8)" << std::endl + << " 0 is the background label." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) + usage(argv); + + + trace::entering("main"); + + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + int_u8 n_words; + image2d<int_u8> output = line_to_words(input, n_words); + + io::pgm::save(output, argv[2]); + + + trace::exiting("main"); +} Index: icdar/2009/hsc/ws_to_wsl.hh --- icdar/2009/hsc/ws_to_wsl.hh (revision 3629) +++ icdar/2009/hsc/ws_to_wsl.hh (working copy) @@ -1,3 +1,5 @@ +#include <cmath> + #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> @@ -101,13 +103,17 @@ if (n_ == 0) return; mean_ /= n_; - algebra::mat<2,1,float> mu; cov_ = cov_ / n_ - to_mat(mean_) * trans(mean_); float a = cov_(0, 0), b = cov_(0, 1), c = cov_(1, 0), d = cov_(1, 1), r = a * d - b * c; + + float D = std::sqrt((a - d) * (a - d) + 4 * b * c); + lambda1_ = 0.5 * (a + d + D); + lambda2_ = 0.5 * (a + d - D); + if (r > -0.001f && r < 0.001f) // too close to 0 { n_ = 0; // invalidation @@ -174,12 +180,16 @@ return valid_; } + float lambda1() const { return lambda1_; } + float lambda2() const { return lambda2_; } + protected: bool valid_; unsigned n_; algebra::vec<2,float> mean_; algebra::mat<2,2,float> cov_, cov_1_; + float lambda1_, lambda2_; }; @@ -225,6 +235,31 @@ + bool + pass(const util::array<mahalanobis>& m, + unsigned l, unsigned r) + { + float + // vertical std deviations + vs_l = std::sqrt(m[l].cov()(0, 0)), + vs_r = std::sqrt(m[r].cov()(0, 0)), + // vertical distance + vd = std::abs(m[l].mean()[0] - m[r].mean()[0]), + // horizontal std deviations + hs_l = std::sqrt(m[l].cov()(1, 1)), + hs_r = std::sqrt(m[r].cov()(1, 1)), + // horizontal means (column coordinates) + hm_l = m[l].mean()[1], + hm_r = m[r].mean()[1]; + + bool + v_criterion = (vd < 5 * std::sqrt(vs_l * vs_r)), // FIXME: say 4? + h_criterion = (hm_r - 1 * hs_r > hm_l + 1 * hs_l); // FIXME: say 1.5? + + return v_criterion && h_criterion; + } + + template <typename L> image2d<L> @@ -296,7 +331,8 @@ if (m[v2].col() < v_col) { // v2 <-- v - if (d_ < d_left_min) + if (pass(m, v2, v.id()) + && d_ < d_left_min) { d_left_min = d_; v_left_best = v2; @@ -305,7 +341,8 @@ else { // v --> v2 - if (d_ < d_right_min) + if (pass(m, v.id(), v2) + && d_ < d_right_min) { d_right_min = d_; v_right_best = v2; @@ -319,7 +356,6 @@ } - util::array<L> parent(n_basins + 1); // Computing parent. @@ -334,11 +370,7 @@ continue; unsigned r = v_right[l]; if (v_left[r] != l) - { - // std::cout << '.' << std::endl; continue; - } - // std::cout << l << " -> " << r << std::endl; parent[l] = r; } Index: theo/icdar/hsc/reduce.sh --- theo/icdar/hsc/reduce.sh (revision 0) +++ theo/icdar/hsc/reduce.sh (revision 0) @@ -0,0 +1,4 @@ +#! /bin/sh + +convert -negate -geometry 50% +compress -depth 8 $1 ${1%.pbm}_50p.pbm +convert -depth 8 +compress ${1%.pbm}_50p.pbm ${1%.pbm}_50p.pgm Property changes on: theo/icdar/hsc/reduce.sh ___________________________________________________________________ Added: svn:executable + * Index: theo/icdar/hsc/words.sh --- theo/icdar/hsc/words.sh (revision 0) +++ theo/icdar/hsc/words.sh (revision 0) @@ -0,0 +1,7 @@ +#! /bin/sh + +./+bin/closing_rectangle $1 5 11 tmp_small_clo.pbm +./+bin/distance_thick tmp_small_clo.pbm tmp_dist.pgm +./+bin/closing_area tmp_dist.pgm 500 tmp_clo.pgm +./+bin/watershed_flooding tmp_clo.pgm tmp_ws.pgm +./+bin/watershed_superpose ${1%pbm}pgm tmp_ws.pgm ${1%pbm}ppm Property changes on: theo/icdar/hsc/words.sh ___________________________________________________________________ Added: svn:executable + *

15 years, 1 month

3629: Add ICDAR I/O routines.

by Guillaume Lazzara

* icdar/2009/hsc/icdar_io.cc: sample / test. * icdar/2009/hsc/io/icdar/load.hh, * icdar/2009/hsc/io/icdar/save.hh: I/O routines. --- milena/sandbox/ChangeLog | 8 ++ milena/sandbox/icdar/2009/hsc/icdar_io.cc | 51 +++++++++++++ milena/sandbox/icdar/2009/hsc/io/icdar/load.hh | 96 ++++++++++++++++++++++++ milena/sandbox/icdar/2009/hsc/io/icdar/save.hh | 88 ++++++++++++++++++++++ 4 files changed, 243 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/icdar/2009/hsc/icdar_io.cc create mode 100644 milena/sandbox/icdar/2009/hsc/io/icdar/load.hh create mode 100644 milena/sandbox/icdar/2009/hsc/io/icdar/save.hh diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 37485b0..a5875f7 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add ICDAR I/O routines. + + * icdar/2009/hsc/icdar_io.cc: sample / test. + * icdar/2009/hsc/io/icdar/load.hh, + * icdar/2009/hsc/io/icdar/save.hh: I/O routines. + +2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new small tools for ICDAR. * icdar/2009/hsc/input_lines_to_lines.cc: Iterate on lbl.domain(). diff --git a/milena/sandbox/icdar/2009/hsc/icdar_io.cc b/milena/sandbox/icdar/2009/hsc/icdar_io.cc new file mode 100644 index 0000000..3b9ca74 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/icdar_io.cc @@ -0,0 +1,51 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/make/image2d.hh> +#include <mln/debug/println.hh> +#include <mln/io/pgm/load.hh> +#include <mln/level/compare.hh> + +#include "io/icdar/save.hh" +#include "io/icdar/load.hh" + +int main(int argc, char *argv[]) +{ + using namespace mln; + using namespace mln::value; + + if (argc < 2) + { + std::cout << "Usage: " << argv[0] << " <input.pgm>" << std::endl; + return 1; + } + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + io::icdar::save(input, "icdar.raw"); + + image2d<int_u8> output; + io::icdar::load(output, "icdar.raw", 48, 44); + + mln_assertion(output.domain() == input.domain()); + mln_assertion(output == input); + + /// Small test. +// { +// int_u8 val[4][5] = { { 2, 3, 6, 7, 8 }, +// { 1, 2, 3, 4, 5 }, +// { 1, 2, 3, 4, 5 }, +// { 1, 2, 3, 4, 5 } }; +// +// image2d<int_u8> ima = make::image(val); +// +// debug::println(ima); +// +// io::icdar::save(ima, "icdar.raw"); +// +// image2d<int_u8> ima_l; +// +// io::icdar::load(ima_l, "icdar.raw", 4, 5); +// +// debug::println(ima_l); +// } +} diff --git a/milena/sandbox/icdar/2009/hsc/io/icdar/load.hh b/milena/sandbox/icdar/2009/hsc/io/icdar/load.hh new file mode 100644 index 0000000..35f59f6 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/io/icdar/load.hh @@ -0,0 +1,96 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef MLN_IO_ICDAR_LOAD_HH +# define MLN_IO_ICDAR_LOAD_HH + +/// \file mln/io/icdar/load.hh +/// +/// Load an image saved as a raw buffer of integers. +/// Output file format for ICDAR 2009 contest. +/// +/// Reference: http://www.iit.demokritos.gr/~bgat/HandSegmCont2009/Protocol.html + +#include <cstdio> +#include <mln/core/concept/image.hh> + + +namespace mln +{ + + namespace io + { + + namespace icdar + { + + template <typename I> + void load(Image& ima_, const std::string& filename, + int nrows, int ncols); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + void load(Image& ima_, const std::string& filename, + int nrows, int ncols) + { + trace::entering("io::icdar::load"); + + I& ima = exact(ima_); + ima = I(nrows, ncols, 0); // Make sure there is no border. + + int size = nrows * ncols; + unsigned int *buffer; //Pointer to store raw data + FILE *f; + + buffer = (unsigned int *) calloc (size, sizeof (int)); + f = fopen(filename.c_str(), "rb"); + fread(buffer, size, sizeof (int),f); + + for (int i = 0; i < size; ++i) + { + mln_value(I) v;// = buffer[i]; + convert::from_to(buffer[i], v); + ima(ima.point_at_index(i)) = v; + } + + fclose(f); + + trace::exiting("io::icdar::load"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::icdar + + } // end of namespace mln::io + +} // end of namespace mln + +#endif // ! MLN_IO_ICDAR_LOAD_HH diff --git a/milena/sandbox/icdar/2009/hsc/io/icdar/save.hh b/milena/sandbox/icdar/2009/hsc/io/icdar/save.hh new file mode 100644 index 0000000..7a9ad5f --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/io/icdar/save.hh @@ -0,0 +1,88 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef MLN_IO_ICDAR_SAVE_HH +# define MLN_IO_ICDAR_SAVE_HH + +/// \file mln/io/icdar/save.hh +/// +/// Save an image as a raw buffer of integers. +/// Output file format for ICDAR 2009 contest. +/// +/// Reference: http://www.iit.demokritos.gr/~bgat/HandSegmCont2009/Protocol.html + +#include <cstdio> +#include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace io + { + + namespace icdar + { + + template <typename I> + void save(const Image& ima_, const std::string& filename); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + void save(const Image& ima_, const std::string& filename) + { + trace::entering("io::icdar::save"); + + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + FILE *f = fopen(filename.c_str(), "wb"); + + mln_piter(I) p(ima.domain()); + for_all(p) + { + /// Probably too violent... + unsigned int value = static_cast<unsigned int>(ima(p)); + fwrite(&value, sizeof (int), 1, f); + } + + fclose(f); + + trace::exiting("io::icdar::save"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::icdar + + } // end of namespace mln::io + +} // end of namespace mln + +#endif // ! MLN_IO_ICDAR_SAVE_HH -- 1.5.6.5

15 years, 1 month

3628: Add new small tools for ICDAR.

by Guillaume Lazzara

* icdar/2009/hsc/input_lines_to_lines.cc: Iterate on lbl.domain(). * icdar/2009/hsc/label_maj.hh: new accumulator computing the most represented label in a component. * icdar/2009/hsc/lines_to_words.cc: basic canvas for splitting lines into words. --- milena/sandbox/ChangeLog | 12 ++ .../sandbox/icdar/2009/hsc/input_lines_to_lines.cc | 12 +- milena/sandbox/icdar/2009/hsc/label_maj.hh | 197 ++++++++++++++++++++ milena/sandbox/icdar/2009/hsc/lines_to_words.cc | 98 ++++++++++ 4 files changed, 314 insertions(+), 5 deletions(-) create mode 100644 milena/sandbox/icdar/2009/hsc/label_maj.hh create mode 100644 milena/sandbox/icdar/2009/hsc/lines_to_words.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index ba700f8..37485b0 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,17 @@ 2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new small tools for ICDAR. + + * icdar/2009/hsc/input_lines_to_lines.cc: Iterate on lbl.domain(). + + * icdar/2009/hsc/label_maj.hh: new accumulator computing the most + represented label in a component. + + * icdar/2009/hsc/lines_to_words.cc: basic canvas for splitting lines + into words. + +2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new known bugs in sandbox. * bugs/algebra_vec_ne_op.cc: issues with algebra::vec operators. diff --git a/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc b/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc index eb46b36..56aafab 100644 --- a/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc +++ b/milena/sandbox/icdar/2009/hsc/input_lines_to_lines.cc @@ -6,17 +6,17 @@ #include <mln/value/label_16.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/all.hh> -#include <mln/accu/lbl_maj.hh> #include <mln/labeling/compute.hh> #include <mln/pw/all.hh> #include <mln/core/image/image_if.hh> #include <mln/data/fill.hh> +#include "label_maj.hh" void usage(char* argv[]) { std::cerr << "usage: " << argv[0] << " input.pbm lines.pgm output.pgm" << std::endl << " HSC @ ICDAR'2009" << std::endl - << " Rebuild splitted components from a label image." << std::endl; + << " Rebuild splitted components from a label image." << std::endl << " input.pbm: input 2D binary image (text is black; background is white)" << std::endl << " lines.pgm: output image where line components are labeled (int_u8)" << std::endl << " 0 is the background label." << std::endl @@ -45,8 +45,8 @@ int main(int argc, char *argv[]) util::array<box2d> bboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); /// Compute the most represented label for each component. - accu::lbl_maj<label_16, int_u8> accu(nlabels.next()); - mln_piter_(image2d<int_u8>) p(lines.domain()); + accu::label_maj<label_16, int_u8> accu(nlabels.next()); + mln_piter_(image2d<int_u8>) p(lbl.domain()); for_all(p) if (lines(p) != 0u) accu.take(lbl(p), lines(p)); @@ -55,8 +55,10 @@ int main(int argc, char *argv[]) // Rebuild components. util::array<util::couple<int_u8, float> > res = accu.to_result(); for (unsigned i = 1; i < res.nelements(); ++i) - if (res[i].second() >= 0.9f) + if (res[i].second() >= 0.70f) data::fill(((lines | bboxes[i]).rw() | (pw::value(lbl) != 0u)).rw(), res[i].first()); + else + std::cout << res[i].first() << " - " << res[i].second() << std::endl; // Save result. io::pgm::save(lines, argv[3]); diff --git a/milena/sandbox/icdar/2009/hsc/label_maj.hh b/milena/sandbox/icdar/2009/hsc/label_maj.hh new file mode 100644 index 0000000..a46241c --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/label_maj.hh @@ -0,0 +1,197 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef MLN_ACCU_LABEL_MAJ_HH +# define MLN_ACCU_LABEL_MAJ_HH + +/// \file mln/accu/label_maj.hh +/// +/// Define an accumulator that computes the most represented label in +/// a component. + + +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/accu/internal/base.hh> +# include <mln/trait/value_.hh> +# include <mln/util/array.hh> +# include <mln/util/couple.hh> +# include <vector> +# include <map> + + +namespace mln +{ + + namespace accu + { + + + /// Computes the most represented label in a component. + /// The parameter \c L1 is the label type of the component in the + /// first label image. + /// The parameter \c L2 is the label type in the second label image. + template <typename L1, typename L2> + struct label_maj +// : public mln::accu::internal::base< util::array<util::couple<L2,float> >, +// label_maj<L1,L2> > + { + typedef L2 argument; + + label_maj(); + label_maj(unsigned nlabels); + + /// Manipulators. + /// \{ + void init(); + void take(const L1& l, const L2& L); + void take(const label_maj<L1,L2>& other); + /// \} + + /// Get the value of the accumulator. + util::array< util::couple<L2,float> > to_result() const; + + //operator L2 () const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + util::array< util::couple<L2,float> > finalize_() const; + + const util::array<std::map<L2,unsigned> >& maj_array_() const; + + protected: + util::array<std::map<L2,unsigned> > maj_; + + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename L1, typename L2> + inline + label_maj<L1,L2>::label_maj() + { + } + + template <typename L1, typename L2> + inline + label_maj<L1,L2>::label_maj(unsigned nlabels) + : maj_(nlabels + 1) // Do not forget to count the background label. + { + } + + template <typename L1, typename L2> + inline + void + label_maj<L1,L2>::init() + { + } + + template <typename L1, typename L2> + inline + void + label_maj<L1,L2>::take(const L1& l, const L2& L) + { + if (maj_[l].find(L) != maj_[l].end()) + maj_[l][static_cast<unsigned>(L)] += 1; + else + maj_[l][static_cast<unsigned>(L)] = 1; + } + + template <typename L1, typename L2> + inline + void + label_maj<L1,L2>::take(const label_maj<L1,L2>& other) + { + //FIXME + abort(); + } + + template <typename L1, typename L2> + inline + util::array< util::couple<L2,float> > + label_maj<L1,L2>::finalize_() const + { + util::array< util::couple<L2,float> > p(maj_.nelements()); + for (unsigned i = 1; i < maj_.nelements(); ++i) + { + L2 + maj_l = literal::zero; + unsigned + maj_card = 0, + total_card = 0; + + for (typename std::map<L2,unsigned>::const_iterator it = maj_[i].begin(); + it != maj_[i].end(); ++it) + { + if (maj_card < it->second) + { + maj_l = it->first; + maj_card = it->second; + } + total_card += it->second; + } + + p[i] = make::couple(maj_l, maj_card / static_cast<float>(total_card)); + } + + return p; + } + + template <typename L1, typename L2> + inline + const util::array<std::map<L2,unsigned> >& + label_maj<L1,L2>::maj_array_() const + { + return maj_; + } + + + template <typename L1, typename L2> + inline + util::array< util::couple<L2,float> > + label_maj<L1,L2>::to_result() const + { + return finalize_(); + } + + template <typename L1, typename L2> + inline + bool + label_maj<L1,L2>::is_valid() const + { + return maj_.nelements() > 0; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_LABEL_MAJ_H _HH diff --git a/milena/sandbox/icdar/2009/hsc/lines_to_words.cc b/milena/sandbox/icdar/2009/hsc/lines_to_words.cc new file mode 100644 index 0000000..cd4b1c3 --- /dev/null +++ b/milena/sandbox/icdar/2009/hsc/lines_to_words.cc @@ -0,0 +1,98 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/label_8.hh> +#include <mln/value/label_16.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/pbm/all.hh> +#include <mln/io/ppm/all.hh> +#include <mln/accu/bbox.hh> +#include <mln/labeling/compute.hh> +#include <mln/pw/all.hh> +#include <mln/core/image/image_if.hh> +#include <mln/data/fill.hh> +#include <mln/core/routine/extend.hh> +#include <mln/transform/distance_geodesic.hh> +#include <mln/win/disk2d.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/transform/distance_geodesic.hh> +#include <mln/core/image/extended.hh> +#include <mln/core/var.hh> +#include <mln/level/convert.hh> +#include <mln/level/compute.hh> +#include <mln/accu/count_labels.hh> +#include <mln/labeling/relabel.hh> +#include <mln/labeling/wrap.hh> +#include <mln/core/routine/extend.hh> +#include <mln/morpho/watershed/superpose.hh> + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << "lines.pgm nlines output.pgm" << std::endl + << " HSC @ ICDAR'2009" << std::endl + << " Split lines into words." << std::endl + << " input.pbm: input 2D binary image (text is black; background is white)" << std::endl + << " lines.pgm: output image where line components are labeled (int_u8)" << std::endl + << " 0 is the background label." << std::endl + << " output.pgm: output image where line components are labeled (int_u8)" << std::endl + << " 0 is the background label." << std::endl; + std::abort(); +} + + +int main(int argc, char *argv[]) +{ + using namespace mln; + using namespace mln::value; + + if (argc < 4) + usage(argv); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + image2d<int_u8> lines_; + io::pgm::load(lines_, argv[2]); + image2d<label_16> lines = level::convert(label_16(), lines_); + + unsigned delta = 10; + + label_16 nlines; + labeling::relabel_inplace(lines, nlines); + + + std::cout << "nlines = " << nlines << std::endl; + util::array<box2d> bboxes = labeling::compute(accu::meta::bbox(), lines, nlines); + + std::cout << "BBoxes computed" << std::endl; + + for (unsigned i = 1; i < nlines; ++i) + { + std::cout << "* Processing line " < line_t; + line_t line = duplicate((pw::value(lines) == i) | (lines | bboxes[i]).domain()); +// io::pbm::save(line, "l2w_line.pbm"); + + box2d b = geom::bbox(line); + b.enlarge(delta); + + mln_VAR(line_ext, extended_to(extend(line,false),b)); + +// io::pbm::save(line_ext, "l2w_line_ext.pbm"); + + std::cout << " Distance geodesic" << std::endl; + mln_VAR(line_dmap, transform::distance_geodesic(line_ext, c4(), mln_max(unsigned))); + + std::cout << " closing structural" << std::endl; + mln_VAR(line_clo, morpho::closing::structural(line_dmap, win::disk2d(21))); + + + std::cout << " Watershed" << std::endl; + label_16 nwords; + mln_VAR(wst, morpho::watershed::flooding(line_clo, c4(), nwords)); + +// io::ppm::save(morpho::watershed::superpose(input | bboxes[i], wst), "l2w_wst.ppm"); +// abort(); + } +} -- 1.5.6.5

15 years, 1 month

3627: Add new known bugs in sandbox.

by Guillaume Lazzara

* bugs/algebra_vec_ne_op.cc: issues with algebra::vec operators. * bugs/lut.cc: issues with lookup table and level::transform. --- milena/sandbox/ChangeLog | 8 ++++++++ milena/sandbox/bugs/algebra_vec_ne_op.cc | 19 +++++++++++++++++++ milena/sandbox/bugs/lut.cc | 23 +++++++++++++++++++++++ 3 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/bugs/algebra_vec_ne_op.cc create mode 100644 milena/sandbox/bugs/lut.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index f6e6e15..ba700f8 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,11 @@ +2009-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new known bugs in sandbox. + + * bugs/algebra_vec_ne_op.cc: issues with algebra::vec operators. + + * bugs/lut.cc: issues with lookup table and level::transform. + 2009-04-06 Guillaume Lazzara <z(a)lrde.epita.fr> Add a small tool to map text components to lines. diff --git a/milena/sandbox/bugs/algebra_vec_ne_op.cc b/milena/sandbox/bugs/algebra_vec_ne_op.cc new file mode 100644 index 0000000..aee31ed --- /dev/null +++ b/milena/sandbox/bugs/algebra_vec_ne_op.cc @@ -0,0 +1,19 @@ +/// Do not compile + + +# include <mln/algebra/vec.hh> +int main() +{ + using namespace mln::algebra; + vec<3, float> a, b; + + // Do NOT work + bool c = (a != b); + + // Work + c = !(a == b); + + // Work + c = (a == b); +} + diff --git a/milena/sandbox/bugs/lut.cc b/milena/sandbox/bugs/lut.cc new file mode 100644 index 0000000..d7e9ecb --- /dev/null +++ b/milena/sandbox/bugs/lut.cc @@ -0,0 +1,23 @@ +/// Passing a fun::i2v::array to level::Transform can lead to a segfault. +/// Through the dispatch of level::transform, a dispatch function detects that +/// we are using int_u8 as values, meaning a low quantification value type. +/// It tries to compute a look-up table (lut) which for each int_u8 value +/// (0-255), maps a new value computed thanks to the function. + +#include <mln/core/image/image2d.hh> +#include <mln/fun/i2v/array.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/transform.hh> + +int main() +{ + using namespace mln; + + image2d<value::int_u8> ima(4, 4); + + /// This function can compute values for 0,1 and 2. + fun::i2v::array<bool> f(3, true); + + /// Crash, since the lut computes values for 0-255. + level::transform(ima, f); +} -- 1.5.6.5

15 years, 1 month

3626: Small fixes.

by Guillaume Lazzara

* mln/convert/from_to.hxx, * mln/value/label.hh: add conversion from int_u<n> to label<m>. * mln/fun/x2x/rotation.hh, * mln/fun/x2x/translation.hh: update doc. * mln/labeling/relabel.hh: add a new overload. * mln/labeling/wrap.hh: add a new overload with a default argument. * mln/util/couple.hh: make it a class. --- milena/ChangeLog | 16 ++++++++ milena/mln/convert/from_to.hxx | 5 ++ milena/mln/fun/x2x/rotation.hh | 2 +- milena/mln/fun/x2x/translation.hh | 13 ++---- milena/mln/labeling/relabel.hh | 76 +++++++++++++++++++++++++++++++++++++ milena/mln/labeling/wrap.hh | 20 ++++++++++ milena/mln/util/couple.hh | 3 +- milena/mln/value/label.hh | 16 ++++++++ 8 files changed, 140 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c7c171e..e173b6b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-04-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Small fixes. + + * mln/convert/from_to.hxx, + * mln/value/label.hh: add conversion from int_u<n> to label<m>. + + * mln/fun/x2x/rotation.hh, + * mln/fun/x2x/translation.hh: update doc. + + * mln/labeling/relabel.hh: add a new overload. + + * mln/labeling/wrap.hh: add a new overload with a default argument. + + * mln/util/couple.hh: make it a class. + +2009-04-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new accumulators related to labels. * mln/accu/all.hh: include new accumulators. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index eb05b13..d21304c 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -175,6 +175,11 @@ namespace mln template <unsigned n> void from_to_(const value::int_u<n>& from, value::label<n>& to_); + // int_u<n> -> label<m> with n < m + template <unsigned n, unsigned m> + void + from_to_(const value::int_u<n>& from, value::label<m>& to_); + // hsl -> rgb8. template <typename H, typename S, typename L> void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index cbe1dd2..b38cffb 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -148,7 +148,7 @@ namespace mln /// Constructor without argument. rotation(); - /// Constructor with grade alpha and a facultative direction (rotation axis). + /// Constructor with radian alpha and a facultative direction (rotation axis). rotation(float alpha, const algebra::vec<n,float>& axis); /// Constructor with quaternion rotation(const algebra::quat& q); diff --git a/milena/mln/fun/x2x/translation.hh b/milena/mln/fun/x2x/translation.hh index 4101d77..a6e8a39 100644 --- a/milena/mln/fun/x2x/translation.hh +++ b/milena/mln/fun/x2x/translation.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_FUN_X2X_TRANSLATION_HH # define MLN_FUN_X2X_TRANSLATION_HH -/*! \file mln/fun/x2x/translation.hh - * - * \brief Define a translation function. - */ +/// \file mln/fun/x2x/translation.hh +/// +/// Define a translation function. # include <mln/core/concept/function.hh> # include <mln/fun/internal/x2x_linear_impl.hh> @@ -48,9 +47,7 @@ namespace mln namespace x2x { - /*! \brief Represent a translation function. - * - */ + /// Represent a translation function. template <unsigned n, typename C> struct translation : fun::internal::x2x_linear_impl_< algebra::vec<n,C>, translation<n,C> > diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index 47ca647..c24c0dd 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -35,15 +35,26 @@ # include <mln/core/concept/image.hh> # include <mln/make/relabelfun.hh> +# include <mln/level/compute.hh> # include <mln/level/transform.hh> # include <mln/level/transform_inplace.hh> # include <mln/value/label.hh> +# include <mln/accu/label_used.hh> namespace mln { namespace labeling { + /// Relabel a labeled image in order to have a contiguous labeling. + /// \input[in] label The labeled image. + /// \input[out] new_nlabels The number of labels after relabeling. + /// + /// \return The relabeled image. + template <typename I> + mln_concrete(I) + relabel(const Image& label, + mln_value(I)& new_nlabels); /// Remove components and relabel a labeled image. /// \input[in] label the labeled image. @@ -73,6 +84,15 @@ namespace mln const mln_value(I)& nlabels, const Function_v2v<F>& fv2v); + /// Relabel inplace a labeled image in order to have a contiguous + /// labeling. + /// \input[in] label The labeled image. + /// \input[out] new_nlabels The number of labels after relabeling. + template <typename I> + void + relabel_inplace(Image& label, + mln_value(I)& new_nlabels); + /// Remove components and relabel a labeled image inplace. /// \input[in, out] label the labeled image. /// \input[in, out] nlabels the number of labels in \p label. @@ -105,6 +125,18 @@ namespace mln namespace internal { + template <typename I> + void + relabel_tests(const Image& label, + mln_value(I)& new_nlabels) + { + // FIXME: we may want to check that it is exactly a label. + mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); + mln_precondition(exact(label).is_valid()); + (void) label; + (void) new_nlabels; + } + template <typename I, typename F> void relabel_tests(const Image& label, @@ -153,6 +185,29 @@ namespace mln } // end of namespace mln::labeling::internal + template <typename I> + mln_concrete(I) + relabel(const Image& label, + mln_value(I)& new_nlabels) + { + trace::entering("labeling::relabel"); + + internal::relabel_tests(label, new_nlabels); + + fun::i2v::array<bool> + fv2b = level::compute(accu::meta::label_used(), label); + + mln_value(I) tmp_nlabels = fv2b.size() - 1; + mln_concrete(I) + output = level::transform(label, + make::relabelfun(fv2b, + tmp_nlabels, + new_nlabels)); + + trace::exiting("labeling::relabel"); + return output; + } + template <typename I, typename F> inline @@ -194,6 +249,27 @@ namespace mln } + template <typename I> + void + relabel_inplace(Image& label, + mln_value(I)& new_nlabels) + { + trace::entering("labeling::relabel_inplace"); + + internal::relabel_tests(label, new_nlabels); + + fun::i2v::array<bool> + fv2b = level::compute(accu::meta::label_used(), label); + + mln_value(I) tmp_nlabels = fv2b.size() - 1; + exact(label) = level::transform(label, + make::relabelfun(fv2b, + tmp_nlabels, + new_nlabels)); + + trace::exiting("labeling::relabel_inplace"); + } + template <typename I, typename F> inline diff --git a/milena/mln/labeling/wrap.hh b/milena/mln/labeling/wrap.hh index aa6478f..5a29870 100644 --- a/milena/mln/labeling/wrap.hh +++ b/milena/mln/labeling/wrap.hh @@ -39,6 +39,7 @@ # include <mln/fun/l2l/wrap.hh> # include <mln/metal/converts_to.hh> # include <mln/metal/is_a.hh> +# include <mln/value/label_8.hh> namespace mln { @@ -57,6 +58,15 @@ namespace mln mln_ch_value(I,V) wrap(const V& value_type, const Image& input); + /// Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, + /// Lmax] (using modulus). Use label_8 as label type. + /// + /// \param[in] input The label image. + /// + /// \return A new image with values wrapped with type label_8. + template <typename I> + mln_ch_value(I,value::label_8) + wrap(const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -70,6 +80,7 @@ namespace mln // mlc_is_a(mln_value(I), value::Symbolic)::check(); mln_precondition(exact(input).is_valid()); + (void) value_type; mln_ch_value(I,V) output = level::transform(input, fun::l2l::wrap<V>()); @@ -77,6 +88,15 @@ namespace mln return output; } + + template <typename I> + inline + mln_ch_value(I,value::label_8) + wrap(const Image& input) + { + return wrap(value::label_8(), input); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::labeling diff --git a/milena/mln/util/couple.hh b/milena/mln/util/couple.hh index 00b69d4..5f43c27 100644 --- a/milena/mln/util/couple.hh +++ b/milena/mln/util/couple.hh @@ -45,13 +45,12 @@ namespace mln { template <typename T, typename U> - struct couple : public mln::Object< couple<T,U> > + class couple : public mln::Object< couple<T,U> > { public: couple(); couple(const T& val1, const U& val2); - public: /// Get the first member of the couple. /// \{ const T& first() const; diff --git a/milena/mln/value/label.hh b/milena/mln/value/label.hh index a48afeb..054524a 100644 --- a/milena/mln/value/label.hh +++ b/milena/mln/value/label.hh @@ -103,6 +103,11 @@ namespace mln void from_to_(const value::int_u<n>& from, value::label<n>& to_); + // int_u -> label. + template <unsigned n, unsigned m> + void + from_to_(const value::int_u<n>& from, value::label<m>& to_); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert @@ -197,6 +202,17 @@ namespace mln to_ = from; } + // int_u<n> -> label<m> with n < m. + template <unsigned n, unsigned m> + inline + void + from_to_(const value::int_u<n>& from, value::label<m>& to_) + { + enum { valid = n < m }; + metal::bool_<valid>::check(); + to_ = from; + } + } // end of namespace mln::convert::over_load } // end of namespace mln::convert -- 1.5.6.5

15 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2009