Commit 91417672 authored by Thierry Geraud's avatar Thierry Geraud
Browse files

Fix missing specialization for bkd_pixter in image1d and image3d.

	* mln/core/image/image1d.hh
	(bkd_pixter): Fix missing specialization.
	* mln/core/image/image3d.hh
	(bkd_pixter): Fix missing specialization.
	* mln/morpho/attribute/card.hh: Fix missing using.
	* mln/canvas/morpho/algebraic_filter.hh: Layout.
	* tests/morpho/closing_algebraic.cc: Remove dead code.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3333 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent b8c12d45
2009-02-10 Thierry Geraud <thierry.geraud@lrde.epita.fr>
Fix missing specialization for bkd_pixter in image1d and image3d.
* mln/core/image/image1d.hh
(bkd_pixter): Fix missing specialization.
* mln/core/image/image3d.hh
(bkd_pixter): Fix missing specialization.
* mln/morpho/attribute/card.hh: Fix missing using.
* mln/canvas/morpho/algebraic_filter.hh: Layout.
* tests/morpho/closing_algebraic.cc: Remove dead code.
2009-02-10 Thierry Geraud <thierry.geraud@lrde.epita.fr>
 
Fetch card and algebraic_union_find.hh from Edwin's sandbox.
// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
// (LRDE)
// 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
......@@ -542,6 +542,12 @@ namespace mln
template <typename T>
struct bkd_pixter< image1d<T> >
{
typedef bkd_pixter1d< image1d<T> > ret;
};
template <typename T>
struct bkd_pixter< const image1d<T> >
{
typedef bkd_pixter1d< const image1d<T> > ret;
};
......
// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
// (LRDE)
// 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
......@@ -622,6 +622,12 @@ namespace mln
template <typename T>
struct bkd_pixter< image3d<T> >
{
typedef bkd_pixter3d< image3d<T> > ret;
};
template <typename T>
struct bkd_pixter< const image3d<T> >
{
typedef bkd_pixter3d< const image3d<T> > ret;
};
......
......@@ -44,7 +44,7 @@ namespace mln
namespace morpho {
namespace attribute {
template <typename I> struct card;
template <typename I> class card;
}
}
......@@ -61,7 +61,6 @@ namespace mln
typedef accumulator::has_set_value::no has_set_value;
typedef accumulator::has_stop::no has_stop;
typedef accumulator::when_pix::use_none when_pix;
};
} // end of namespace mln::trait
......@@ -76,8 +75,11 @@ namespace mln
/// Cardinality accumulator class.
template <typename I>
struct card : public mln::accu::internal::base< unsigned, card<I> >
class card : public mln::accu::internal::base< unsigned, card<I> >
{
typedef mln::accu::internal::base< unsigned, card<I> > super_;
public:
typedef mln_psite(I) argument;
card();
......@@ -93,6 +95,7 @@ namespace mln
void take();
void take_as_init();
using super_::take_as_init;
/// \}
/// Get the value of the accumulator.
......
......@@ -53,7 +53,7 @@ int main()
typedef image2d<int_u8> I;
I lena;
io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm");//lena.pgm");
io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm");
{
accu::count<point2d> a;
io::pgm::save(morpho::closing_algebraic(lena, c4(), a, 10),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment