2005-04-08 Thierry GERAUD &lt;theo(a)tegucigalpa.lrde.epita.fr&gt; * oln/core/pw/logic.hh: Fix include. * oln/core/pw/cmp.hh: Cosmetic change. * oln/utils/md5.hh: Conform to image_valuedness. * oln/utils/md5.hxx: Likewise. * oln/morpho/reconstruction.hh: Likewise. * oln/arith/min.hh: Likewise. * oln/arith/max.hh: Likewise. Index: oln/core/pw/logic.hh =================================================================== --- oln/core/pw/logic.hh (revision 128) +++ oln/core/pw/logic.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/abstract/image_typeness.hh> # include <oln/core/pw/abstract/function.hh> +# include <oln/core/pw/cmp.hh> namespace oln { Index: oln/core/pw/cmp.hh =================================================================== --- oln/core/pw/cmp.hh (revision 128) +++ oln/core/pw/cmp.hh (working copy) @@ -129,12 +129,12 @@ # define oln_pw_decl_cmp_op(NAME, SYMBOL) \ template <typename L, typename R> \ -oln::pw::cmp<L, R, oln::pw::internal::NAME> \ +oln::pw::cmp<L, R, oln::pw::internal:: NAME > \ operator SYMBOL (const oln::pw::abstract::function<L>& lhs, \ const oln::pw::abstract::function<R>& rhs) \ { \ precondition(lhs.size() == rhs.size()); \ - oln::pw::cmp<L, R, oln::pw::internal::NAME> tmp(lhs, rhs); \ + oln::pw::cmp<L, R, oln::pw::internal:: NAME > tmp(lhs, rhs); \ return tmp; \ } Index: oln/utils/md5.hh =================================================================== --- oln/utils/md5.hh (revision 128) +++ oln/utils/md5.hh (working copy) @@ -31,8 +31,7 @@ # include <ntg/all.hh> # include <vector> -# include <oln/core/abstract/image_vectorialness.hh> -# include <oln/core/properties.hh> +# include <oln/core/abstract/images.hh> # include <oln/core/abstract/piter.hh> # include <oln/utils/key.hh> @@ -218,11 +217,9 @@ ** \param I Exact type of the image. ** ** \arg im Image to process. - ** - ** Non vectorial image version. */ template <class I> - key md5(const oln::abstract::non_vectorial_image<I> &im); + key md5(const oln::abstract::image<I> &im); /*! ** \brief Compute The Md5 value of an image. @@ -231,10 +228,10 @@ ** ** \arg im Image to process. ** - ** Vectorial image version. + ** For vector-valued images. */ template <class I> - key md5(const oln::abstract::vectorial_image<I> &im); + key md5(const oln::abstract::vector_valued_image<I> &im); } // !utils } // !oln Index: oln/utils/md5.hxx =================================================================== --- oln/utils/md5.hxx (revision 128) +++ oln/utils/md5.hxx (working copy) @@ -286,7 +286,7 @@ // md5 implementation. template <class I> inline -key md5(const oln::abstract::non_vectorial_image<I> &im) +key md5(const oln::abstract::image<I> &im) { buffer b; oln_type_of(I, fwd_piter) p(im.size()); @@ -303,7 +303,7 @@ // md5 implementation. template <class I> inline -key md5(const oln::abstract::vectorial_image<I> &im) +key md5(const oln::abstract::vector_valued_image<I> &im) { oln_type_of(I, fwd_piter) p(im.size()); buffer b; Index: oln/morpho/reconstruction.hh =================================================================== --- oln/morpho/reconstruction.hh (revision 128) +++ oln/morpho/reconstruction.hh (working copy) @@ -80,8 +80,8 @@ const N nbh; - reconstruction_ret(const abstract::non_vectorial_image<I>& input1, - const abstract::non_vectorial_image<I>& input2, + reconstruction_ret(const abstract::image<I>& input1, + const abstract::image<I>& input2, const abstract::neighborhood<N>& nbh) : super_type(input1.exact(), input2.exact()), nbh(nbh.exact()) @@ -139,8 +139,8 @@ } protected: - reconstruction_sequential_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_sequential_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) {} @@ -154,8 +154,8 @@ { typedef reconstruction_sequential_ret<I, N> super_type; - reconstruction_dilation_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_dilation_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) @@ -177,8 +177,8 @@ { typedef reconstruction_sequential_ret<I, N> super_type; - reconstruction_erosion_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_erosion_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) @@ -197,8 +197,8 @@ template<class I, class N> reconstruction_ret<I, N> - geodesic_reconstruction_dilation(const abstract::non_vectorial_image<I> & marker, - const abstract::non_vectorial_image<I> & mask, + geodesic_reconstruction_dilation(const abstract::image<I> & marker, + const abstract::image<I> & mask, const abstract::neighborhood<N>& nbh) { impl::reconstruction_dilation_ret<I, N> tmp(marker, mask, nbh); @@ -208,8 +208,8 @@ template<class I, class N> reconstruction_ret<I, N> - geodesic_reconstruction_erosion(const abstract::non_vectorial_image<I> & marker, - const abstract::non_vectorial_image<I> & mask, + geodesic_reconstruction_erosion(const abstract::image<I> & marker, + const abstract::image<I> & mask, const abstract::neighborhood<N>& nbh) { impl::reconstruction_erosion_ret<I, N> tmp(marker, mask, nbh); @@ -229,8 +229,8 @@ { typedef reconstruction_ret<I, N> super_type; - reconstruction_hybrid_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_hybrid_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) @@ -312,8 +312,8 @@ { typedef reconstruction_hybrid_ret<I, N> super_type; - reconstruction_dilation_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_dilation_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) @@ -371,8 +371,8 @@ { typedef reconstruction_hybrid_ret<I, N> super_type; - reconstruction_erosion_ret(const abstract::non_vectorial_image<I>& input1, //marker - const abstract::non_vectorial_image<I>& input2, //mask + reconstruction_erosion_ret(const abstract::image<I>& input1, //marker + const abstract::image<I>& input2, //mask const abstract::neighborhood<N>& nbh) : super_type(input1, input2, nbh) @@ -428,8 +428,8 @@ template<class I, class N> reconstruction_ret<I, N> - geodesic_reconstruction_dilation(const abstract::non_vectorial_image<I> & marker, - const abstract::non_vectorial_image<I> & mask, + geodesic_reconstruction_dilation(const abstract::image<I> & marker, + const abstract::image<I> & mask, const abstract::neighborhood<N>& nbh) { impl::reconstruction_dilation_ret<I, N> tmp(marker, mask, nbh); @@ -439,8 +439,8 @@ template<class I, class N> reconstruction_ret<I, N> - geodesic_reconstruction_erosion(const abstract::non_vectorial_image<I> & marker, - const abstract::non_vectorial_image<I> & mask, + geodesic_reconstruction_erosion(const abstract::image<I> & marker, + const abstract::image<I> & mask, const abstract::neighborhood<N>& nbh) { impl::reconstruction_erosion_ret<I, N> tmp(marker, mask, nbh); Index: oln/arith/min.hh =================================================================== --- oln/arith/min.hh (revision 128) +++ oln/arith/min.hh (working copy) @@ -66,8 +66,8 @@ { typedef abstract::image_binary_operator<I, I, I, min_type<I> > super_type; - min_type(const abstract::non_vectorial_image<I>& input1, - const abstract::non_vectorial_image<I>& input2) : + min_type(const abstract::image<I>& input1, + const abstract::image<I>& input2) : super_type(input1.exact(), input2.exact()) {} @@ -87,11 +87,9 @@ } - // FIXME: replace non_vectorial_image by scalar_image - // FIXME: cause arithmetics is not defined for Booleans and labels... template <typename I> - impl::min_type<I> min(const abstract::non_vectorial_image<I>& input1, - const abstract::non_vectorial_image<I>& input2) + impl::min_type<I> min(const abstract::image<I>& input1, + const abstract::image<I>& input2) { impl::min_type<I> tmp(input1, input2); tmp.run(); Index: oln/arith/max.hh =================================================================== --- oln/arith/max.hh (revision 128) +++ oln/arith/max.hh (working copy) @@ -66,8 +66,8 @@ { typedef abstract::image_binary_operator<I, I, I, max_type<I> > super_type; - max_type(const abstract::non_vectorial_image<I>& input1, - const abstract::non_vectorial_image<I>& input2) : + max_type(const abstract::image<I>& input1, + const abstract::image<I>& input2) : super_type(input1.exact(), input2.exact()) {} @@ -88,8 +88,8 @@ } template <typename I> - impl::max_type<I> max(const abstract::non_vectorial_image<I>& input1, - const abstract::non_vectorial_image<I>& input2) + impl::max_type<I> max(const abstract::image<I>& input1, + const abstract::image<I>& input2) { impl::max_type<I> tmp(input1, input2); tmp.run();