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

De-activate dependencies to files kept out of release 1.0.

	* mln/trait/ch_value.hh,
	* mln/trait/essential.hh,
	* mln/trait/all.hh,
	* mln/core/image/vmorph/thru_image.hh,
	* mln/core/image/vmorph/all.hh,
	* mln/core/image/vmorph/thrubin_image.hh,
	* mln/all.hh,
	* mln/data/all.hh,
	* mln/linear/all.hh,
	* mln/value/all.hh,
	* mln/value/essential.hh,
	* mln/convert/all.hh,
	* mln/essential/routine.hh,
	* mln/fun/all.hh,
	* mln/fun/v2v/essential.hh,
	* mln/fun/v2v/all.hh,
	* mln/fun/essential.hh,
	* tests/trait/ch_value.cc,
	* tests/core/image/vmorph/Makefile.am,
	* tests/linear/Makefile.am,
	* tests/value/Makefile.am,
	* tests/convert/Makefile.am,
	* tests/fun/Makefile.am,
	* tests/fun/v2v/Makefile.am,
	* tests/Makefile.am: De-activate dependencies to files
	kept out of release 1.0.

	Misc.
	* mln/core/image/vmorph/fun_image.hh: Re-vamp.
	* tests/core/image/vmorph/fun_image.cc: New.
	* mln/accu/shape/bbox.hh: Fix namespace balancing.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4131 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 85873e27
2009-06-12 Thierry Geraud <thierry.geraud@lrde.epita.fr>
De-activate dependencies to files kept out of release 1.0.
* mln/trait/ch_value.hh,
* mln/trait/essential.hh,
* mln/trait/all.hh,
* mln/core/image/vmorph/thru_image.hh,
* mln/core/image/vmorph/all.hh,
* mln/core/image/vmorph/thrubin_image.hh,
* mln/all.hh,
* mln/data/all.hh,
* mln/linear/all.hh,
* mln/value/all.hh,
* mln/value/essential.hh,
* mln/convert/all.hh,
* mln/essential/routine.hh,
* mln/fun/all.hh,
* mln/fun/v2v/essential.hh,
* mln/fun/v2v/all.hh,
* mln/fun/essential.hh,
* tests/trait/ch_value.cc,
* tests/core/image/vmorph/Makefile.am,
* tests/linear/Makefile.am,
* tests/value/Makefile.am,
* tests/convert/Makefile.am,
* tests/fun/Makefile.am,
* tests/fun/v2v/Makefile.am,
* tests/Makefile.am: De-activate dependencies to files
kept out of release 1.0.
Misc.
* mln/core/image/vmorph/fun_image.hh: Re-vamp.
* tests/core/image/vmorph/fun_image.cc: New.
* mln/accu/shape/bbox.hh: Fix namespace balancing.
2009-06-12 Roland Levillain <roland@lrde.epita.fr>
 
* headers.mk: Regen.
......@@ -81,7 +81,7 @@ namespace mln
};
} // end of mln::accu::shape
} // end of namespace mln::accu::shape
namespace meta
......@@ -104,6 +104,8 @@ namespace mln
} // end of namespace mln::accu::meta
# ifndef MLN_INCLUDE_ONLY
namespace shape
......@@ -224,10 +226,10 @@ namespace mln
return is_valid_;
}
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu::shape
# endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::accu
} // end of namespace mln
......
......@@ -29,6 +29,8 @@
/// \file
///
/// File that includes all the headers.
///
/// \todo Do not include essentials.
#include <mln/accu/all.hh>
......@@ -43,7 +45,6 @@
#include <mln/draw/all.hh>
#include <mln/estim/all.hh>
#include <mln/extension/all.hh>
#include <mln/extract/all.hh>
#include <mln/fun/all.hh>
#include <mln/geom/all.hh>
#include <mln/graph/all.hh>
......@@ -74,4 +75,10 @@
#include <mln/essential/2d.hh>
#include <mln/essential/3d.hh>
// #include <mln/extract/all.hh> De-activated in 1.0
// #include <mln/registration/all.hh> De-activated in 1.0
// #include <mln/subsampling/all.hh> De-activated in 1.0
#endif // ! MLN_ALL_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......
......@@ -33,9 +33,10 @@
# include <mln/core/image/vmorph/cast_image.hh>
# include <mln/core/image/vmorph/fun_image.hh>
# include <mln/core/image/vmorph/thrubin_image.hh>
# include <mln/core/image/vmorph/thru_image.hh>
# include <mln/core/image/vmorph/violent_cast_image.hh>
// # include <mln/core/image/vmorph/thrubin_image.hh> De-activated in 1.0
// # include <mln/core/image/vmorph/thru_image.hh> De-activated in 1.0
#endif // ! MLN_CORE_IMAGE_VMORPH_ALL_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -28,16 +29,17 @@
/// \file
///
/// Definition of an image morpher that make the user see the
/// image through a function
/// Definition of an image morpher that returns image data through a
/// function.
# include <mln/core/internal/image_value_morpher.hh>
# include <mln/trait/images.hh>
# include <mln/value/set.hh>
# include <mln/value/shell.hh>
// # include <mln/value/shell.hh> De-activated for 1.0
# include <mln/metal/if.hh>
# include <mln/metal/equal.hh>
namespace mln
{
......@@ -50,8 +52,9 @@ namespace mln
template <typename F, typename I>
struct data< fun_image<F,I> >
{
data(I& ima);
I& ima_;
data(const F& f, const I& ima);
F f_;
const I ima_;
};
} // end of namespace mln::internal
......@@ -66,7 +69,7 @@ namespace mln
{
// typedef trait::image::category::value_morpher category;
typedef trait::image::category::primary category; // does not work either
typedef trait::image::value_io::read_write value_io;
typedef trait::image::value_io::read_only value_io;
typedef trait::image::value_access::computed value_access;
typedef trait::image::value_storage::disrupted value_storage;
typedef
......@@ -88,7 +91,6 @@ namespace mln
/// Image read through a function.
///
/// \ingroup modimagevaluemorpher
......@@ -104,7 +106,8 @@ namespace mln
typedef mln_result(F) rvalue;
/// Return type of read-write access.
typedef mln::value::shell<F,I> lvalue;
typedef mln_result(F) lvalue;
// typedef mln::value::shell<F,I> lvalue; De-activated for 1.0
/// Skeleton.
typedef fun_image< tag::value_<mln_result(F)>, tag::image_<I> > skeleton;
......@@ -113,23 +116,42 @@ namespace mln
fun_image();
/// Constructor.
fun_image(Image<I>& ima);
fun_image(const Function_v2v<F>& f, const Image<I>& ima);
/// Initialize an empty image.
void init_(Image<I>& ima);
void init_(const Function_v2v<F>& f, const Image<I>& ima);
/// Read-only access of pixel value at point site \p p.
mln_result(F) operator()(const mln_psite(I)& p) const;
/// Mutable access is for reading and writing.
lvalue operator()(const mln_psite(I)& p);
/// Mutable access is for reading only.
mln_result(F) operator()(const mln_psite(I)& p);
// lvalue operator()(const mln_psite(I)& p); De-activated for 1.0
F f;
};
template <typename F, typename I>
fun_image<F, I>
operator << (const Function_v2v<F>& f, const Image<I>& ima);
# ifndef MLN_INCLUDE_ONLY
template <typename F, typename I>
fun_image<F, I>
inline
operator << (const Function_v2v<F>& f, const Image<I>& ima)
{
fun_image<F, I> tmp(exact(f), exact(ima));
return tmp;
}
// internal::data< fun_image<T,I> >
namespace internal
......@@ -137,8 +159,9 @@ namespace mln
template <typename F, typename I>
inline
data< fun_image<F,I> >::data(I& ima)
: ima_(ima)
data< fun_image<F,I> >::data(const F& f, const I& ima)
: f_(f),
ima_(ima)
{
}
......@@ -156,19 +179,19 @@ namespace mln
template <typename F, typename I>
inline
fun_image<F,I>::fun_image(Image<I>& ima)
fun_image<F,I>::fun_image(const Function_v2v<F>& f, const Image<I>& ima)
{
init_(ima);
init_(f, ima);
}
template <typename F, typename I>
inline
void
fun_image<F,I>::init_(Image<I>& ima)
fun_image<F,I>::init_(const Function_v2v<F>& f, const Image<I>& ima)
{
mln_precondition(exact(ima).is_valid());
this->data_ = new internal::data<fun_image<F,I> >(exact(ima));
this->data_ = new internal::data<fun_image<F,I> >(exact(f), exact(ima));
}
......@@ -183,10 +206,12 @@ namespace mln
template <typename F, typename I>
inline
value::shell<F, I>
mln_result(F)
fun_image<F,I>::operator()(const mln_psite(I)& p)
{
return mln::value::shell<F, I>( this->data_->ima_, p );
mln_precondition(this->data_->ima_.has(p));
return f( this->data_->ima_(p) );
// return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0
}
......
......@@ -26,17 +26,18 @@
#ifndef MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH
# define MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH
# include <mln/core/internal/image_value_morpher.hh>
# include <mln/core/concept/meta_function.hh>
# include <mln/metal/bexpr.hh>
# include <mln/trait/functions.hh>
/// \file
///
/// \brief Definition of a morpher that morph image values through a function.
///
/// \todo Debug constness of thru_image
# include <mln/core/internal/image_value_morpher.hh>
# include <mln/core/concept/meta_function.hh>
# include <mln/metal/bexpr.hh>
# include <mln/trait/functions.hh>
namespace mln
{
......
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -26,15 +27,16 @@
#ifndef MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH
# define MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH
/// \file
///
/// \brief Definition of a morpher that morph values from two images
/// through a binary function.
# include <mln/core/internal/image_value_morpher.hh>
# include <mln/core/concept/meta_function.hh>
# include <mln/metal/bexpr.hh>
# include <mln/trait/functions.hh>
/// \file
///
/// \brief Definition of a morpher that morph values from two images
/// through a binary function.
namespace mln
{
......
......@@ -68,7 +68,8 @@ namespace mln
# include <mln/data/to_enc.hh>
# include <mln/data/transform.hh>
# include <mln/data/update.hh>
//<< # include <mln/data/was.median.hh> >>
// # include <mln/data/was.median.hh> De-activated in 1.0
......
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -26,6 +27,7 @@
#ifndef MLN_ESSENTIAL_ROUTINE_HH
# define MLN_ESSENTIAL_ROUTINE_HH
# include <mln/topo/essential.hh>
# include <mln/accu/essential.hh>
# include <mln/algebra/essential.hh>
......@@ -40,7 +42,6 @@
# include <mln/draw/essential.hh>
# include <mln/estim/essential.hh>
# include <mln/extension/essential.hh>
# include <mln/extract/essential.hh>
# include <mln/fun/essential.hh>
# include <mln/geom/essential.hh>
# include <mln/graph/essential.hh>
......@@ -58,9 +59,7 @@
# include <mln/norm/essential.hh>
# include <mln/opt/essential.hh>
# include <mln/pw/essential.hh>
# include <mln/registration/essential.hh>
# include <mln/set/essential.hh>
# include <mln/subsampling/essential.hh>
# include <mln/tag/essential.hh>
# include <mln/test/essential.hh>
# include <mln/trace/essential.hh>
......@@ -70,4 +69,10 @@
# include <mln/value/essential.hh>
# include <mln/win/essential.hh>
// # include <mln/extract/essential.hh> De-activated in 1.0
// # include <mln/registration/essential.hh> De-activated in 1.0
// # include <mln/subsampling/essential.hh> De-activated in 1.0
#endif // ! MLN_ESSENTIAL_ROUTINE_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -29,6 +30,8 @@
/// \file
///
/// File that includes all functions.
///
/// \todo Incomplete list of files.
namespace mln
......@@ -46,10 +49,15 @@ namespace mln
}
// Files.
# include <mln/fun/c.hh>
# include <mln/fun/ops.hh>
// Sub-directories.
# include <mln/fun/i2v/all.hh>
# include <mln/fun/meta/all.hh>
# include <mln/fun/p2b/all.hh>
# include <mln/fun/p2v/all.hh>
# include <mln/fun/stat/all.hh>
......@@ -61,5 +69,8 @@ namespace mln
# include <mln/fun/x2v/all.hh>
# include <mln/fun/x2x/all.hh>
// # include <mln/fun/meta/all.hh> De-activated in 1.0
// # include <mln/fun/spe/all.hh> De-activated in 1.0
#endif // ! MLN_FUN_ALL_HH
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -30,10 +31,11 @@
///
/// File that includes essential fun-related routines.
# include <mln/fun/c.hh>
# include <mln/fun/ops.hh>
# include <mln/fun/i2v/essential.hh>
# include <mln/fun/meta/essential.hh>
// # include <mln/fun/meta/essential.hh>
# include <mln/fun/p2b/essential.hh>
# include <mln/fun/p2v/essential.hh>
# include <mln/fun/v2b/essential.hh>
......@@ -43,4 +45,5 @@
# include <mln/fun/x2v/essential.hh>
# include <mln/fun/x2x/essential.hh>
#endif // ! MLN_FUN_ESSENTIAL_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -51,16 +52,17 @@ namespace mln
# include <mln/fun/v2v/convert.hh>
# include <mln/fun/v2v/dec.hh>
# include <mln/fun/v2v/enc.hh>
# include <mln/fun/v2v/hsi_to_rgb.hh>
# include <mln/fun/v2v/hsl_to_rgb.hh>
# include <mln/fun/v2v/id.hh>
# include <mln/fun/v2v/linear.hh>
# include <mln/fun/v2v/norm.hh>
# include <mln/fun/v2v/projection.hh>
# include <mln/fun/v2v/rgb_to_hsi.hh>
# include <mln/fun/v2v/rgb_to_hsl.hh>
# include <mln/fun/v2v/saturate.hh>
# include <mln/fun/v2v/wrap.hh>
// # include <mln/fun/v2v/hsi_to_rgb.hh> De-activated in 1.0
// # include <mln/fun/v2v/hsl_to_rgb.hh> De-activated in 1.0
// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0
// # include <mln/fun/v2v/rgb_to_hsl.hh> De-activated in 1.0
#endif // ! MLN_FUN_V2V_ALL_HH
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
//
......@@ -30,10 +31,13 @@
///
/// \brief File that includes essential functions from value to value.
# include <mln/fun/v2v/abs.hh>
# include <mln/fun/v2v/cast.hh>
# include <mln/fun/v2v/convert.hh>
# include <mln/fun/v2v/rgb_to_hsi.hh>
# include <mln/fun/v2v/saturate.hh>
// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0
#endif // ! MLN_FUN_V2V_ESSENTIAL_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -58,15 +59,14 @@ namespace mln
# include <mln/linear/convolve.hh>
# include <mln/linear/convolve_2x1d.hh>
# include <mln/linear/convolve_directional.hh>
# include <mln/linear/gaussian.hh>
# include <mln/linear/gaussian_directional_2d.hh>
# include <mln/linear/gaussian_1d.hh>
# include <mln/linear/lap.hh>
# include <mln/linear/log.hh>
//# include <mln/linear/sobel.hh>
//# include <mln/linear/local/convolve.hh>
// # include <mln/linear/sobel.hh> De-activated in 1.0
// # include <mln/linear/local/convolve.hh> De-activated in 1.0
// # include <mln/linear/gaussian.hh> De-activated in 1.0
// # include <mln/linear/gaussian_directional_2d.hh> De-activated in 1.0
// # include <mln/linear/gaussian_1d.hh> De-activated in 1.0
#endif // ! MLN_LINEAR_ALL_HH
// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -26,12 +27,10 @@
#ifndef MLN_TRAIT_ALL_HH
# define MLN_TRAIT_ALL_HH
/*!
* \file
*
* \brief Definition of all traits.
*
*/
///
/// \file
///
/// \brief Definition of all traits.
namespace mln
......@@ -55,14 +54,13 @@ namespace mln
} // end of namespace mln
// meta-program to solve a trait call
# include <mln/trait/solve.hh>
// promote
# include <mln/trait/promote.hh>
// ops
# include <mln/trait/op/all.hh>
// # include <mln/trait/next/all.hh> De-activated in 1.0
// # include <mln/trait/functions.hh> De-activated in 1.0
#endif // ! MLN_TRAIT_ALL_HH
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -115,23 +116,25 @@ namespace mln
typedef M< mln_ch_value(I, V), E > ret;
};
// For mln::value::stack_image<n,I>.
template < template <unsigned, class> class M, unsigned n, typename I,
typename V >
struct ch_value_< M< n, tag::image_<I> >, V >
{
/* FIXME: The code used to read
typedef algebra::vec<n, V> value;
typedef mln_ch_value(I, value) ret;
here. But this is wrong IMHO (Roland). Changing the value
type of a stack image (in fact, a vectorial image) shall
alter the *value type* of the image, not the type of the
*components* of the vector. Hence the current definition.
*/
typedef mln_ch_value(I, V) ret;
};
// De-activated for 1.0
//
// // For mln::value::stack_image<n,I>.
// template < template <unsigned, class> class M, unsigned n, typename I,
// typename V >
// struct ch_value_< M< n, tag::image_<I> >, V >
// {
// // FIXME: The code used to read
// // typedef algebra::vec<n, V> value;
// // typedef mln_ch_value(I, value) ret;
// // here. But this is wrong IMHO (Roland). Changing the value
// // type of a stack image (in fact, a vectorial image) shall
// // alter the *value type* of the image, not the type of the
// // *components* of the vector. Hence the current definition.
// typedef mln_ch_value(I, V) ret;
// };
// For mln::complex_image<D, G, T>.
template < template <unsigned, class, class> class M,
......
// Copyright (C) 2006, 2008, 2009 EPITA Research and Development Laboratory (LRDE)
// Copyright (C) 2006, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of Olena.
//
......@@ -26,20 +27,14 @@
#ifndef MLN_TRAIT_ESSENTIAL_HH
# define MLN_TRAIT_ESSENTIAL_HH
/*!
* \file
*
* \brief Definition of essential traits.
*
*/
///