Olena-patches March 2013

olena-patches@lrde.epita.fr

5 participants
214 discussions

olena-2.0-113-g1d131cf Remove morpho::meyer_wst.

by Roland Levillain

* mln/morpho/meyer_wst.hh: Remove. Superseded by mln/morpho/watershed/flooding.hh. * headers.mk, * tests/unit_test/unit-tests.mk: Regen * tests/morpho/meyer_wst.cc, * tests/morpho/meyer_wst_long.cc: Remove tests. * tests/morpho/Makefile.am (check_PROGRAMS): Remove meyer_wst.cc and meyer_wst_long.cc. (meyer_wst_long_CXXFLAGS): Remove. (MOSTLYCLEANFILES): Adjust. --- milena/ChangeLog | 17 +++ milena/headers.mk | 1 - milena/mln/morpho/meyer_wst.hh | 215 --------------------------------- milena/tests/morpho/Makefile.am | 8 +- milena/tests/morpho/meyer_wst.cc | 56 --------- milena/tests/morpho/meyer_wst_long.cc | 73 ----------- milena/tests/unit_test/unit-tests.mk | 1 - 7 files changed, 18 insertions(+), 353 deletions(-) delete mode 100644 milena/mln/morpho/meyer_wst.hh delete mode 100644 milena/tests/morpho/meyer_wst.cc delete mode 100644 milena/tests/morpho/meyer_wst_long.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index a371d41..e6a45ea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2013-03-05 Roland Levillain <roland(a)lrde.epita.fr> + Remove morpho::meyer_wst. + + * mln/morpho/meyer_wst.hh: Remove. + Superseded by mln/morpho/watershed/flooding.hh. + * headers.mk, + * tests/unit_test/unit-tests.mk: + Regen + * tests/morpho/meyer_wst.cc, + * tests/morpho/meyer_wst_long.cc: + Remove tests. + * tests/morpho/Makefile.am (check_PROGRAMS): Remove + meyer_wst.cc and meyer_wst_long.cc. + (meyer_wst_long_CXXFLAGS): Remove. + (MOSTLYCLEANFILES): Adjust. + +2013-03-05 Roland Levillain <roland(a)lrde.epita.fr> + Replace remaining uses of morpho::meyer_wst in Milena. * doc/examples/trash/tuto_bis.cc, diff --git a/milena/headers.mk b/milena/headers.mk index 8997e6b..1bf94d3 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -933,7 +933,6 @@ mln/morpho/internal/elementary.hh \ mln/morpho/laplacian.hh \ mln/morpho/leveling_filter.hh \ mln/morpho/line_gradient.hh \ -mln/morpho/meyer_wst.hh \ mln/morpho/min.hh \ mln/morpho/minus.hh \ mln/morpho/opening/algebraic.hh \ diff --git a/milena/mln/morpho/meyer_wst.hh b/milena/mln/morpho/meyer_wst.hh deleted file mode 100644 index 575c38c..0000000 --- a/milena/mln/morpho/meyer_wst.hh +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright (C) 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_MORPHO_MEYER_WST_HH -# define MLN_MORPHO_MEYER_WST_HH - -/** \file - \brief Meyer's Watershed Transform (WST) algorithm. - - The Watershed Transform algorithm from Meyer using a hierarchical - queue. - - Reference: - Fernand Meyer. Un algorithme optimal de ligne de partage des - eaux. In: Actes du 8ème Congrès AFCET, Lyon-Villeurbanne, France - (1991), pages 847--859. */ - - -/* FIXME: This file is outdated. Compare this file with - mln/morpho/watershed/flooding.hh, and remove the former when - - 1. it is entirely covered by the latter; - 2. clients (including tests and Milena) are updated to use - mln::morpho::watershed::flooding. */ - - -# include <mln/trait/ch_value.hh> - -// FIXME: See below. -# include <mln/util/greater_psite.hh> -# include <mln/morpho/includes.hh> -# include <mln/literal/zero.hh> -# include <mln/labeling/regional_minima.hh> - -# include <mln/core/site_set/p_queue_fast.hh> -# include <mln/core/site_set/p_priority.hh> - - -namespace mln -{ - - namespace morpho - { - /** \brief Meyer's Watershed Transform (WST) algorithm. - - \param[in] input The input image. - \param[in] nbh The connexity of markers. - \param[out] nbasins The number of basins. - - \li \p L is the type of labels, used to number the watershed - itself (with the minimal value), and the basins. - \li \p I is the exact type of the input image. - \li \p N is the exact type of the neighborhood used to express - \a input's connexity. */ - template <typename L, typename I, typename N> - mln_ch_value(I, L) - meyer_wst(const Image& input, const Neighborhood<N>& nbh, - L& nbasins); - - /** \brief Meyer's Watershed Transform (WST) algorithm, with no - count of basins. - - \param[in] input The input image. - \param[in] nbh The connexity of markers. - - \li \p L is the type of labels, used to number the watershed - itself (with the minimal value), and the basins. - \li \p I is the exact type of the input image. - \li \p N is the exact type of the neighborhood used to express - \a input's connexity. - - Note that the first parameter, \p L, is not automatically - valued from the type of the actual argument during implicit - instantiation: you have to explicitly pass this parameter at - call sites. */ - template <typename L, typename I, typename N> - mln_ch_value(I, L) - meyer_wst(const Image& input, const Neighborhood<N>& nbh); - - - -# ifndef MLN_INCLUDE_ONLY - - template <typename L, typename I, typename N> - mln_ch_value(I, L) - meyer_wst(const Image& input_, const Neighborhood<N>& nbh_, - L& nbasins) - { - trace::entering("morpho::meyer_wst"); - /* FIXME: Ensure the input image has scalar values. */ - - const I input = exact(input_); - const N nbh = exact(nbh_); - - typedef L marker; - const marker unmarked = literal::zero; - - typedef mln_value(I) V; - const V max = mln_max(V); - - // Initialize the output with the markers (minima components). - mln_ch_value(I, marker) output = - labeling::regional_minima (input, nbh, nbasins); - - typedef mln_psite(I) psite; - - // Ordered queue. - typedef p_queue_fast<psite> Q; - p_priority<V, Q> queue; - - // In_queue structure to avoid processing sites several times. - mln_ch_value(I, bool) in_queue; - initialize(in_queue, input); - data::fill(in_queue, false); - - // Insert every neighbor P of every marked area in a - // hierarchical queue, with a priority level corresponding to - // the grey level input(P). - mln_piter(I) p(output.domain()); - mln_niter(N) n(nbh, p); - for_all (p) - if (output(p) == unmarked) - for_all(n) - if (output.domain().has(n) && output(n) != unmarked) - { - queue.push(max - input(p), p); - in_queue(p) = true; - break; - } - - /* Until the queue is empty, extract a psite P from the - hierarchical queue, at the highest priority level, that is, - the lowest level. */ - while (! queue.is_empty()) - { - psite p = queue.front(); - queue.pop(); - // Last seen marker adjacent to P. - marker adjacent_marker = unmarked; - // Has P a single adjacent marker? - bool single_adjacent_marker_p = true; - mln_niter(N) n(nbh, p); - for_all(n) - if (output.domain().has(n) && output(n) != unmarked) - { - if (adjacent_marker == unmarked) - { - adjacent_marker = output(n); - single_adjacent_marker_p = true; - } - else - if (adjacent_marker != output(n)) - { - single_adjacent_marker_p = false; - break; - } - } - /* If the neighborhood of P contains only psites with the - same label, then P is marked with this label, and its - neighbors that are not yet marked are put into the - hierarchical queue. */ - if (single_adjacent_marker_p) - { - output(p) = adjacent_marker; - for_all(n) - if (output.domain().has(n) && output(n) == unmarked - && ! in_queue(n)) - { - queue.push(max - input(n), n); - in_queue(n) = true; - } - } - } - trace::exiting("morpho::meyer_wst"); - return output; - } - - template <typename L, typename I, typename N> - mln_ch_value(I, L) - meyer_wst(const Image& input, const Neighborhood<N>& nbh) - { - L nbasins; - return meyer_wst<L>(input, nbh, nbasins); - } - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::morpho - -} // end of namespace mln - - -#endif // ! MLN_MORPHO_MEYER_WST_HH diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 3d6e264..d9fef8b 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -44,8 +44,6 @@ check_PROGRAMS = \ lena_line_graph_image_wst2 \ line_graph_image_wst \ line_graph_image_morpho \ - meyer_wst \ - meyer_wst_long \ rank_filter \ Rd \ skeleton_constrained \ @@ -74,8 +72,6 @@ lena_line_graph_image_wst1_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) lena_line_graph_image_wst2_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) -meyer_wst_long_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) - TESTS = $(check_PROGRAMS) @@ -94,7 +90,5 @@ MOSTLYCLEANFILES = \ laplacian-out.pgm \ lena_line_graph_image_wst1-out.ppm \ lena_line_graph_image_wst2-out.ppm \ - meyer_wst-out.pgm \ - meyer_wst_long-out.ppm \ thinning-out.pbm \ thinning-out.pgm diff --git a/milena/tests/morpho/meyer_wst.cc b/milena/tests/morpho/meyer_wst.cc deleted file mode 100644 index bb5de84..0000000 --- a/milena/tests/morpho/meyer_wst.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2008, 2009, 2010 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. - -#include <iostream> - -#include <mln/core/image/image2d.hh> -#include <mln/core/alias/window2d.hh> -#include <mln/core/alias/neighb2d.hh> - -#include <mln/value/int_u8.hh> - -#include <mln/morpho/meyer_wst.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> - -#include "tests/data.hh" - - -int main() -{ - using namespace mln; - using value::int_u8; - - image2d<int_u8> input; - io::pgm::load(input, MLN_IMG_DIR "/squares.pgm"); - - typedef int_u8 L; - L nbasins; - image2d<L> output = morpho::meyer_wst(input, c4(), nbasins); - - io::pgm::save(output, "meyer_wst-out.pgm"); -} diff --git a/milena/tests/morpho/meyer_wst_long.cc b/milena/tests/morpho/meyer_wst_long.cc deleted file mode 100644 index 7b9ead9..0000000 --- a/milena/tests/morpho/meyer_wst_long.cc +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (C) 2008, 2009, 2010 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. - -#include <iostream> - -#include <mln/core/image/dmorph/image_if.hh> -#include <mln/core/image/image2d.hh> -#include <mln/core/alias/window2d.hh> -#include <mln/core/alias/neighb2d.hh> - -#include <mln/value/int_u8.hh> -#include <mln/value/label_16.hh> - -#include <mln/morpho/gradient.hh> -#include <mln/morpho/closing/area.hh> -#include <mln/morpho/meyer_wst.hh> - -#include <mln/convert/to_window.hh> - -#include <mln/pw/cst.hh> -#include <mln/pw/value.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/ppm/save.hh> -#include <mln/labeling/colorize.hh> - -#include "tests/data.hh" - - -int main() -{ - using namespace mln; - using value::int_u8; - - image2d<int_u8> input; - io::pgm::load(input, MLN_IMG_DIR "/lena.pgm"); - - image2d<int_u8> - grad = morpho::gradient(input, c4().win()), - clo = morpho::closing::area(grad, c4(), 200); - - // Perform a Watershed Transform. - typedef value::label_16 L; - L nbasins; - image2d<L> ws = morpho::meyer_wst(clo, c4(), nbasins); - - // Save the image in color. - io::ppm::save(labeling::colorize(value::rgb8(), ws, nbasins), - "meyer_wst_long-out.ppm"); -} diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index db1c67b..683a672 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -962,7 +962,6 @@ mln_morpho_internal_elementary \ mln_morpho_laplacian \ mln_morpho_leveling_filter \ mln_morpho_line_gradient \ -mln_morpho_meyer_wst \ mln_morpho_min \ mln_morpho_minus \ mln_morpho_opening_algebraic \ -- 1.7.2.5

11 years, 9 months

olena-2.0-112-gaf1e2e3 Replace remaining uses of mln::morpho::meyer_wst in Swilena.

by Roland Levillain

* morpho.ixx: Here, by mln::morpho::watershed::flooding. * image2d_int_u8.i, * python/swilena.py, * python/morpho-segm.py: Adjust. --- swilena/ChangeLog | 10 ++++++++++ swilena/image2d_int_u8.i | 10 +++++----- swilena/morpho.ixx | 20 ++++++++++---------- swilena/python/morpho-segm.py | 6 +++--- swilena/python/swilena.py | 5 +++-- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 7a0142c..b635467 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2013-03-05 Roland Levillain <roland(a)lrde.epita.fr> + + Replace remaining uses of mln::morpho::meyer_wst in Swilena. + + * morpho.ixx: Here, by mln::morpho::watershed::flooding. + * image2d_int_u8.i, + * python/swilena.py, + * python/morpho-segm.py: + Adjust. + 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> No longer wrap mln::value::int_u32. diff --git a/swilena/image2d_int_u8.i b/swilena/image2d_int_u8.i index 1bcb1d4..1a92443 100644 --- a/swilena/image2d_int_u8.i +++ b/swilena/image2d_int_u8.i @@ -1,5 +1,5 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Copyright (C) 2008, 2009, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -78,10 +78,10 @@ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, | image2d<int_u8> and image2d<int_u24>. | `---------------------------------------*/ -instantiate_meyer_wst(meyer_wst24, - mln::value::int_u<24>, - mln::image2d< mln::value::int_u<8> >, - mln::neighb2d) +instantiate_watershed_flooding(watershed_flooding24, + mln::value::int_u<24>, + mln::image2d< mln::value::int_u<8> >, + mln::neighb2d) // FIXME: Rearrange and move this elsewhere. instantiate_image2d(image2d_int_u24, mln::value::int_u<24>) diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index 7807694..6a8c8b6 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -1,5 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -149,21 +150,20 @@ namespace mln %template(Name) mln::morpho::opening::area< I, N >; %enddef -/*------------------------------------. -| Meyer's Watershed Transform (WST). | -`------------------------------------*/ +/*----------------------------. +| Watershed Transform (WST). | +`----------------------------*/ %{ -#include "mln/morpho/meyer_wst.hh" +#include "mln/morpho/watershed/flooding.hh" %} -%include "mln/morpho/meyer_wst.hh" +%include "mln/morpho/watershed/flooding.hh" -// FIXME: Wrap mln::morpho::watershed::flooding instead. -%define instantiate_meyer_wst(Name, L, I, N) +%define instantiate_watershed_flooding(Name, L, I, N) // Explicit instantiation of this trait for the return type. %template() mln::trait::ch_value< I, L >; - %template(Name) mln::morpho::meyer_wst< L, I, N >; + %template(Name) mln::morpho::watershed::flooding< L, I, N >; %enddef /*-------------------------. @@ -184,5 +184,5 @@ namespace mln instantiate_closing_area(closing_area, I, N) instantiate_opening_area(opening_area, I, N) - instantiate_meyer_wst(meyer_wst, mln_value(I), I, N) + instantiate_watershed_flooding(watershed_flooding, mln_value(I), I, N) %enddef diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 3ddf0a8..7d15ada 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -35,9 +35,9 @@ image.save(gradient, "morpho-segm-gradient.pgm") closed_gradient = image.closing_area(ima, c4(), 50) # Watershed transform. nbasins = int_u8(); -ws = image.meyer_wst (closed_gradient, c4(), nbasins) +ws = image.watershed_flooding(closed_gradient, c4(), nbasins) print nbasins image.save(ws, "morpho-segm-ws.pgm") # FIXME: Also re-enable the naive segmentation with no gradient -# simplification, and an output on an image2d<int_u32>. +# simplification, and an output on an image2d<int_u24>. diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 8cb695a..4e0a0a9 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -1,6 +1,7 @@ #! /usr/bin/env python -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2008, 2009, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -30,7 +31,7 @@ from neighb2d import * from window2d import * from int_u8 import * -from int_u32 import * +from int_u24 import * import image2d_int import image2d_int_u8 -- 1.7.2.5

11 years, 9 months

olena-2.0-111-gcb4de64 Replace remaining uses of morpho::meyer_wst in Milena.

by Roland Levillain

* doc/examples/trash/tuto_bis.cc, * doc/examples/trash/tuto_one.cc, * tools/area_flooding.cc: Here, by morpho::watershed::flooding. --- milena/ChangeLog | 9 +++++++++ milena/doc/examples/trash/tuto_bis.cc | 8 ++++---- milena/doc/examples/trash/tuto_one.cc | 4 ++-- milena/tools/area_flooding.cc | 7 ++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7bdcd1a..a371d41 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-03-05 Roland Levillain <roland(a)lrde.epita.fr> + + Replace remaining uses of morpho::meyer_wst in Milena. + + * doc/examples/trash/tuto_bis.cc, + * doc/examples/trash/tuto_one.cc, + * tools/area_flooding.cc: + Here, by morpho::watershed::flooding. + 2012-07-19 Roland Levillain <roland(a)lrde.epita.fr> Remove references to mln/morpho/meyer_wst.hh in mln/morpho/. diff --git a/milena/doc/examples/trash/tuto_bis.cc b/milena/doc/examples/trash/tuto_bis.cc index 238f843..4f14674 100644 --- a/milena/doc/examples/trash/tuto_bis.cc +++ b/milena/doc/examples/trash/tuto_bis.cc @@ -23,7 +23,7 @@ # include <mln/data/transform.hh> # include <mln/extension/fill.hh> -# include <mln/morpho/meyer_wst.hh> +# include <mln/morpho/watershed/flooding.hh> # include <mln/morpho/gradient.hh> # include <mln/morpho/dilation.hh> @@ -176,9 +176,9 @@ int main() unsigned nbasins; - data::fill(wst, morpho::meyer_wst(edge, e2e, nbasins)); - // ^^^ - // edge -> neighboring edges + data::fill(wst, morpho::watershed::flooding(edge, e2e, nbasins)); + // ^^^ + // edge -> neighboring edges debug::println(wst); // 2 2 // 0 0 0 diff --git a/milena/doc/examples/trash/tuto_one.cc b/milena/doc/examples/trash/tuto_one.cc index d2c0b6f..1ce11bf 100644 --- a/milena/doc/examples/trash/tuto_one.cc +++ b/milena/doc/examples/trash/tuto_one.cc @@ -17,7 +17,7 @@ # include <mln/morpho/closing_area.hh> # include <mln/morpho/gradient.hh> -# include <mln/morpho/meyer_wst.hh> +# include <mln/morpho/watershed/flooding.hh> using namespace mln; @@ -74,7 +74,7 @@ void do_it(const I& ima, clo = grad; unsigned l; - mln_ch_value(I, unsigned) wst = morpho::meyer_wst(clo, nbh, l); + mln_ch_value(I, unsigned) wst = morpho::watershed::flooding(clo, nbh, l); debug::println(labeling::regional_minima(clo, nbh, l)); debug::println(wst); diff --git a/milena/tools/area_flooding.cc b/milena/tools/area_flooding.cc index 70a500e..5efbcf9 100644 --- a/milena/tools/area_flooding.cc +++ b/milena/tools/area_flooding.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -59,7 +60,7 @@ #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing/area_on_vertices.hh> #include <mln/labeling/regional_minima.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -145,7 +146,7 @@ int main(int argc, char* argv[]) wst_val_t nbasins; typedef edge_image<P,wst_val_t> wshed_t; - wshed_t wshed = morpho::meyer_wst(result, nbh, nbasins); + wshed_t wshed = morpho::watershed::flooding(result, nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; /*---------. -- 1.7.2.5

11 years, 9 months

branch next updated: olena-2.0-105-g9352b4d

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 9352b4dd5c97cc913eabcc31277270c7aa2b9729 (commit) via 993220a95e21a684ee0a378873f8702b45d8a852 (commit) via 766aeea463fc2ec7c091dae0e300f9baa9716675 (commit) via 1ee4cecf9d02cb75521fb65fc734c27a0c7d9592 (commit) from d8df2a51a54be6a929145348178edc41368d79db (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 ----------------------------------------------------------------- 9352b4d Address more compiler warnings. 993220a Fix apps/morphers/Makefile.am. 766aeea Fix inclusion paths. 1ee4cec Fix compilation Warnings with latest g++ versions. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 57 ++++++++++++++++++++ milena/apps/morphers/Makefile.am | 2 + .../apps/papers/levillain.09.ismm/classif-graph.cc | 4 +- milena/apps/papers/levillain.09.ismm/io.hh | 4 -- milena/mln/canvas/labeling/generic.hh | 5 +-- milena/mln/canvas/labeling/sorted.hh | 5 +-- milena/mln/canvas/labeling/video.hh | 5 +-- milena/mln/core/concept/accumulator.hh | 15 +++--- milena/mln/core/concept/box.hh | 7 ++- milena/mln/core/concept/gdpoint.hh | 5 +- milena/mln/core/concept/generalized_pixel.hh | 9 ++-- milena/mln/core/concept/gpoint.hh | 5 +- milena/mln/core/concept/graph.hh | 34 ++++++------ milena/mln/core/concept/image.hh | 21 ++++---- milena/mln/core/concept/iterator.hh | 11 ++-- milena/mln/core/concept/neighborhood.hh | 9 ++-- milena/mln/core/concept/proxy.hh | 5 +- milena/mln/core/concept/pseudo_site.hh | 7 ++- milena/mln/core/concept/site_iterator.hh | 15 +++--- milena/mln/core/concept/site_proxy.hh | 7 ++- milena/mln/core/concept/site_set.hh | 23 ++++---- milena/mln/core/concept/value_iterator.hh | 5 +- milena/mln/core/concept/value_set.hh | 8 ++-- milena/mln/core/concept/weighted_window.hh | 7 ++- milena/mln/core/concept/window.hh | 25 +++++---- milena/mln/core/image/imorph/decorated_image.hh | 4 +- milena/mln/core/internal/check/image_fastest.hh | 21 ++++---- .../core/internal/site_relative_iterator_base.hh | 10 ++-- milena/mln/io/off/load.hh | 6 +- milena/mln/io/off/save.hh | 2 +- .../reconstruction/by_dilation/union_find.hh | 5 +- .../morpho/reconstruction/by_erosion/union_find.hh | 7 ++- .../internal/complex_relative_iterator_base.hh | 7 ++- milena/tests/accu/site_set/rectangularity.cc | 3 +- milena/tests/core/other/var.cc | 8 +++- milena/tests/metal/unconst.cc | 9 +++- milena/tests/morpho/complex_image_wst.cc | 2 + milena/tests/trait/op/plus.cc | 1 + milena/tests/trait/super.cc | 1 + scribo/ChangeLog | 7 +++ scribo/common.mk | 7 ++- 41 files changed, 245 insertions(+), 155 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-105-g9352b4d Address more compiler warnings.

by Roland Levillain

* mln/canvas/labeling/generic.hh, * mln/canvas/labeling/sorted.hh, * mln/canvas/labeling/video.hh, * apps/papers/levillain.09.ismm/classif-graph.cc: Remove unused variables. * mln/morpho/reconstruction/by_erosion/union_find.hh, * tests/accu/site_set/rectangularity.cc, * tests/core/other/var.cc, * tests/trait/op/plus.cc: Ignore unused variables. * mln/morpho/reconstruction/by_dilation/union_find.hh: Adjust style for uniformity purposes. --- milena/ChangeLog | 14 ++++++++++++++ .../apps/papers/levillain.09.ismm/classif-graph.cc | 4 +--- milena/mln/canvas/labeling/generic.hh | 5 +---- milena/mln/canvas/labeling/sorted.hh | 5 +---- milena/mln/canvas/labeling/video.hh | 5 +---- .../reconstruction/by_dilation/union_find.hh | 5 ++--- .../morpho/reconstruction/by_erosion/union_find.hh | 4 +++- milena/tests/accu/site_set/rectangularity.cc | 3 ++- milena/tests/core/other/var.cc | 8 +++++++- milena/tests/trait/op/plus.cc | 1 + 10 files changed, 33 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 01eefa4..34fc674 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> + Address more compiler warnings. + + * mln/canvas/labeling/generic.hh, + * mln/canvas/labeling/sorted.hh, + * mln/canvas/labeling/video.hh, + * apps/papers/levillain.09.ismm/classif-graph.cc: + Remove unused variables. + * mln/morpho/reconstruction/by_erosion/union_find.hh: + Ignore unused variables. + * mln/morpho/reconstruction/by_dilation/union_find.hh: + Style adjustment. + +2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> + Fix apps/morphers/Makefile.am. * apps/morphers/Makefile.am: Include diff --git a/milena/apps/papers/levillain.09.ismm/classif-graph.cc b/milena/apps/papers/levillain.09.ismm/classif-graph.cc index f832c11..277bda8 100644 --- a/milena/apps/papers/levillain.09.ismm/classif-graph.cc +++ b/milena/apps/papers/levillain.09.ismm/classif-graph.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -202,7 +202,6 @@ make_graph_image(const mln::image2d<bool>& seeds) for_all(e) { // Site associated to E. - site_t p = e; point2d p1 = e.first(); point2d p2 = e.second(); @@ -275,7 +274,6 @@ main(int argc, char* argv[]) for_all(e) { // Site associated to E. - util::site_pair<point2d> p = e; point2d p1 = e.first(); point2d p2 = e.second(); diff --git a/milena/mln/canvas/labeling/generic.hh b/milena/mln/canvas/labeling/generic.hh index b701e42..42511e3 100644 --- a/milena/mln/canvas/labeling/generic.hh +++ b/milena/mln/canvas/labeling/generic.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -100,7 +100,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // FIXME: Is-it useful? // Initialization. { @@ -157,7 +156,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); @@ -170,7 +168,6 @@ namespace mln else output(p) = output(parent(p)); } - status = true; } trace::exiting("canvas::labeling::impl::generic::labeling"); diff --git a/milena/mln/canvas/labeling/sorted.hh b/milena/mln/canvas/labeling/sorted.hh index 69f2181..b176139 100644 --- a/milena/mln/canvas/labeling/sorted.hh +++ b/milena/mln/canvas/labeling/sorted.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -96,7 +96,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // FIXME: Is-it useful? // Initialization. { @@ -167,7 +166,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels \ for this label type: nlabels > \ max(label_type)."); @@ -179,7 +177,6 @@ namespace mln else output.element(p) = output.element(parent.element(p)); } - status = true; } trace::exiting("canvas::impl::labeling::sorted_fastest"); diff --git a/milena/mln/canvas/labeling/video.hh b/milena/mln/canvas/labeling/video.hh index b46e930..9735772 100644 --- a/milena/mln/canvas/labeling/video.hh +++ b/milena/mln/canvas/labeling/video.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -87,7 +87,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // Initialization. { @@ -155,7 +154,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels for \ this label type: nlabels > \ max(label_type)."); @@ -172,7 +170,6 @@ namespace mln f.set_label_(p, lbl); } } - status = true; } f.finalize(); diff --git a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh index 35ec2ae..7582f43 100644 --- a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -225,11 +225,10 @@ namespace mln const Image& f, const Image<J>& g, const Neighborhood<N>& nbh) { + // FIXME: Not yet implemented. (void) f; (void) g; (void) nbh; - - // FIXME: Not yet implemented. std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" "mln::morpho::reconstruction::by_dilation::internal::\n" diff --git a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh index b367f7b..ae65bae 100644 --- a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2013 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -224,6 +224,8 @@ namespace mln const Neighborhood<N>& nbh) { // FIXME: Not yet implemented. + (void) f; + (void) g; (void) nbh; std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" diff --git a/milena/tests/accu/site_set/rectangularity.cc b/milena/tests/accu/site_set/rectangularity.cc index 8919494..51b4c85 100644 --- a/milena/tests/accu/site_set/rectangularity.cc +++ b/milena/tests/accu/site_set/rectangularity.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -61,5 +61,6 @@ int main() { accu::site_set::rectangularity<point2d> a; accu::site_set::rectangularity<point2d> b = exact(a); + (void) b; } } diff --git a/milena/tests/core/other/var.cc b/milena/tests/core/other/var.cc index 4e6fa76..72d02d4 100644 --- a/milena/tests/core/other/var.cc +++ b/milena/tests/core/other/var.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -56,17 +56,23 @@ void test_template() { mln_PITER(p, ima.domain()); mln_NITER(n, neighb, p); + (void) n; mln_QITER(q, win, p); + (void) q; } { mln_FWD_PITER(p, ima.domain()); mln_FWD_NITER(n, neighb, p); + (void) n; mln_FWD_QITER(q, win, p); + (void) q; } { mln_BKD_PITER(p, ima.domain()); mln_BKD_NITER(n, neighb, p); + (void) n; mln_BKD_QITER(q, win, p); + (void) q; } util::array<point2d> arr; diff --git a/milena/tests/trait/op/plus.cc b/milena/tests/trait/op/plus.cc index 6639a43..aef8f75 100644 --- a/milena/tests/trait/op/plus.cc +++ b/milena/tests/trait/op/plus.cc @@ -116,6 +116,7 @@ int main() { mln_trait_op_plus_(int, float) tmp; tmp = 5.1f; + (void) tmp; } { my_image2d<float> ima; -- 1.7.2.5

11 years, 9 months

olena-2.0-104-g993220a Fix apps/morphers/Makefile.am.

by Roland Levillain

* apps/morphers/Makefile.am: Include $(top_srcdir)/milena/common.mk. --- milena/ChangeLog | 7 +++++++ milena/apps/morphers/Makefile.am | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e55d08b..01eefa4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> + + Fix apps/morphers/Makefile.am. + + * apps/morphers/Makefile.am: Include + $(top_srcdir)/milena/common.mk. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation Warnings with latest g++ versions. diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index 55bfda5..ae8e3ff 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -17,6 +17,8 @@ # Illustrations of morphers. +include $(top_srcdir)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. -- 1.7.2.5

11 years, 9 months

olena-2.0-103-g766aeea Fix inclusion paths.

by Roland Levillain

* common.mk (AM_CPPFLAGS): Add paths to scribo/ dirs instead of top-level dirs. --- scribo/ChangeLog | 7 +++++++ scribo/common.mk | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d7f779c..cd207a3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> + + Fix inclusion paths. + + * common.mk (AM_CPPFLAGS): Add paths to scribo/ dirs instead of + top-level dirs. + 2013-02-13 Roland Levillain <roland(a)lrde.epita.fr> Simplify more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. diff --git a/scribo/common.mk b/scribo/common.mk index ef59d88..a0dee7c 100644 --- a/scribo/common.mk +++ b/scribo/common.mk @@ -2,7 +2,7 @@ ## Common Automake parameters. -## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE). ## ## This file is part of Olena. ## @@ -21,6 +21,7 @@ # C++ sources. AM_DEFAULT_SOURCE_EXT = .cc -# Add paths to Scribo's headers. -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ \ +# Add paths to Scribo's and Milena's headers. +AM_CPPFLAGS = \ + -I$(top_srcdir)/scribo -I$(top_builddir)/scribo \ -I$(top_srcdir)/milena -I$(top_builddir)/milena -- 1.7.2.5

11 years, 9 months

branch icdar/bsec2013 created: olena-2.0-229-g115049c

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 icdar/bsec2013 has been created at 115049c77493d553961bdacfa5e80c2f276d1bb6 (commit) - Log ----------------------------------------------------------------- 115049c src/contest/bsec2013/process_toc_page.cc: New. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

branch unstable/scribo updated: olena-2.0-229-g7e065e0

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 unstable/scribo has been updated via 7e065e0e5f6be35574c5ea8c1260be79f5be1c49 (commit) from da8955a22c1dcb7945d813a802bceee05c129594 (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 ----------------------------------------------------------------- 7e065e0 mln/io/pdf/load.hh: Check if the PDF can be rendered. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/mln/io/pdf/load.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-229-g7e065e0 mln/io/pdf/load.hh: Check if the PDF can be rendered.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/io/pdf/load.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a14bc8a..86b2a92 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-01 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/pdf/load.hh: Check if the PDF can be rendered. + +2013-03-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Add test images. * tests/img/example-0.ppm, diff --git a/milena/mln/io/pdf/load.hh b/milena/mln/io/pdf/load.hh index 513a61d..ee68c8a 100644 --- a/milena/mln/io/pdf/load.hh +++ b/milena/mln/io/pdf/load.hh @@ -198,6 +198,12 @@ namespace mln // Render Page poppler::page_renderer pr; + if (! pr.can_render()) + { + std::cout << "PDF cannot be rendered! Make sure libpoppler is " + << "compiled with a render backend." << std::endl; + abort(); + } poppler::image pima = pr.render_page(p, dpi, dpi); // Prepare MLN image. -- 1.7.2.5

11 years, 9 months

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 March 2013