URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-14 Simon Nivault <simon.nivault@lrde.epita.fr> Fix typo. * mln/core/interpolated.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh, * mln/util/lazy_set.hh, * tests/core/mono_rle_image.cc, * tests/fun/x2x/composed.cc, * tests/fun/x2x/rotation.cc, * tests/fun/x2x/translation.cc: Fix. --- mln/core/interpolated.hh | 2 +- mln/core/mono_obased_rle_encode.hh | 5 +++-- mln/core/mono_obased_rle_image.hh | 15 +++++++-------- mln/core/mono_rle_encode.hh | 1 + mln/core/mono_rle_image.hh | 10 +++++----- mln/core/obased_rle_encode.hh | 1 + mln/core/obased_rle_image.hh | 10 +++++----- mln/core/rle_encode.hh | 1 + mln/core/rle_image.hh | 8 ++++---- mln/core/sparse_encode.hh | 1 + mln/core/sparse_image.hh | 10 +++++----- mln/util/lazy_set.hh | 18 +----------------- tests/core/mono_rle_image.cc | 2 +- tests/fun/x2x/composed.cc | 2 +- tests/fun/x2x/rotation.cc | 2 +- tests/fun/x2x/translation.cc | 2 +- 16 files changed, 39 insertions(+), 51 deletions(-) Index: trunk/milena/tests/fun/x2x/translation.cc =================================================================== --- trunk/milena/tests/fun/x2x/translation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/translation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_translation.cc +/*! \file tests/fun/x2x/translation.cc * * \brief Tests on mln::fun::x2x::translation. */ Index: trunk/milena/tests/fun/x2x/rotation.cc =================================================================== --- trunk/milena/tests/fun/x2x/rotation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/rotation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_rotation.cc +/*! \file tests/fun/x2x/rotation.cc * * \brief Tests on mln::fun::x2x::rotation. */ Index: trunk/milena/tests/fun/x2x/composed.cc =================================================================== --- trunk/milena/tests/fun/x2x/composed.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/composed.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_composed.cc +/*! \file tests/fun/x2x/composed.cc * * \brief Tests on mln::fun::x2x::composed. */ Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 1612) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mono_rle_iimage.cc +/*! \file tests/core/mono_rle_image.cc * * \brief Test on mln::labeling::blobs. */ Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a mono_rle_image ** ** @param input has to respect the Image concept + ** @param val specify the value which has to be considered ** ** @return mono_rle_image */ Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1612) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a sparse_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return sparse_image */ Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1612) +++ trunk/milena/mln/core/rle_image.hh (revision 1613) @@ -122,10 +122,10 @@ void insert(const p_run<P>& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite<P>& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite<P>& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::rvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite<P>& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::lvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite<P>& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1612) +++ trunk/milena/mln/core/interpolated.hh (revision 1613) @@ -59,7 +59,7 @@ } // end of namespace mln::internal - /*! \brief FIXME + /*! \brief Morpher that makes underlaying image being accessed with floating coordinate. * */ template <typename I> Index: trunk/milena/mln/core/obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a obased_rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return obased_rle_image */ Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief Mono RLE image. + /*! \brief Monochrome RLE image. * * RLE image with only one colour. * @@ -123,10 +123,10 @@ void insert(const p_run<P>& pr); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite<P>& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite<P>& site); /// Test if this image has been initialized. bool has_data() const; @@ -211,7 +211,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::rvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) const + mono_rle_image<P, T>::operator() (const runs_psite<P>& site) const { mln_precondition(this->has(site)); return this->data_->value_; @@ -220,7 +220,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::lvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + mono_rle_image<P, T>::operator() (const runs_psite<P>& site) { mln_precondition(this->has(site)); return this->data_->value_; Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1613) @@ -103,7 +103,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects. * * * Parameter \c P is the type of the image points. @@ -132,10 +132,10 @@ void insert(const p_run<P>& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite<P>& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite<P>& site); /// Test if this image has been initialized. bool has_data() const; @@ -237,7 +237,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::rvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite<P>& site) const { mln_precondition(this->has(site)); @@ -247,7 +247,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::lvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite<P>& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/mono_obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1613) @@ -39,11 +39,12 @@ { /*! - ** encode an image class to a mono_obased_rle_image + ** Encode an image class to a mono_obased_rle_image. ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** - ** @return mono_obased_rle_image + ** @return mono_obased_rle_image. */ template <typename I> mono_obased_rle_image<mln_point(I), mln_value(I)> Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1613) @@ -98,7 +98,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects based on mln::mono_rle_image. * * * Parameter \c P is the type of the image points. @@ -127,10 +127,10 @@ void insert(const p_run<P>& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + const T operator()(const runs_psite<P>& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + T& operator()(const runs_psite<P>& site); /// Test if this image has been initialized. bool has_data() const; @@ -224,9 +224,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::rvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) - const + const T + mono_obased_rle_image<P, T>::operator() (const runs_psite<P>& site) const { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; @@ -234,8 +233,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::lvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) + T& + mono_obased_rle_image<P, T>::operator() (const runs_psite<P>& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1612) +++ trunk/milena/mln/core/sparse_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief SPARSE image. + /*! \brief RLE image with different value in runs. * * * Parameter \c P is the type of the image points. @@ -122,10 +122,10 @@ void insert(const p_run<P>& pr, const std::vector<T>& value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite<P>& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite<P>& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::rvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite<P>& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::lvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite<P>& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()][site.p_in_run()]; Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return rle_image */ Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 1612) +++ trunk/milena/mln/util/lazy_set.hh (revision 1613) @@ -28,7 +28,7 @@ #ifndef MLN_UTIL_LAZY_SET_HH # define MLN_UTIL_LAZY_SET_HH -/*! \file mln/core/internal/lazy_set.hh +/*! \file mln/util/lazy_set.hh * * \brief Definition of mln::lazy_set_ for internal use only. */ @@ -201,22 +201,6 @@ }; - /*! \brief Print a set \p s into the output stream \p - * ostr. - * - * \param[in,out] ostr An output stream. - * \param[in] s A set. - * - * \return The modified output stream \p ostr. - * - * \relates mln::internal::lazy_set_ - */ - // FIXME : ambiguous with point_set operator << - // template <typename E> - // std::ostream& operator<<(std::ostream& ostr, const lazy_set_<E>& s); - - - # ifndef MLN_INCLUDE_ONLY template <typename E>