Olena-patches January 2013

olena-patches@lrde.epita.fr

7 participants
66 discussions

last-svn-commit-840-g19e7b17 Added functions used in the trust map computation.

by Sylvain Lobry

* mln/optical_flow/trustmap.hh: Here. --- milena/ChangeLog | 6 + milena/mln/optical_flow/trustmap.hh | 237 +++++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+), 0 deletions(-) create mode 100644 milena/mln/optical_flow/trustmap.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 362241a..9a6f18d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added functions used in the trust map computation. + + * mln/optical_flow/trustmap.hh: Here. + +2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added Horn-Schunck algorithm * mln/optical_flow/hs.hh: Here. diff --git a/milena/mln/optical_flow/trustmap.hh b/milena/mln/optical_flow/trustmap.hh new file mode 100644 index 0000000..357b756 --- /dev/null +++ b/milena/mln/optical_flow/trustmap.hh @@ -0,0 +1,237 @@ +// Copyright (C) 2013 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_OPTICAL_FLOW_TRUSTMAP_HH_ +# define MLN_OPTICAL_FLOW_TRUSTMAP_HH_ + +/// \file +/// +/// \brief Useful functions to compute the trust map and to draw it. +/// See techrep 1211 for more details. + +# include <mln/core/concept/image.hh> +# include <mln/value/int_u8.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/alias/point2d.hh> + +namespace mln +{ + + namespace optical_flow + { + + /// \brief Compute the octogonal box (aka trust map) for the impact of + /// diffusion process. + /// + /// @param ima Output + /// @param min_i Minimum row for the unknown region + /// @param max_i Maximum row for the unknown region + /// @param min_j Minimum col for the unknown region + /// @param max_j Maximum col for the unknown region + /// @param max_value Number of iterations + void + computeBox (mln::image2d<mln::value::int_u8>& ima, + unsigned min_i, + unsigned max_i, + unsigned min_j, + unsigned max_j, + unsigned max_value); + + /// \brief Compute the octogonal box (aka trust map) for the impact of + /// diffusion process. + /// + /// @param ima Output + /// @param box The unknown region + /// @param max_value Number of iterations + void + computeBox (mln::image2d<mln::value::int_u8>& ima, + mln::box2d& box, + unsigned max_value); + + /// \brief Given the trust map, compute the mask assiocated to it + /// + /// @param ima The output + /// @param box The trust map + void + computeMask (mln::image2d<bool>& ima, + mln::image2d<mln::value::int_u8>& box); + + /// \brief Compute the weightened trust map used in combination process + /// + /// @param box The trust map + /// @param trust The output + /// @param max_value Number of iterations + void + makeTrust (mln::image2d<mln::value::int_u8>& box, + mln::image2d<double>& trust, + unsigned max_value); + + /// \brief Draw the countours of the trust map. + /// + /// @param ima The image on which we want to draw + /// @param box The trust map + /// @param v The color used to draw + /// @param max_value The number of iterations + template<typename I> + void + drawMask (I& ima, + const mln::image2d<mln::value::int_u8>& box, + const mln_value(I)& v, + unsigned max_value); + + /// \brief Internal function + void + compute (mln::image2d<mln::value::int_u8>& ima, mln::point2d pt, unsigned value, unsigned max_value, + bool up, bool down, bool right, bool left); + + +# ifndef MLN_INCLUDE_ONLY + + void + compute (mln::image2d<mln::value::int_u8>& ima, mln::point2d pt, unsigned value, unsigned max_value, + bool up, bool down, bool right, bool left) + { + if (ima (pt) > value && value < max_value) + { + ima (pt) = value; + if (down) + compute (ima, pt + mln::dpoint2d (-1, 0), value + 1, max_value, up, down, right, left); + if (up) + compute (ima, pt + mln::dpoint2d (1, 0), value + 1, max_value, up, down, right, left); + if (left) + compute (ima, pt + mln::dpoint2d (0, -1), value + 1, max_value, up, down, right, left); + if (right) + compute (ima, pt + mln::dpoint2d (0, 1), value + 1, max_value, up, down, right, left); + } + } + + void + computeBox (mln::image2d<mln::value::int_u8>& ima, + unsigned min_i, + unsigned max_i, + unsigned min_j, + unsigned max_j, + unsigned max_value) + + { + + for (unsigned i = min_i; i < max_i; ++i) + { + compute (ima, mln::point2d (i, min_j), 0, max_value, true, true, false, true); + compute (ima, mln::point2d (i, max_j), 0, max_value, true, true, true, false); + } + + for (unsigned j = min_j; j < max_j; ++j) + { + compute (ima, mln::point2d (min_i, j), 0, max_value, false, true, true, true); + compute (ima, mln::point2d (max_i, j), 0, max_value, true, false, true, true); + } + + } + + void + computeBox (mln::image2d<mln::value::int_u8>& ima, + mln::box2d& box, + unsigned max_value) + { + mln::point2d pmin = box.pmin (); + mln::point2d pmax = box.pmax (); + + computeBox (ima, pmin.row (), pmax.row (), pmin.col (), pmax.col (), + max_value); + } + + void + computeMask (mln::image2d<bool>& ima, + mln::image2d<mln::value::int_u8>& box) + { + mln_piter_(mln::image2d<bool>) p (ima.domain ()); + + for_all (p) + { + if (box(p) < 255) + ima(p) = false; + else + ima(p) = true; + } + } + + void + makeTrust (mln::image2d<mln::value::int_u8>& box, + mln::image2d<double>& trust, + unsigned max_value) + { + mln_piter_ (mln::image2d<mln::value::int_u8>) p (box.domain ()); + + for_all (p) + { + if (box (p) >= max_value - 1) + trust (p) = 1; + else + { + trust (p) = (2 * (double)box (p)) / (3 * (double)max_value); + } + } + } + + void + convertTrust (mln::image2d<double>& trust, + mln::image2d<mln::value::int_u8>& out) + { + mln_piter_ (mln::image2d<mln::value::int_u8>) p (trust.domain ()); + + for_all (p) + { + out (p) = trust (p) * 255; + } + } + + template<typename I> + void + drawMask (I& ima, + const mln::image2d<mln::value::int_u8>& box, + const mln_value(I)& v, + unsigned max_value) + { + mln_piter (I) p (ima.domain ()); + + for_all (p) + { + if (box(p) == max_value - 1) + ima(p) = v; + } + } + + +# endif // ! MLN_INCLUDE_ONLY + + } //end of namespace optical_flow + +} //end of namespace mln + + +#endif // ! MLN_OPTICAL_FLOW_TRUSTMAP_HH_ -- 1.7.2.5

11 years, 2 months

last-svn-commit-839-g016f6d5 Added Horn-Schunck algorithm

by Sylvain Lobry

* mln/optical_flow/hs.hh: Here. --- milena/ChangeLog | 6 ++ milena/mln/optical_flow/hs.hh | 158 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) create mode 100644 milena/mln/optical_flow/hs.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 15cac50..362241a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added Horn-Schunck algorithm + + * mln/optical_flow/hs.hh: Here. + +2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + Added Lucas-Kanade algorithm * mln/optical_flow/lk.hh: Here. diff --git a/milena/mln/optical_flow/hs.hh b/milena/mln/optical_flow/hs.hh new file mode 100644 index 0000000..8fe2401 --- /dev/null +++ b/milena/mln/optical_flow/hs.hh @@ -0,0 +1,158 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_OPTICAL_FLOW_HS_HH_ +# define MLN_OPTICAL_FLOW_HS_HH_ + +/// \file +/// +/// \brief Implementation of Horn-Schunck algorithm. + +# include <mln/core/alias/box2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/core/alias/vec2d.hh> +# include <mln/core/concept/image.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/pw/value.hh> +# include <mln/core/image/dmorph/image_if.hh> + +# include <cmath> + +namespace mln +{ + + namespace optical_flow + { + + /// \brief Compute Hors-Schunck algorithm + /// + /// @param frame1 The first frame + /// @param frame2 The second frame + /// @param mask The mask on which we want to compute the optical flow + /// @param optical_flow The result + /// @param alpha_sq Numeric to balance terms + /// @param niter Maximum number of iterations + /// @param stop_criterion Stop the algorithm if not enough changes between + /// two iterations. + + template <typename I> + void + HornSchunck (I& frame1, I& frame2, mln::image2d<bool>& mask, + mln::image2d <mln::vec2d_f>& optical_flow, + float alpha_sq = 49, unsigned niter = 170, + double stop_criterion = 0.001); + + +#ifndef MLN_INCLUDE_ONLY + + template <typename I> + void + HornSchunck (I& frame1, I& frame2, mln::image2d<bool>& mask, + mln::image2d <mln::vec2d_f>& optical_flow, + float alpha_sq, unsigned niter, + double stop_criterion) + { + mln_assertion (frame1.domain () == optical_flow.domain ()); + mln_assertion (frame2.domain () == optical_flow.domain ()); + + //Used to store the value at eache given iteration. + mln::image2d <mln::vec2d_f> tmp_of (optical_flow.domain ()); + bool stop = false; + + typedef mln::image_if<I, mln::pw::value_ <mln::image2d<bool> > > II; + + II ima = (frame1 | mln::pw::value (mask)); + + mln_piter (II) p (ima.domain ()); + + for (unsigned i = 0; i < niter && !stop; ++i) + { + double diff_sum = 0;//Sum used to eventually stop the computation. + for_all (p) + { + //Computation of the average of the optical flow vector. + mln::vec2d_f ave; + + ave = (tmp_of (p + mln::dpoint2d (-1, 0)) + + tmp_of (p + mln::dpoint2d (0, 1)) + + tmp_of (p + mln::dpoint2d (1, 0)) + + tmp_of (p + mln::dpoint2d (0, -1))) / 6 + + (tmp_of (p + mln::dpoint2d (-1, -1)) + + tmp_of (p + mln::dpoint2d (-1, 1)) + + tmp_of (p + mln::dpoint2d (1, 1)) + + tmp_of (p + mln::dpoint2d (1, -1))) / 12; + + + //Computation of the partial derivates. + float Ex = 0, Ey = 0, Et = 0; + + Ex = frame1 (p + mln::dpoint2d (0, 1)) - frame1 (p) + + frame1 (p + mln::dpoint2d (1, 1)) - frame1 (p + mln::dpoint2d (1, 0)) + + frame2 (p + mln::dpoint2d (0, 1)) - frame2 (p) + + frame2 (p + mln::dpoint2d (1, 1)) - frame2 (p + mln::dpoint2d (1, 0)); + Ex /= 4; + + Ey = frame1 (p + mln::dpoint2d (1, 0)) - frame1 (p) + + frame1 (p + mln::dpoint2d (1, 1)) - frame1 (p + mln::dpoint2d (0, 1)) + + frame2 (p + mln::dpoint2d (1, 0)) - frame2 (p) + + frame2 (p + mln::dpoint2d (1, 1)) - frame2 (p + mln::dpoint2d (0, 1)); + Ey /= 4; + + Et = frame2 (p) - frame1 (p) + + frame2 (p + mln::dpoint2d (1, 0)) - frame1 (p + mln::dpoint2d (1, 0)) + + frame2 (p + mln::dpoint2d (0, 1)) - frame1 (p + mln::dpoint2d (0, 1)) + + frame2 (p + mln::dpoint2d (1, 1)) - frame1 (p + mln::dpoint2d (1, 1)); + Et /= 4; + + + optical_flow (p)[0] = ave[0] - Ex * (Ex * ave[0] + Ey * ave[1] + Et) + / (alpha_sq + Ex * Ex + Ey * Ey); + optical_flow (p)[1] = ave[1] - Ey * (Ex * ave[0] + Ey * ave[1] + Et) + / (alpha_sq + Ex * Ex + Ey * Ey); + + diff_sum += ((optical_flow (p)[0] - tmp_of (p)[0]) * + (optical_flow (p)[0] - tmp_of (p)[0])) + + ((optical_flow (p)[1] - tmp_of (p)[1]) * + (optical_flow (p)[1] - tmp_of (p)[1])); + } + + for_all (p) + tmp_of (p) = optical_flow (p); + + diff_sum /= (optical_flow.nrows () * optical_flow.ncols ()); + + if (diff_sum < stop_criterion * stop_criterion) + stop = true; + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } //end of namespace optical_flow + +} //end of namespace mln + + +#endif // ! MLN_OPTICAL_FLOW_HS_HH_ -- 1.7.2.5

11 years, 2 months

last-svn-commit-838-g57c0c88 Added Lucas-Kanade algorithm

by Sylvain Lobry

* mln/optical_flow/lk.hh: Here. --- milena/ChangeLog | 6 ++ milena/mln/optical_flow/lk.hh | 185 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 milena/mln/optical_flow/lk.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index b515294..15cac50 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-01-29 Sylvain Lobry <lobry(a)lrde.epita.fr> + + Added Lucas-Kanade algorithm + + * mln/optical_flow/lk.hh: Here. + 2012-05-03 Sylvain Lobry <lobry(a)lrde.epita.fr> Updated all.hh. diff --git a/milena/mln/optical_flow/lk.hh b/milena/mln/optical_flow/lk.hh new file mode 100644 index 0000000..679ed04 --- /dev/null +++ b/milena/mln/optical_flow/lk.hh @@ -0,0 +1,185 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_OPTICAL_FLOW_LK_HH_ +# define MLN_OPTICAL_FLOW_LK_HH_ + +/// \file +/// +/// \brief Implementation of Lucas-Kanade algorithm. + +# include <mln/core/alias/box2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/core/alias/vec2d.hh> +# include <mln/core/concept/image.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/pw/value.hh> +# include <mln/core/image/dmorph/image_if.hh> + +# include <cmath> + + +namespace mln +{ + + namespace optical_flow + { + + /// \brief Compute Lucas-Kanade algorithm + /// + /// @param ima1 First frame + /// @param ima2 Second frame + /// @param mask The mask on which we want to compute the optical flow + /// @param winsize size of the window used + /// @param weigths The weights inside the window + /// @param optical_flow the result + + template <typename I> + void + LucasKanade (I& ima1, + I& ima2, + mln::image2d<bool>& mask, + unsigned winsize, + mln::image2d<double>& weights, + mln::image2d <mln::vec2d_f>& optical_flow); + +# ifndef MLN_INCLUDE_ONLY + + //If true, of (optical flow) coarser but computation faster. +# define PER_BLOCK (false) + + template <typename I> + void + LucasKanade (I& ima1, + I& ima2, + mln::image2d<bool>& mask, + unsigned winsize, + mln::image2d<double>& weights, + mln::image2d <mln::vec2d_f>& optical_flow) + { + mln::win::rectangle2d win (winsize, winsize); + + typedef mln::image_if<I, mln::pw::value_ <mln::image2d<bool> > > II; + + II ima = (ima1 | mln::pw::value (mask)); + + mln_piter (II) p (ima.domain ()); + + mln_qiter_ (mln::win::rectangle2d) q (win, p); + for_all (p) + { + +#if PER_BLOCK + if (p.col() % winsize == winsize / 2 && p.row () % winsize == winsize / 2) + { +#endif + double A[winsize * winsize][2]; + double B[winsize * winsize]; + double W[winsize * winsize]; + unsigned nb_comp = 0; + + //filling matrices + for_all (q) + { + if (ima1.has(q)) + { + //Ex + A[nb_comp][0] = ima1 (q + mln::dpoint2d (0, 1)) - ima1 (q) + + ima2 (q + mln::dpoint2d (0, 1)) - ima2 (q); + //Ey + A[nb_comp][1] = ima1 (q + mln::dpoint2d (1, 0)) - ima1 (q) + + ima2 (q + mln::dpoint2d (1, 0)) - ima2 (q); + + //Et + B[nb_comp] = - (ima2 (q) - ima1 (q)); + //weights + W[nb_comp] = weights (q); + ++nb_comp; + } + } + + //Computing flow + + //Filling the structure tensor (transpose(A) * A) + int struct_tensor[2][2] = {{0, 0}, {0, 0}}; + for (unsigned i = 0; i < nb_comp; ++i) + { + struct_tensor [0][0] += W[i] * A[i][0] * A[i][0]; + struct_tensor [1][0] += W[i] * A[i][0] * A[i][1]; + struct_tensor [0][1] += W[i] * A[i][0] * A[i][1]; + struct_tensor [1][1] += W[i] * A[i][1] * A[i][1]; + } + + //Computing the inverse of the structure tensor. + double struct_tensor_inv[2][2] = {{0, 0}, {0, 0}}; + double det = struct_tensor[0][0] * struct_tensor[1][1] + - struct_tensor[1][0] * struct_tensor[0][1]; + + double Vx = 0; + double Vy = 0; + if (det * det > 0.000001) + { + struct_tensor_inv[0][0] = struct_tensor[1][1] / det; + struct_tensor_inv[0][1] = -struct_tensor[0][1] / det; + struct_tensor_inv[1][0] = -struct_tensor[1][0] / det; + struct_tensor_inv[1][1] = struct_tensor[0][0] / det; + + int transAtimesB[2] = {0, 0}; + for (unsigned i = 0; i < nb_comp; ++i) + { + transAtimesB[0] += W[i] * A[i][0] * B[i]; + transAtimesB[1] += W[i] * A[i][1] * B[i]; + } + + Vx = struct_tensor_inv[0][0] * transAtimesB[0] + + struct_tensor_inv[0][1] * transAtimesB[1]; + Vy = struct_tensor_inv[1][0] * transAtimesB[0] + + struct_tensor_inv[1][1] * transAtimesB[1]; + } +#if PER_BLOCK + for_all (q) + { + optical_flow (q)[0] = Vx; + optical_flow (q)[1] = Vy; + } + } +#else + optical_flow (p)[0] = Vx; + optical_flow (p)[1] = Vy; +#endif + } + + + } + +# endif // ! MLN_INCLUDE_ONLY + + } //end of namespace optical_flow + +} //end of namespace mln + + +#endif // ! MLN_OPTICAL_FLOW_LK_HH_ -- 1.7.2.5

11 years, 2 months

branch papers/lazzara.13.ijdar updated: olena-2.0-137-gb05f4e5

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 papers/lazzara.13.ijdar has been updated discards 15cdc8c98724c911d0c0f89ef77458faaa60733d (commit) discards 3e26b9e084823e5c169f53d684ab25dfd3dd3e26 (commit) discards a0864da5e298a1c5e268312c22bfff208cb7756f (commit) via b05f4e5c24d32b2d704badd28fd16dfa4a235bc6 (commit) via d437055460812dd65223c65cab4e7e5969a8abab (commit) via 54991acadad4a1bf95775f008523abae92be629b (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (15cdc8c98724c911d0c0f89ef77458faaa60733d) \ N -- N -- N (b05f4e5c24d32b2d704badd28fd16dfa4a235bc6) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- b05f4e5 Use io::magick to save output. d437055 Fix binarization programs. 54991ac scribo/binarization/sauvola_ms.hh: Fix overlapping area criterion. ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 3 months

olena-2.0-135-g54991ac scribo/binarization/sauvola_ms.hh: Fix overlapping area criterion.

by Guillaume Lazzara

--- scribo/scribo/binarization/sauvola_ms.hh | 47 ++++++----------------------- 1 files changed, 10 insertions(+), 37 deletions(-) diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 8be92e5..f68d053 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -211,7 +211,6 @@ namespace scribo { if (f.msk.element(p)) { - mln_site_(I) sq = site * ratio; if (f.parent.element(p) == p) @@ -874,30 +873,6 @@ namespace scribo initialize(e_2, sub_ima[2]); data::fill(e_2, 0u); - // Computing optimal object area for each scale. - // unsigned w_1_sq = w_1 * w_1; - // unsigned q_2 = std::pow(float(q), float(2)); - // unsigned min_area = (5 * w_1_sq) / (4 * q_2); - // unsigned max_area = (w_1_sq + (q_2) * w_1_sq) / 4; - - - // mln::util::array<unsigned> area(sub_ima.size(), 0); - // area[2] = s * s * w_1 * w_1; - // for (unsigned i = 3; i < area.nelements(); ++i) - // area[i] = std::pow(float(q), float(i * 2 - 4)) * area[2]; - - mln::util::array<unsigned> win_w(sub_ima.size(), 0); - win_w[2] = s * w_1; - for (unsigned i = 3; i < win_w.nelements(); ++i) - { - win_w[i] = q * win_w[i - 1]; - if (!(win_w[i] % 2)) - ++win_w[i]; - } - - float coeff_max = 1.6; - float coeff_min = 1.4; - # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG internal::debug_scale_proba = image3d<double>(3, @@ -910,13 +885,17 @@ namespace scribo == Step 2 - Object selection at each scale == ===========================================*/ + float + min_coef = 0.8, + max_s2 = (w_1 * w_1) / (s * s) * 0.7, + q_2 = q * q; + + // Highest scale -> no maximum component size. { int i = sub_ima.size() - 1; t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, -// (8096 / 144) / coeff, -// 44 / coeff, - win_w[i] / s / coeff_max, + (max_s2 * q_2) / (q_2) * min_coef, mln_max(unsigned), s, q, i, w_work, @@ -928,12 +907,8 @@ namespace scribo for (int i = sub_ima.size() - 2; i > 2; --i) { t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, -// 22 / coeff, -// 201 * coeff, - win_w[i] / s / coeff_min, - win_w[i] * s * coeff_max, -// (810 / 36) / coeff, -// (8096 / 36) * coeff, + max_s2 / (q_2) * min_coef, + max_s2 * q_2, s, q, i, w_work, integral_sum_sum_2); @@ -945,9 +920,7 @@ namespace scribo t_ima[2] = internal::compute_t_n_and_e_2(sub_ima[2], e_2, // FIXME: was '0'. '2' is to avoid too much noise with k=0.2. 2, -// 99 * coeff, - win_w[2] * s * coeff_max, -// (810 / 9) * coeff, + max_s2, s, 1, 2, w_work, integral_sum_sum_2); } -- 1.7.2.5

11 years, 3 months

branch papers/lazzara.13.ijdar updated: olena-2.0-137-g15cdc8c

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 papers/lazzara.13.ijdar has been updated discards e6e8cbba19f0c4377950c4964db869eb2864cfab (commit) via 15cdc8c98724c911d0c0f89ef77458faaa60733d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (e6e8cbba19f0c4377950c4964db869eb2864cfab) \ N -- N -- N (15cdc8c98724c911d0c0f89ef77458faaa60733d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 15cdc8c Use io::magick to save output. ----------------------------------------------------------------------- Summary of changes: scribo/src/binarization/niblack.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 3 months

branch papers/lazzara.13.ijdar updated: olena-2.0-137-ge6e8cbb

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 papers/lazzara.13.ijdar has been updated via e6e8cbba19f0c4377950c4964db869eb2864cfab (commit) via 3e26b9e084823e5c169f53d684ab25dfd3dd3e26 (commit) via a0864da5e298a1c5e268312c22bfff208cb7756f (commit) from b0bb6e941bc9f919230b4325eb2b1c7a3013965f (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 ----------------------------------------------------------------- e6e8cbb Use io::magick to save output. 3e26b9e Fix binarization programs. a0864da mln/labeling/colorize.hh: Do not recompute previously computed colors. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 19 +++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 47 ++++++--------------------- scribo/src/binarization/niblack.cc | 9 ++--- scribo/src/binarization/otsu.cc | 9 ++--- scribo/src/binarization/sauvola.cc | 5 +-- scribo/src/binarization/sauvola_ms.cc | 12 ++++-- scribo/src/binarization/sauvola_ms_debug.cc | 8 ++-- scribo/src/binarization/wolf.cc | 9 ++--- 8 files changed, 55 insertions(+), 63 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 3 months

olena-2.0-137-gb05f4e5 Use io::magick to save output.

by Guillaume Lazzara

* src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/wolf.cc: Here. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/binarization/niblack.cc | 9 ++++----- scribo/src/binarization/otsu.cc | 9 ++++----- scribo/src/binarization/sauvola.cc | 5 ++--- scribo/src/binarization/sauvola_ms.cc | 5 ++--- scribo/src/binarization/wolf.cc | 9 ++++----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d45b42..687f107 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2013-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use io::magick to save output. + + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/wolf.cc: Here. + 2013-01-24 Guillaume Lazzara <z(a)lrde.epita.fr> Fix binarization programs. diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 7c14c45..049d8ed 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/arith/revert.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) arith::revert_inplace(input_1_gl); image2d<bool> out = scribo::binarization::niblack(input_1_gl, w, k); logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index dcdae1d..8fe4f04 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/arith/revert.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) if (options.is_enabled("negate-output")) logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index d03622d..4e059cf 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index f05186a..ebb2ba7 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,7 +29,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/util/timer.hh> diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index 4495f64..94456e8 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -100,7 +99,7 @@ int main(int argc, char *argv[]) image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } -- 1.7.2.5

11 years, 3 months

olena-2.0-137-g15cdc8c Use io::magick to save output.

by Guillaume Lazzara

11 years, 3 months

olena-2.0-137-ge6e8cbb Use io::magick to save output.

by Guillaume Lazzara

* src/binarization/niblack.cc, * src/binarization/otsu.cc, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/wolf.cc: Here. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/binarization/niblack.cc | 9 ++++----- scribo/src/binarization/otsu.cc | 9 ++++----- scribo/src/binarization/sauvola.cc | 5 ++--- scribo/src/binarization/sauvola_ms.cc | 5 ++--- scribo/src/binarization/wolf.cc | 9 ++++----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d45b42..687f107 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2013-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use io::magick to save output. + + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/wolf.cc: Here. + 2013-01-24 Guillaume Lazzara <z(a)lrde.epita.fr> Fix binarization programs. diff --git a/scribo/src/binarization/niblack.cc b/scribo/src/binarization/niblack.cc index 7c14c45..047f5f6 100644 --- a/scribo/src/binarization/niblack.cc +++ b/scribo/src/binarization/niblack.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/arith/revert.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) arith::revert_inplace(input_1_gl); image2d<bool> out = scribo::binarization::niblack(input_1_gl, w, k); logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/otsu.cc b/scribo/src/binarization/otsu.cc index dcdae1d..8fe4f04 100644 --- a/scribo/src/binarization/otsu.cc +++ b/scribo/src/binarization/otsu.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/arith/revert.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) if (options.is_enabled("negate-output")) logical::not_inplace(out); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index d03622d..4e059cf 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index f05186a..ebb2ba7 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,7 +29,6 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/magick/all.hh> -#include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/util/timer.hh> diff --git a/scribo/src/binarization/wolf.cc b/scribo/src/binarization/wolf.cc index 4495f64..94456e8 100644 --- a/scribo/src/binarization/wolf.cc +++ b/scribo/src/binarization/wolf.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -26,8 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> -#include <mln/io/pbm/save.hh> +#include <mln/io/magick/all.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -100,7 +99,7 @@ int main(int argc, char *argv[]) image2d<bool> out = scribo::binarization::wolf(input_1_gl, w, k); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.pbm")); trace::exiting("main"); } -- 1.7.2.5

11 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches January 2013