- Olena-patches

milena r1345: Update typo
by Guillaume Duhamel 17 Oct '07

17 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update typo. * level/approx/all.hh, * level/naive/all.hh, * tag/all.hh, * win/all.hh: New file for doc namespace. --- level/approx/all.hh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ level/naive/all.hh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tag/all.hh | 49 +++++++++++++++++++++++++++++++++++++++++++ win/all.hh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+) Index: trunk/milena/mln/level/naive/all.hh =================================================================== --- trunk/milena/mln/level/naive/all.hh (revision 0) +++ trunk/milena/mln/level/naive/all.hh (revision 1345) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_LEVEL_NAIVE_ALL_HH +# define MLN_LEVEL_NAIVE_ALL_HH + +/*! \file mln/level/aprox/all.hh + * + * \brief File that includes all level-related routines with + * naive approach. + */ + + +namespace mln +{ + + + namespace level + { + + /// Namespace of image processing routines related to pixel levels + /// with naive approach. + namespace naive + {} + + } // end of namespace level + +} // end of namespace mln + + +# include <mln/level/naive/median.hh> + + +#endif // ! MLN_LEVEL_NAIVE_ALL_HH Index: trunk/milena/mln/level/approx/all.hh =================================================================== --- trunk/milena/mln/level/approx/all.hh (revision 0) +++ trunk/milena/mln/level/approx/all.hh (revision 1345) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_LEVEL_APPROX_ALL_HH +# define MLN_LEVEL_APPROX_ALL_HH + +/*! \file mln/level/aprox/all.hh + * + * \brief File that includes all level-related routines with + * approximation. + */ + + +namespace mln +{ + + + namespace level + { + + /// Namespace of image processing routines related to pixel levels + /// with approximation. + namespace approx + {} + + } // end of namespace level + +} // end of namespace mln + + +# include <mln/level/approx/median.hh> + + +#endif // ! MLN_LEVEL_APPROX_ALL_HH Index: trunk/milena/mln/tag/all.hh =================================================================== --- trunk/milena/mln/tag/all.hh (revision 0) +++ trunk/milena/mln/tag/all.hh (revision 1345) @@ -0,0 +1,49 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_TAG_ALL_HH +# define MLN_TAG_ALL_HH + +/*! \file mln/tag/all.hh + * + * \brief File that includes all tag-related routines. + */ + + +namespace mln +{ + + /// Namespace of image processing routines related to tags. + namespace tag {} + +} + +# include <mln/tag/init.hh> +# include <mln/tag/skeleton.hh> + + +#endif // ! MLN_TAG_ALL_HH Index: trunk/milena/mln/win/all.hh =================================================================== --- trunk/milena/mln/win/all.hh (revision 0) +++ trunk/milena/mln/win/all.hh (revision 1345) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_WIN_ALL_HH +# define MLN_WIN_ALL_HH + +/*! \file mln/win/all.hh + * + * \brief File that includes all win-related routines. + */ + + +namespace mln +{ + + /// Namespace of image processing routines related to win. + namespace win {} + +} + +# include <mln/win/backdiag2d.hh> +# include <mln/win/cube3d.hh> +# include <mln/win/diag2d.hh> +# include <mln/win/disk2d.hh> +# include <mln/win/hline2d.hh> +# include <mln/win/line.hh> +# include <mln/win/octagon2d.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/win/segment1d.hh> +# include <mln/win/vline2d.hh> + + + +#endif // ! MLN_WIN_ALL_HH

1 0

milena r1344: Fix in fi_adaptor
by Matthieu Garrigues 16 Oct '07

16 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-16 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix in fi_adaptor. * mln/core/fi_adaptor.hh: Fix * tests/fi_adaptor.cc: Fix --- mln/core/fi_adaptor.hh | 44 ++++++++++++++++++++++++++++++++++++-------- tests/fi_adaptor.cc | 2 ++ 2 files changed, 38 insertions(+), 8 deletions(-) Index: trunk/milena/tests/fi_adaptor.cc =================================================================== --- trunk/milena/tests/fi_adaptor.cc (revision 1343) +++ trunk/milena/tests/fi_adaptor.cc (revision 1344) @@ -35,6 +35,7 @@ #include <mln/win/rectangle2d.hh> #include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> #include <mln/level/paste.hh> #include <mln/level/median.hh> @@ -50,6 +51,7 @@ int main() { using typename value::int_u8; + using typename value::rgb8; #ifdef FREEIMAGE_LIB //FIXME : is it necessary?? Index: trunk/milena/mln/core/fi_adaptor.hh =================================================================== --- trunk/milena/mln/core/fi_adaptor.hh (revision 1343) +++ trunk/milena/mln/core/fi_adaptor.hh (revision 1344) @@ -29,15 +29,15 @@ # define MLN_CORE_FI_ADAPTOR_HH -/*! \file mln/core/image2d.hh +/*! \file mln/core/fi_adaptor.hh * - * \brief Definition of the fi_adaptor image class. This class aim - * to use the fipImage class (Main FreeImagePlus class) thought one of - * our class. Then we can pass image data as our algorithms and + * \brief Definition of the fi_adaptor image class. This class aims + * to use the fipImage class (Main FreeImagePlus class) through one of + * our class. Then we can pass image data as argument to our algorithms and * FreeImagePlus's ones. * * For compatibility reasons, images from FreeImage library which - * doesn't take more than 7 are converted to 8 bits. + * doesn't take more than 7bits per pixel are converted to fill 8 bits per pixel. * * * COMPILATION: @@ -64,19 +64,31 @@ template <typename I> struct data_< fi_adaptor > { + /// Constructor. data_(); + + /// Destructor. ~data_(); + /// Adaptee image fipImage fi_ima_; - bool fi_ima_loaded; + /// Pointer to pixel buffer. mln_value(I)* buffer_; + + /// Pointer to an array of pointer on images lines. mln_value(I)** array_; - box2d b_; // theoretical box + /// theoretical box + box2d b_; + /// Synchronise buffer_, array_ and b_ with actual adaptee image. void sync_with_adaptee_(); + + /// Desallocate allocated datas of this structure. void deallocate_(); + + /// Swap data between images. void swap_(data_< fi_adaptor >& other_); }; @@ -106,6 +118,13 @@ } // end of namespace mln::trait + /*! \brief fi_adaptor class. + * + * The parameter \c I is the type of image through milena will see + * the Freeimage's class. This class aims to load images using + * Freeimage library. + */ + template <typename I> struct fi_adaptor : public internal::image_primary_< box2d, fi_adaptor > { @@ -224,10 +243,11 @@ data_< fi_adaptor >::sync_with_adaptee_() { mln_precondition(fi_ima_.isValid()); + mln_precondition(fi_ima_.getBitsPerPixel() == 8 * sizeof(mln_value(I))); + deallocate_(); b_ = make::box2d(fi_ima_.getHeight(), fi_ima_.getWidth()); - unsigned nr = fi_ima_.getHeight(), nc = fi_ima_.getWidth(); @@ -306,6 +326,8 @@ fi_adaptor::operator()(const point2d& p) const { mln_precondition(this->owns_(p)); + + // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - p.row()][p.col()]; } @@ -314,6 +336,8 @@ fi_adaptor::operator()(const point2d& p) { mln_precondition(this->owns_(p)); + + // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - p.row()][p.col()]; } @@ -338,6 +362,8 @@ fi_adaptor::at(int row, int col) const { mln_precondition(this->owns_(make::point2d(row, col))); + + // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - row][col]; } @@ -346,6 +372,8 @@ fi_adaptor::at(int row, int col) { mln_precondition(this->owns_(make::point2d(row, col))); + + // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - row][col]; }

1 0

milena r1343: Add fi_adaptor class to interact with Free Image
by Matthieu Garrigues 16 Oct '07

16 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-16 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add fi_adaptor class to interact with Free Image. * mln/core/fi_adaptor.hh: The fi_adaptor class. * tests/fi_adaptor.cc: An example of use. * mln/display/color_pretty.hh: Fix to color more values. * mln/display/save.hh: Nothing * mln/value/rgb.hh: Disable dangerous constructor. --- mln/core/fi_adaptor.hh | 456 ++++++++++++++++++++++++++++++++++++++++++++ mln/display/color_pretty.hh | 24 ++ mln/display/save.hh | 1 mln/value/rgb.hh | 16 - tests/fi_adaptor.cc | 79 +++++++ 5 files changed, 567 insertions(+), 9 deletions(-) Index: trunk/milena/tests/fi_adaptor.cc =================================================================== --- trunk/milena/tests/fi_adaptor.cc (revision 0) +++ trunk/milena/tests/fi_adaptor.cc (revision 1343) @@ -0,0 +1,79 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/*! \file tests/fi_adaptor.cc + * + * \brief Test on mln::fi_adaptor. + */ + +#include <mln/core/fi_adaptor.hh> +#include <mln/core/image2d.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/level/paste.hh> +#include <mln/level/median.hh> + +#include <mln/display/show.hh> +#include <mln/display/save.hh> + +#include <FreeImagePlus.h> + + +using namespace mln; + +int main() +{ + using typename value::int_u8; + +#ifdef FREEIMAGE_LIB + //FIXME : is it necessary?? + FreeImage_Initialise(); +#endif // FREEIMAGE_LIB + + win::rectangle2d rect(51, 51); + + fi_adaptor< image2d<int_u8> > adaptor; + + adaptor.load("../img/lena.pgm"); + + image2d<int_u8> ima(adaptor.domain()); + + level::median(adaptor, rect, ima); + + level::paste(ima, adaptor); + + display::save (adaptor); + display::show (adaptor, "xv"); + + // call this ONLY when linking with FreeImage as a static library +#ifdef FREEIMAGE_LIB + FreeImage_DeInitialise(); +#endif // FREEIMAGE_LIB + +} Index: trunk/milena/mln/core/fi_adaptor.hh =================================================================== --- trunk/milena/mln/core/fi_adaptor.hh (revision 0) +++ trunk/milena/mln/core/fi_adaptor.hh (revision 1343) @@ -0,0 +1,456 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_CORE_FI_ADAPTOR_HH +# define MLN_CORE_FI_ADAPTOR_HH + + +/*! \file mln/core/image2d.hh + * + * \brief Definition of the fi_adaptor image class. This class aim + * to use the fipImage class (Main FreeImagePlus class) thought one of + * our class. Then we can pass image data as our algorithms and + * FreeImagePlus's ones. + * + * For compatibility reasons, images from FreeImage library which + * doesn't take more than 7 are converted to 8 bits. + * + * + * COMPILATION: + * If you need this class you will need to install FreeImagePlus then + * compile you software with the flag -lfreeimageplus. + * + */ + + +# include <mln/core/internal/image_primary.hh> +# include <mln/core/box2d.hh> +# include <mln/core/line_piter.hh> +# include <mln/value/set.hh> + +# include <FreeImagePlus.h> + +namespace mln +{ + // Fwd decl. + template <typename I> struct fi_adaptor; + + namespace internal + { + template <typename I> + struct data_< fi_adaptor > + { + data_(); + ~data_(); + + fipImage fi_ima_; + bool fi_ima_loaded; + + mln_value(I)* buffer_; + mln_value(I)** array_; + + box2d b_; // theoretical box + + void sync_with_adaptee_(); + void deallocate_(); + void swap_(data_< fi_adaptor >& other_); + }; + + } // end of namespace mln::internal + + + + namespace trait + { + + template <typename I> + struct image_< fi_adaptor > : default_image_< mln_value(I), fi_adaptor > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::random access; + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::raw data; + typedef trait::image::io::read_write io; + typedef trait::image::speed::fast speed; + }; + + } // end of namespace mln::trait + + + template <typename I> + struct fi_adaptor : public internal::image_primary_< box2d, fi_adaptor > + { + // Warning: just to make effective types appear in Doxygen: + typedef box2d pset; + typedef point2d psite; + typedef point2d point; + typedef dpoint2d dpoint; + typedef mln_fwd_piter(box2d) fwd_piter; + typedef mln_bkd_piter(box2d) bkd_piter; + typedef line_piter_<point> line_piter; + // End of warning. + + /// Typedef T. + typedef mln_value(I) T; + + /// Value associated type. + typedef T value; + + /// Return type of read-only access. + typedef const T& rvalue; + + /// Return type of read-write access. + typedef T& lvalue; + + /// Skeleton. + typedef fi_adaptor< tag::value_<T> > skeleton; + + /// Value_Set associated type. + typedef mln::value::set<T> vset; + + + /// Constructor without argument. + fi_adaptor(); + + /// Constructor with a fipImage + fi_adaptor(fipImage& ima); + + /// Initialize an empty image. + void init_(); + + /// Give the set of values of the image. + const vset& values() const; + + /// Give the definition domain. + const box2d& domain() const; + + /// Give the number of cells. + std::size_t ncells() const; + + /// Read-only access to the image value located at point \p p. + const T& operator()(const point2d& p) const; + + /// Read-write access to the image value located at point \p p. + T& operator()(const point2d& p); + + /// Read-only access to the image value located at offset \p o. + const T& operator[](unsigned o) const; + + /// Read-write access to the image value located at offset \p o. + T& operator[](unsigned o); + + /// Read-only access to the image value located at (\p row, \p col). + const T& at(int row, int col) const; + + /// Read-write access to the image value located at (\p row, \p col). + T& at(int row, int col); + + + /// Fast Image method + + /// Give the offset corresponding to the delta-point \p dp. + int offset(const dpoint2d& dp) const; + + /// Give the point corresponding to the offset \p o. + point2d point_at_offset(unsigned o) const; + + /// Give a hook to the value buffer. + const T* buffer() const; + + /// Give a hook to the value buffer. + T* buffer(); + + /// \{ Access to adaptee. + fipImage& adaptee(); + const fipImage& adaptee() const; + /// \} + + /// \{ Delegatee functions to construct the image. Should be use it + /// before calling adaptee() method. + BOOL load(const char* lpszPathName, int flag = 0); + BOOL loadU(const wchar_t* lpszPathName, int flag = 0); + BOOL loadFromHandle(FreeImageIO *io, fi_handle handle, int flag = 0); + BOOL loadFromMemory(fipMemoryIO& memIO, int flag = 0); + /// \} + }; + + + // internal::data_< fi_adaptor > + + namespace internal + { + template <typename I> + data_< fi_adaptor >::data_() + { + } + + template <typename I> + data_< fi_adaptor >::~data_() + { + deallocate_(); + } + + template <typename I> + void + data_< fi_adaptor >::sync_with_adaptee_() + { + mln_precondition(fi_ima_.isValid()); + deallocate_(); + b_ = make::box2d(fi_ima_.getHeight(), + fi_ima_.getWidth()); + + unsigned + nr = fi_ima_.getHeight(), + nc = fi_ima_.getWidth(); + buffer_ = (mln_value(I)*) fi_ima_.accessPixels(); + array_ = new mln_value(I)*[nr]; + mln_value(I)* buf = buffer_; + for (unsigned i = 0; i < nr; ++i) + { + array_[i] = buf; + buf += nc; + } + } + + template <typename I> + void + data_< fi_adaptor >::deallocate_() + { + if (array_) + { + delete[] array_; + array_ = 0; + } + } + + template <typename I> + void + data_< fi_adaptor >::swap_(data_< fi_adaptor >& other_) + { + data_< fi_adaptor > self_ = *this; + *this = other_; + other_ = self_; + } + + } // end of namespace mln::internal + + + // fi_adaptor + + template <typename I> + fi_adaptor::fi_adaptor() + { + } + + template <typename I> + void + fi_adaptor::init_() + { + this->data_ = new internal::data_< fi_adaptor >(); + } + + template <typename I> + const typename fi_adaptor::vset& + fi_adaptor::values() const + { + return vset::the(); + } + + template <typename I> + const box2d& + fi_adaptor::domain() const + { + mln_precondition(this->has_data()); + return this->data_->b_; + } + + template <typename I> + std::size_t + fi_adaptor::ncells() const + { + mln_precondition(this->has_data()); + return this->data_->b_.npoints(); + } + + template <typename I> + const mln_value(I)& + fi_adaptor::operator()(const point2d& p) const + { + mln_precondition(this->owns_(p)); + return this->data_->array_[this->domain().len(0) - 1 - p.row()][p.col()]; + } + + template <typename I> + mln_value(I)& + fi_adaptor::operator()(const point2d& p) + { + mln_precondition(this->owns_(p)); + return this->data_->array_[this->domain().len(0) - 1 - p.row()][p.col()]; + } + + template <typename I> + const mln_value(I)& + fi_adaptor::operator[](unsigned o) const + { + mln_precondition(o < ncells()); + return *(this->data_->buffer_ + o); + } + + template <typename I> + mln_value(I)& + fi_adaptor::operator[](unsigned o) + { + mln_precondition(o < ncells()); + return *(this->data_->buffer_ + o); + } + + template <typename I> + const mln_value(I)& + fi_adaptor::at(int row, int col) const + { + mln_precondition(this->owns_(make::point2d(row, col))); + return this->data_->array_[this->domain().len(0) - 1 - row][col]; + } + + template <typename I> + mln_value(I)& + fi_adaptor::at(int row, int col) + { + mln_precondition(this->owns_(make::point2d(row, col))); + return this->data_->array_[this->domain().len(0) - 1 - row][col]; + } + + template <typename I> + const mln_value(I)* + fi_adaptor::buffer() const + { + mln_precondition(this->has_data()); + return this->data_->buffer_; + } + + template <typename I> + mln_value(I)* + fi_adaptor::buffer() + { + mln_precondition(this->has_data()); + return this->data_->buffer_; + } + + template <typename I> + int + fi_adaptor::offset(const dpoint2d& dp) const + { + mln_precondition(this->has_data()); + int o = dp[0] * this->data_->b_.len(1) + dp[1]; + return o; + } + + template <typename I> + point2d + fi_adaptor::point_at_offset(unsigned o) const + { + mln_precondition(o < ncells()); + point2d p = make::point2d(this->data_->b_.max_row() - o / this->data_->b_.len(1) - this->data_->b_.min_row(), + o % this->data_->b_.len(1) + this->data_->b_.min_col()); + mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); + + return p; + } + + template <typename I> + fipImage& + fi_adaptor::adaptee() + { + mln_precondition(this->has_data()); + return this->data_->fi_ima_; + } + + template <typename I> + const fipImage& + fi_adaptor::adaptee() const + { + mln_precondition(this->has_data()); + return this->data_->fi_ima_; + } + + template <typename I> + BOOL + fi_adaptor::load(const char* lpszPathName, int flag) + { + init_(); + BOOL r = this->data_->fi_ima_.load(lpszPathName, flag); + if (this->data_->fi_ima_.getBitsPerPixel() < 8) + this->data_->fi_ima_.convertTo8Bits(); + this->data_->sync_with_adaptee_(); + return r; + } + + template <typename I> + BOOL + fi_adaptor::loadU(const wchar_t* lpszPathName, int flag) + { + init_(); + BOOL r = this->data_->fi_ima_.loadU(lpszPathName, flag); + if (this->data_->fi_ima_.getBitsPerPixel() < 8) + this->data_->fi_ima_.convertTo8Bits(); + this->data_->sync_with_adaptee_(); + return r; + } + + template <typename I> + BOOL + fi_adaptor::loadFromHandle(FreeImageIO *io, fi_handle handle, int flag) + { + init_(); + BOOL r = this->data_->fi_ima_.loadFromHandle(io, handle, flag); + if (this->data_->fi_ima_.getBitsPerPixel() < 8) + this->data_->fi_ima_.convertTo8Bits(); + this->data_->sync_with_adaptee_(); + return r; + } + + template <typename I> + BOOL + fi_adaptor::loadFromMemory(fipMemoryIO& memIO, int flag) + { + init_(); + BOOL r = this->data_->fi_ima_.loadFromMemory(memIO, flag); + if (this->data_->fi_ima_.getBitsPerPixel() < 8) + this->data_->fi_ima_.convertTo8Bits(); + this->data_->sync_with_adaptee_(); + return r; + } + +} // end of namespace mln + + +#endif // ! MLN_CORE_FI_ADAPTOR_HH Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1342) +++ trunk/milena/mln/value/rgb.hh (revision 1343) @@ -91,7 +91,7 @@ rgb<n>(); rgb<n>(equiv a); rgb<n>(enc r, enc g, enc b); - rgb<n>(enc l); + //rgb<n>(enc l); rgb<n>(const literal::white_t&); rgb<n>(const literal::black_t&); rgb<n>(const literal::blue_t&); @@ -190,13 +190,13 @@ this->c_[2] = b; } - template <unsigned n> - rgb<n>::rgb(enc l) - { - this->c_[0] = l; - this->c_[1] = l; - this->c_[2] = l; - } +// template <unsigned n> +// rgb<n>::rgb(enc l) +// { +// this->c_[0] = l; +// this->c_[1] = l; +// this->c_[2] = l; +// } template <unsigned n> rgb<n>::rgb(const literal::white_t&) Index: trunk/milena/mln/display/color_pretty.hh =================================================================== --- trunk/milena/mln/display/color_pretty.hh (revision 1342) +++ trunk/milena/mln/display/color_pretty.hh (revision 1343) @@ -56,6 +56,28 @@ namespace impl { + template <typename V> + value::rgb8 + color_value(V v) + { + //r = v * (mln_max(V) / mln_max(value::int_u8) ); + return value::rgb8(v, v, v); + } + + template <unsigned int n> + value::rgb8 + color_value(value::rgb<n> v) + { + return v; + } + + value::rgb8 + color_value(bool b) + { + value::int_u8 r = b ? 255 : 0; + return value::rgb8(r, r, r); + } + template <typename I> typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret @@ -72,7 +94,7 @@ mln_piter(I) p(input.domain()); for_all(p) - output(p) = value::rgb8(input(p)); + output(p) = value::rgb8(color_value(input(p))); } return output; } Index: trunk/milena/mln/display/save.hh =================================================================== --- trunk/milena/mln/display/save.hh (revision 1342) +++ trunk/milena/mln/display/save.hh (revision 1343) @@ -74,6 +74,7 @@ std::string path_tmp = tmp; io::ppm::save(out, path_tmp); + std::cout << input.id_ () << " = " << path_tmp << std::endl; map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; }

1 0

milena r1342: Update typo for tests
by Guillaume Duhamel 16 Oct '07

16 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-16 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update typo for tests. * tests/border_duplicate/test_border_duplicate_image1d_1.cc, * tests/border_duplicate/test_border_duplicate_image1d_2.cc, * tests/border_duplicate/test_border_duplicate_image1d_3.cc, * tests/border_duplicate/test_border_duplicate_image1d_4.cc, * tests/border_duplicate/test_border_duplicate_image1d_5.cc, * tests/border_duplicate/test_border_duplicate_image2d_1.cc, * tests/border_duplicate/test_border_duplicate_image2d_2.cc, * tests/border_duplicate/test_border_duplicate_image2d_3.cc, * tests/border_duplicate/test_border_duplicate_image2d_4.cc, * tests/border_duplicate/test_border_duplicate_image3d_1.cc, * tests/border_duplicate/test_border_duplicate_image3d_2.cc, * tests/border_duplicate/test_border_duplicate_image3d_3.cc, * tests/border_duplicate/test_border_duplicate_image3d_4.cc, * tests/border_fill/test_border_fill_image1d_1.cc, * tests/border_fill/test_border_fill_image1d_2.cc, * tests/border_fill/test_border_fill_image1d_3.cc, * tests/border_fill/test_border_fill_image1d_4.cc, * tests/border_fill/test_border_fill_image1d_5.cc, * tests/border_fill/test_border_fill_image2d_1.cc, * tests/border_fill/test_border_fill_image2d_2.cc, * tests/border_fill/test_border_fill_image2d_3.cc, * tests/border_fill/test_border_fill_image2d_4.cc, * tests/border_fill/test_border_fill_image3d_1.cc, * tests/border_fill/test_border_fill_image3d_2.cc, * tests/border_fill/test_border_fill_image3d_3.cc, * tests/border_fill/test_border_fill_image3d_4.cc, * tests/border_resize_image2d_1.cc, * tests/border_resize_image2d_2.cc, * tests/border_resize_image2d_3.cc, * tests/border_resize_image3d_3.cc, * tests/chamfer.cc, * tests/color_pretty.cc, * tests/fun_x2x_composed.cc, * tests/fun_x2x_rotation.cc, * tests/fun_x2x_translation.cc, * tests/histo_compute.cc, * tests/histo_to_image1d.cc, * tests/image_if_interval.cc, * tests/interpolated.cc, * tests/io_pbm.cc, * tests/io_pgm.cc, * tests/io_pgm16.cc, * tests/io_pgm19.cc, * tests/io_pgm27.cc, * tests/io_ppm.cc, * tests/io_ppm16.cc, * tests/io_ppm23.cc, * tests/labeling_algo.cc, * tests/labeling_estimate.cc, * tests/labeling_level_fast.cc, * tests/level_median_dir.cc, * tests/level_paste.cc, * tests/level_sort_points.cc, * tests/linear_log.cc, * tests/main.cc, * tests/mat.cc, * tests/metal_pow.cc, * tests/morpho_dilation_max_h.cc, * tests/morpho_erosion_min_h.cc, * tests/new_io_pgm.cc, * tests/pw_value.cc, * tests/queue_p_fast.cc, * tests/queue_p_fast_priority.cc, * tests/rle_image.cc, * tests/seed2tiling.cc, * tests/show.cc, * tests/sparse_image.cc, * tests/tr_image.cc, * tests/value_float01.cc, * tests/value_float01_bis.cc, * tests/value_float01_f.cc, * tests/value_quat.cc, * tests/vec.cc, * tests/win_disk2d.cc, * tests/win_hline2d.cc: Update typo. --- border_duplicate/test_border_duplicate_image1d_1.cc | 2 - border_duplicate/test_border_duplicate_image1d_2.cc | 4 +- border_duplicate/test_border_duplicate_image1d_3.cc | 4 +- border_duplicate/test_border_duplicate_image1d_4.cc | 4 +- border_duplicate/test_border_duplicate_image1d_5.cc | 4 +- border_duplicate/test_border_duplicate_image2d_1.cc | 2 - border_duplicate/test_border_duplicate_image2d_2.cc | 4 +- border_duplicate/test_border_duplicate_image2d_3.cc | 4 +- border_duplicate/test_border_duplicate_image2d_4.cc | 4 +- border_duplicate/test_border_duplicate_image3d_1.cc | 4 +- border_duplicate/test_border_duplicate_image3d_2.cc | 4 +- border_duplicate/test_border_duplicate_image3d_3.cc | 4 +- border_duplicate/test_border_duplicate_image3d_4.cc | 4 +- border_fill/test_border_fill_image1d_1.cc | 2 - border_fill/test_border_fill_image1d_2.cc | 2 - border_fill/test_border_fill_image1d_3.cc | 2 - border_fill/test_border_fill_image1d_4.cc | 2 - border_fill/test_border_fill_image1d_5.cc | 2 - border_fill/test_border_fill_image2d_1.cc | 2 - border_fill/test_border_fill_image2d_2.cc | 2 - border_fill/test_border_fill_image2d_3.cc | 2 - border_fill/test_border_fill_image2d_4.cc | 2 - border_fill/test_border_fill_image3d_1.cc | 2 - border_fill/test_border_fill_image3d_2.cc | 2 - border_fill/test_border_fill_image3d_3.cc | 2 - border_fill/test_border_fill_image3d_4.cc | 2 - border_resize_image2d_1.cc | 2 - border_resize_image2d_2.cc | 2 - border_resize_image2d_3.cc | 2 - border_resize_image3d_3.cc | 2 - chamfer.cc | 2 - color_pretty.cc | 4 +- fun_x2x_composed.cc | 2 - fun_x2x_rotation.cc | 2 - fun_x2x_translation.cc | 2 - histo_compute.cc | 2 - histo_to_image1d.cc | 2 - image_if_interval.cc | 4 +- interpolated.cc | 6 +-- io_pbm.cc | 4 +- io_pgm.cc | 5 +-- io_pgm16.cc | 4 +- io_pgm19.cc | 4 +- io_pgm27.cc | 5 +-- io_ppm.cc | 4 +- io_ppm16.cc | 4 +- io_ppm23.cc | 4 +- labeling_algo.cc | 4 +- labeling_estimate.cc | 4 +- labeling_level_fast.cc | 2 - level_median_dir.cc | 2 - level_paste.cc | 4 +- level_sort_points.cc | 2 - linear_log.cc | 2 - main.cc | 8 +++++ mat.cc | 4 +- metal_pow.cc | 2 - morpho_dilation_max_h.cc | 4 +- morpho_erosion_min_h.cc | 4 +- new_io_pgm.cc | 4 +- pw_value.cc | 2 - queue_p_fast.cc | 4 +- queue_p_fast_priority.cc | 4 +- rle_image.cc | 32 ++++++++++++++++++++ seed2tiling.cc | 2 - show.cc | 4 +- sparse_image.cc | 31 +++++++++++++++++++ tr_image.cc | 4 +- value_float01.cc | 5 +++ value_float01_bis.cc | 5 +++ value_float01_f.cc | 5 +++ value_quat.cc | 4 +- vec.cc | 4 +- win_disk2d.cc | 4 +- win_hline2d.cc | 4 +- 75 files changed, 195 insertions(+), 107 deletions(-) Index: trunk/milena/tests/win_hline2d.cc =================================================================== --- trunk/milena/tests/win_hline2d.cc (revision 1341) +++ trunk/milena/tests/win_hline2d.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/win_diag2d.cc +/*! \file tests/win_hline2d.cc * - * \brief Tests on mln::win::diag2d. + * \brief Tests on mln::win::hline2d. */ #include <mln/win/hline2d.hh> Index: trunk/milena/tests/morpho_dilation_max_h.cc =================================================================== --- trunk/milena/tests/morpho_dilation_max_h.cc (revision 1341) +++ trunk/milena/tests/morpho_dilation_max_h.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/morpho_erosion.cc +/*! \file tests/morpho_dilation_max_h.cc * - * \brief Test on mln::morpho::erosion. + * \brief Test on mln::morpho::dilatation_fast. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/image_if_interval.cc =================================================================== --- trunk/milena/tests/image_if_interval.cc (revision 1341) +++ trunk/milena/tests/image_if_interval.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/image_if_value.cc +/*! \file tests/image_if_interval.cc * - * \brief Tests on mln::image_if_value. + * \brief Tests on mln::image_if_interval. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/value_quat.cc =================================================================== --- trunk/milena/tests/value_quat.cc (revision 1341) +++ trunk/milena/tests/value_quat.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_int_u8.cc +/*! \file tests/value_quat.cc * - * \brief Tests on mln::value::int_u8. + * \brief Tests on mln::value::quat. */ #include <iostream> Index: trunk/milena/tests/border_resize_image2d_2.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_2.cc (revision 1341) +++ trunk/milena/tests/border_resize_image2d_2.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_resize_image?d_?.cc +/*! \file tests/border_resize_image2d_2.cc * * \brief Tests on mln::border::resize. */ Index: trunk/milena/tests/level_sort_points.cc =================================================================== --- trunk/milena/tests/level_sort_points.cc (revision 1341) +++ trunk/milena/tests/level_sort_points.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/sort_points.cc +/*! \file tests/level_sort_points.cc * * \brief Tests on mln::level::sort_points. */ Index: trunk/milena/tests/io_pgm.cc =================================================================== --- trunk/milena/tests/io_pgm.cc (revision 1341) +++ trunk/milena/tests/io_pgm.cc (revision 1342) @@ -25,11 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/ppm_load.cc +/*! \file tests/io_pgm.cc * - * \brief Test on mln::io::ppm::load. + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ + #include <mln/core/image2d.hh> #include <mln/value/int_u8.hh> Index: trunk/milena/tests/linear_log.cc =================================================================== --- trunk/milena/tests/linear_log.cc (revision 1341) +++ trunk/milena/tests/linear_log.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/linear_log.cc * - * \brief Tests on mln::linear::log. + * \brief Tests on mln::linear. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/labeling_algo.cc =================================================================== --- trunk/milena/tests/labeling_algo.cc (revision 1341) +++ trunk/milena/tests/labeling_algo.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file tests/labeling_algo.cc * - * \brief Test on mln::labeling::foreground. + * \brief Test on mln::geom::seeds2tiling. */ # include <mln/core/image2d.hh> Index: trunk/milena/tests/histo_compute.cc =================================================================== --- trunk/milena/tests/histo_compute.cc (revision 1341) +++ trunk/milena/tests/histo_compute.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/histo_compute.cc * - * \brief Tests on mln::accu::histo<S> and mln::histo::data<S>. + * \brief Tests on mln::accu::histo and mln::histo::data. */ #include <iterator> Index: trunk/milena/tests/io_pgm19.cc =================================================================== --- trunk/milena/tests/io_pgm19.cc (revision 1341) +++ trunk/milena/tests/io_pgm19.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_pgm19.cc * - * \brief Test on mln::io::pbm::load. + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/metal_pow.cc =================================================================== --- trunk/milena/tests/metal_pow.cc (revision 1341) +++ trunk/milena/tests/metal_pow.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/metal_pow.cc * - * \brief Test on mln::metal::math::pow. + * \brief Test on mln::metal::math. */ #include <iostream> Index: trunk/milena/tests/io_ppm23.cc =================================================================== --- trunk/milena/tests/io_ppm23.cc (revision 1341) +++ trunk/milena/tests/io_ppm23.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_ppm23.cc * - * \brief Test on mln::io::pbm::load for 23bits ppm + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/value_float01_bis.cc =================================================================== --- trunk/milena/tests/value_float01_bis.cc (revision 1341) +++ trunk/milena/tests/value_float01_bis.cc (revision 1342) @@ -25,6 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/*! \file tests/value_float01_bis.cc + * + * \brief Tests on mln::value::float01. + */ + #include <iostream> #include <mln/value/float01_8.hh> #include <mln/value/float01_16.hh> Index: trunk/milena/tests/fun_x2x_translation.cc =================================================================== --- trunk/milena/tests/fun_x2x_translation.cc (revision 1341) +++ trunk/milena/tests/fun_x2x_translation.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/image2d.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::fun::x2x::translation. */ Index: trunk/milena/tests/value_float01_f.cc =================================================================== --- trunk/milena/tests/value_float01_f.cc (revision 1341) +++ trunk/milena/tests/value_float01_f.cc (revision 1342) @@ -25,6 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/*! \file tests/value_float01_f.cc + * + * \brief Tests on mln::value::float01_f. + */ + #include <iostream> #include <mln/value/float01_f.hh> Index: trunk/milena/tests/fun_x2x_rotation.cc =================================================================== --- trunk/milena/tests/fun_x2x_rotation.cc (revision 1341) +++ trunk/milena/tests/fun_x2x_rotation.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/image2d.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::fun::x2x::rotation. */ Index: trunk/milena/tests/border_resize_image3d_3.cc =================================================================== --- trunk/milena/tests/border_resize_image3d_3.cc (revision 1341) +++ trunk/milena/tests/border_resize_image3d_3.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_resize_image?d_?.cc +/*! \file tests/border_resize_image3d_3.cc * * \brief Tests on mln::border::resize. */ Index: trunk/milena/tests/morpho_erosion_min_h.cc =================================================================== --- trunk/milena/tests/morpho_erosion_min_h.cc (revision 1341) +++ trunk/milena/tests/morpho_erosion_min_h.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/morpho_erosion.cc +/*! \file tests/morpho_erosion_min_h.cc * - * \brief Test on mln::morpho::erosion. + * \brief Test on mln::morpho::erosion_fast */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/histo_to_image1d.cc =================================================================== --- trunk/milena/tests/histo_to_image1d.cc (revision 1341) +++ trunk/milena/tests/histo_to_image1d.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/histo.cc * - * \brief Tests on mln::accu::histo<S> and mln::histo::data<S>. + * \brief Tests on mln::accu::histo and mln::histo::data. */ #include <iterator> Index: trunk/milena/tests/labeling_level_fast.cc =================================================================== --- trunk/milena/tests/labeling_level_fast.cc (revision 1341) +++ trunk/milena/tests/labeling_level_fast.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/labeling_foreground.cc * - * \brief Test on mln::labeling::foreground. + * \brief Test on mln::labeling::level. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/mat.cc =================================================================== --- trunk/milena/tests/mat.cc (revision 1341) +++ trunk/milena/tests/mat.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/image2d.cc +/*! \file tests/mat.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::metal::mat. */ Index: trunk/milena/tests/fun_x2x_composed.cc =================================================================== --- trunk/milena/tests/fun_x2x_composed.cc (revision 1341) +++ trunk/milena/tests/fun_x2x_composed.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/image2d.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::fun::x2x::composed. */ Index: trunk/milena/tests/new_io_pgm.cc =================================================================== --- trunk/milena/tests/new_io_pgm.cc (revision 1341) +++ trunk/milena/tests/new_io_pgm.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/ppm_load.cc +/*! \file tests/mew_io_pgm.cc * - * \brief Test on mln::io::ppm::load. + * \brief Tests on Test on mln::io::ppm::load and mln::io::ppm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/sparse_image.cc =================================================================== --- trunk/milena/tests/sparse_image.cc (revision 1341) +++ trunk/milena/tests/sparse_image.cc (revision 1342) @@ -1,3 +1,34 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/*! \file tests/sparse_image.cc + * + * \brief Tests on mln::sparse_image. + */ #include <mln/core/image2d.hh> #include <mln/core/sparse_image.hh> #include <mln/core/sparse_encode.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_1.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_1.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/test_border_duplicate_image1d_1.cc +/*! \file tests/border_duplicate/test_border_duplicate_image1d_1.cc * * \brief Tests on mln::border::duplicate. */ Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_2.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_2.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_2.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image1d_2.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_1.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_1.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/test_border_duplicate_image2d_1.cc +/*! \file tests/border_duplicate/test_border_duplicate_image2d_1.cc * * \brief Tests on mln::border::duplicate. */ Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_2.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_2.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_2.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image2d_2.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_1.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_1.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_1.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image3d_1.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_3.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_3.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_3.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image1d_3.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_4.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_4.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_4.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image1d_4.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_2.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_2.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_2.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image3d_2.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_3.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_3.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_3.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image2d_3.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_4.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_4.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image2d_4.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image2d_4.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_3.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_3.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_3.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image3d_3.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_5.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_5.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image1d_5.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image1d_5.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ #include <mln/border/duplicate.hh> Index: trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_4.cc =================================================================== --- trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_4.cc (revision 1341) +++ trunk/milena/tests/border_duplicate/test_border_duplicate_image3d_4.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_duplicate/test_border_duplicate_image3d_4.cc * - * \brief Tests on mln::border::fill. + * \brief Tests on mln::border::duplicate. */ Index: trunk/milena/tests/border_resize_image2d_3.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_3.cc (revision 1341) +++ trunk/milena/tests/border_resize_image2d_3.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_resize_image?d_?.cc +/*! \file tests/border_resize_image2d_3.cc * * \brief Tests on mln::border::resize. */ Index: trunk/milena/tests/vec.cc =================================================================== --- trunk/milena/tests/vec.cc (revision 1341) +++ trunk/milena/tests/vec.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/image2d.cc +/*! \file tests/vec.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::metal::vec. */ Index: trunk/milena/tests/queue_p_fast.cc =================================================================== --- trunk/milena/tests/queue_p_fast.cc (revision 1341) +++ trunk/milena/tests/queue_p_fast.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/queue_p.cc +/*! \file tests/queue_p_fast.cc * - * \brief Tests on mln::queue_p. + * \brief Tests on mln::queue_p_fast. */ #include <mln/core/point2d.hh> Index: trunk/milena/tests/level_median_dir.cc =================================================================== --- trunk/milena/tests/level_median_dir.cc (revision 1341) +++ trunk/milena/tests/level_median_dir.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level_median.cc +/*! \file tests/level_median_dir.cc * * \brief Test on mln::level::median. */ Index: trunk/milena/tests/rle_image.cc =================================================================== --- trunk/milena/tests/rle_image.cc (revision 1341) +++ trunk/milena/tests/rle_image.cc (revision 1342) @@ -1,3 +1,35 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/*! \file tests/rle_image.cc + * + * \brief Tests on mln::rle_image. + */ +1 #include <mln/core/image2d.hh> #include <mln/core/rle_image.hh> #include <mln/core/rle_encode.hh> Index: trunk/milena/tests/interpolated.cc =================================================================== --- trunk/milena/tests/interpolated.cc (revision 1341) +++ trunk/milena/tests/interpolated.cc (revision 1342) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/image2d.cc +/*! \file tests/interpolated.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::interpolated. */ #include <iostream> #include <mln/core/image2d.hh> -#include <mln/core/interpolated.hh>\ +#include <mln/core/interpolated.hh> #include <mln/metal/vec.hh> Index: trunk/milena/tests/win_disk2d.cc =================================================================== --- trunk/milena/tests/win_disk2d.cc (revision 1341) +++ trunk/milena/tests/win_disk2d.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/win_diag2d.cc +/*! \file tests/win_disk2d.cc * - * \brief Tests on mln::win::diag2d. + * \brief Tests on mln::win::disk2d. */ #include <mln/win/disk2d.hh> Index: trunk/milena/tests/io_pbm.cc =================================================================== --- trunk/milena/tests/io_pbm.cc (revision 1341) +++ trunk/milena/tests/io_pbm.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_pbm.cc * - * \brief Test on mln::io::pbm::load. + * \brief Test on mln::io::pbm::load and mln::io::pbm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/io_ppm.cc =================================================================== --- trunk/milena/tests/io_ppm.cc (revision 1341) +++ trunk/milena/tests/io_ppm.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/ppm_load.cc +/*! \file tests/io_ppm.cc * - * \brief Test on mln::io::ppm::load. + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/main.cc =================================================================== --- trunk/milena/tests/main.cc (revision 1341) +++ trunk/milena/tests/main.cc (revision 1342) @@ -25,6 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/*! + * \file test/main.cc + * + * \brief Test on mln::morpho. + * + * + */ + #include <cmath> #include <mln/core/image2d.hh> Index: trunk/milena/tests/chamfer.cc =================================================================== --- trunk/milena/tests/chamfer.cc (revision 1341) +++ trunk/milena/tests/chamfer.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/chamfer.cc * - * \brief Tests on all files in mln/geom/chamfer.hh . + * \brief Tests on mln::geom::chamfer.hh. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/border_resize_image2d_1.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_1.cc (revision 1341) +++ trunk/milena/tests/border_resize_image2d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_resize_image?d_?.cc +/*! \file tests/border_resize_image2d_1.cc * * \brief Tests on mln::border::resize. */ Index: trunk/milena/tests/labeling_estimate.cc =================================================================== --- trunk/milena/tests/labeling_estimate.cc (revision 1341) +++ trunk/milena/tests/labeling_estimate.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file tests/labeling_estimate.cc * - * \brief Test on mln::labeling::foreground. + * \brief Test on mln::labeling::estimate. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/io_ppm16.cc =================================================================== --- trunk/milena/tests/io_ppm16.cc (revision 1341) +++ trunk/milena/tests/io_ppm16.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_ppm16.cc * - * \brief Test on mln::io::pbm::load for 16bits ppm + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/seed2tiling.cc =================================================================== --- trunk/milena/tests/seed2tiling.cc (revision 1341) +++ trunk/milena/tests/seed2tiling.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/seeds2tiling.cc * - * \brief Test on mln::geom::seed2tiling*.hh. + * \brief Tests on mln::geom::seed2tiling. */ Index: trunk/milena/tests/io_pgm27.cc =================================================================== --- trunk/milena/tests/io_pgm27.cc (revision 1341) +++ trunk/milena/tests/io_pgm27.cc (revision 1342) @@ -25,11 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_pgm27.cc * - * \brief Test on mln::io::pbm::load. + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ + #include <mln/core/image2d.hh> #include <mln/value/int_u8.hh> Index: trunk/milena/tests/border_fill/test_border_fill_image3d_1.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image3d_1.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image3d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image3d_1.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image1d_3.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image1d_3.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image1d_3.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image1d_3.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image2d_2.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image2d_2.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image2d_2.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image2d_2.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image2d_3.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image2d_3.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image2d_3.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image2d_3.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image1d_4.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image1d_4.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image1d_4.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image1d_4.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image3d_2.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image3d_2.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image3d_2.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image3d_2.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image3d_3.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image3d_3.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image3d_3.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image3d_3.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image1d_5.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image1d_5.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image1d_5.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image1d_5.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image2d_4.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image2d_4.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image2d_4.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image2d_4.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image3d_4.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image3d_4.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image3d_4.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image3d_4.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image1d_1.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image1d_1.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image1d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image1d_1.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image1d_2.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image1d_2.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image1d_2.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image1d_2.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/border_fill/test_border_fill_image2d_1.cc =================================================================== --- trunk/milena/tests/border_fill/test_border_fill_image2d_1.cc (revision 1341) +++ trunk/milena/tests/border_fill/test_border_fill_image2d_1.cc (revision 1342) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill.cc +/*! \file tests/border_fill/test_border_fill_image2d_1.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/value_float01.cc =================================================================== --- trunk/milena/tests/value_float01.cc (revision 1341) +++ trunk/milena/tests/value_float01.cc (revision 1342) @@ -25,6 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/*! \file tests/value_float01.cc + * + * \brief Tests on mln::value::float01. + */ + #include <iostream> #include <mln/core/image2d.hh> Index: trunk/milena/tests/level_paste.cc =================================================================== --- trunk/milena/tests/level_paste.cc (revision 1341) +++ trunk/milena/tests/level_paste.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level_fill.cc +/*! \file tests/level_paste.cc * - * \brief Tests on mln::level::fill + * \brief Tests on mln::level::paste. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/show.cc =================================================================== --- trunk/milena/tests/show.cc (revision 1341) +++ trunk/milena/tests/show.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/sub_image.cc +/*! \file tests/show.cc * - * \brief Tests on mln::sub_image. + * \brief Tests on mln::display::show. */ # include <mln/core/image2d.hh> Index: trunk/milena/tests/io_pgm16.cc =================================================================== --- trunk/milena/tests/io_pgm16.cc (revision 1341) +++ trunk/milena/tests/io_pgm16.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/pbm_load.cc +/*! \file tests/io_pgm16.cc * - * \brief Test on mln::io::pbm::load. + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/queue_p_fast_priority.cc =================================================================== --- trunk/milena/tests/queue_p_fast_priority.cc (revision 1341) +++ trunk/milena/tests/queue_p_fast_priority.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/queue_p_priority.cc +/*! \file tests/queue_p_fast_priority.cc * - * \brief Tests on mln::queue_p_priority. + * \brief Tests on mln::queue_p_fast_priority. */ #include <mln/core/point2d.hh> Index: trunk/milena/tests/pw_value.cc =================================================================== --- trunk/milena/tests/pw_value.cc (revision 1341) +++ trunk/milena/tests/pw_value.cc (revision 1342) @@ -27,7 +27,7 @@ /*! \file tests/pw_value.cc * - * \brief Test on mln::fun::pw_value_. + * \brief Test on mln::pw::value_. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/color_pretty.cc =================================================================== --- trunk/milena/tests/color_pretty.cc (revision 1341) +++ trunk/milena/tests/color_pretty.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/sub_image.cc +/*! \file tests/color_pretty.cc * - * \brief Tests on mln::sub_image. + * \brief Tests on mln::display::color::pretty. */ # include <mln/core/image2d.hh> Index: trunk/milena/tests/tr_image.cc =================================================================== --- trunk/milena/tests/tr_image.cc (revision 1341) +++ trunk/milena/tests/tr_image.cc (revision 1342) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/image2d.cc +/*! \file tests/tr_image.cc * - * \brief Tests on mln::image2d. + * \brief Tests on mln::tr_image. */

1 0

milena r1341: Update typo
by Simon Nivault 16 Oct '07

16 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-16 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update typo. * mln/metal/abort.hh, * mln/metal/const.hh, * mln/metal/equal.hh, * mln/metal/is_const.hh, * mln/metal/is_unqualif.hh, * mln/metal/mat.hh, * mln/metal/same_coord.hh, * mln/metal/same_point.hh, * mln/metal/unconst.hh, * mln/metal/unptr.hh, * mln/metal/unqualif.hh, * mln/metal/unref.hh, * mln/metal/vec.hh, * mln/morpho/Rd.hh, * mln/morpho/complementation.hh, * mln/morpho/min.hh, * mln/morpho/minus.hh, * mln/morpho/plus.hh, * mln/norm/l1.hh, * mln/norm/l2.hh, * mln/pw/image.hh, * mln/tag/init.hh, * mln/tag/skeleton.hh, * mln/value/float01.hh, * mln/value/float01_.hh, * mln/value/float01_f.hh, * mln/value/gray.hh, * mln/value/graylevel.hh, * mln/value/internal/integer.hh, * mln/value/quat.hh, * mln/value/rgb.hh, * mln/value/rgb8_non_templated.hh: Update typo. --- metal/abort.hh | 6 ++++++ metal/const.hh | 6 ++++++ metal/equal.hh | 6 ++++++ metal/is_const.hh | 6 ++++++ metal/is_unqualif.hh | 6 ++++++ metal/mat.hh | 6 ++++++ metal/same_coord.hh | 6 ++++++ metal/same_point.hh | 6 ++++++ metal/unconst.hh | 6 ++++++ metal/unptr.hh | 5 +++++ metal/unqualif.hh | 6 ++++++ metal/unref.hh | 5 +++++ metal/vec.hh | 6 ++++++ morpho/Rd.hh | 6 ++++++ morpho/complementation.hh | 7 +++++++ morpho/min.hh | 7 +++++++ morpho/minus.hh | 7 +++++++ morpho/plus.hh | 7 +++++++ norm/l1.hh | 2 +- norm/l2.hh | 2 +- pw/image.hh | 2 +- tag/init.hh | 8 ++++---- tag/skeleton.hh | 8 ++++---- value/float01.hh | 5 +++++ value/float01_.hh | 11 ++++++++--- value/float01_f.hh | 11 ++++++++--- value/gray.hh | 5 +++++ value/graylevel.hh | 6 +++--- value/internal/integer.hh | 8 ++++---- value/quat.hh | 5 +++++ value/rgb.hh | 2 +- value/rgb8_non_templated.hh | 8 ++++---- 32 files changed, 164 insertions(+), 29 deletions(-) Index: trunk/milena/mln/metal/mat.hh =================================================================== --- trunk/milena/mln/metal/mat.hh (revision 1340) +++ trunk/milena/mln/metal/mat.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_MAT_HH # define MLN_METAL_MAT_HH +/*! + * \file mln/metal/mat.hh + * + * \brief Definition of a generic matrix class. + */ + # include <iostream> # include <mln/core/concept/object.hh> Index: trunk/milena/mln/metal/is_const.hh =================================================================== --- trunk/milena/mln/metal/is_const.hh (revision 1340) +++ trunk/milena/mln/metal/is_const.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_IS_CONST_HH # define MLN_METAL_IS_CONST_HH +/*! + * \file mln/metal/is_const.hh + * + * \brief FIXME. + */ + # include <mln/metal/bool.hh> Index: trunk/milena/mln/metal/unqualif.hh =================================================================== --- trunk/milena/mln/metal/unqualif.hh (revision 1340) +++ trunk/milena/mln/metal/unqualif.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_UNQUALIF_HH # define MLN_METAL_UNQUALIF_HH +/*! + * \file mln/metal/unqualif.hh + * + * \brief FIXME. + */ + # include <mln/metal/unconst.hh> # include <mln/metal/unptr.hh> # include <mln/metal/unref.hh> Index: trunk/milena/mln/metal/const.hh =================================================================== --- trunk/milena/mln/metal/const.hh (revision 1340) +++ trunk/milena/mln/metal/const.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_CONST_HH # define MLN_METAL_CONST_HH +/*! + * \file mln/metal/const.hh + * + * \brief FIXME. + */ + # define mlc_const(T) typename mln::metal::const_< T >::ret Index: trunk/milena/mln/metal/unconst.hh =================================================================== --- trunk/milena/mln/metal/unconst.hh (revision 1340) +++ trunk/milena/mln/metal/unconst.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_UNCONST_HH # define MLN_METAL_UNCONST_HH +/*! + * \file mln/metal/unconst.hh + * + * \brief FIXME. + */ + # define mlc_unconst(T) typename mln::metal::unconst< T >::ret # define mlc_unconst_(T) mln::metal::unconst< T >::ret Index: trunk/milena/mln/metal/same_point.hh =================================================================== --- trunk/milena/mln/metal/same_point.hh (revision 1340) +++ trunk/milena/mln/metal/same_point.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_SAME_POINT_HH # define MLN_METAL_SAME_POINT_HH +/*! + * \file mln/metal/same_point.hh + * + * \brief FIXME. + */ + # include <mln/metal/equal.hh> # include <mln/core/macros.hh> Index: trunk/milena/mln/metal/abort.hh =================================================================== --- trunk/milena/mln/metal/abort.hh (revision 1340) +++ trunk/milena/mln/metal/abort.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_ABORT_HH # define MLN_METAL_ABORT_HH +/*! + * \file mln/metal/abort.hh + * + * \brief FIXME. + */ + # include <mln/metal/bool.hh> Index: trunk/milena/mln/metal/equal.hh =================================================================== --- trunk/milena/mln/metal/equal.hh (revision 1340) +++ trunk/milena/mln/metal/equal.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_EQUAL_HH # define MLN_METAL_EQUAL_HH +/*! + * \file mln/metal/equal.hh + * + * \brief FIXME. + */ + # include <mln/metal/bool.hh> Index: trunk/milena/mln/metal/unptr.hh =================================================================== --- trunk/milena/mln/metal/unptr.hh (revision 1340) +++ trunk/milena/mln/metal/unptr.hh (revision 1341) @@ -28,6 +28,11 @@ #ifndef MLN_METAL_UNPTR_HH # define MLN_METAL_UNPTR_HH +/*! + * \file mln/metal/unptr.hh + * + * \brief FIXME. + */ # define mlc_unptr(T) typename mln::metal::unptr< T >::ret Index: trunk/milena/mln/metal/same_coord.hh =================================================================== --- trunk/milena/mln/metal/same_coord.hh (revision 1340) +++ trunk/milena/mln/metal/same_coord.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_SAME_COORD_HH # define MLN_METAL_SAME_COORD_HH +/*! + * \file mln/metal/same_coord.hh + * + * \brief FIXME. + */ + # include <mln/metal/equal.hh> # include <mln/core/macros.hh> Index: trunk/milena/mln/metal/vec.hh =================================================================== --- trunk/milena/mln/metal/vec.hh (revision 1340) +++ trunk/milena/mln/metal/vec.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_VEC_HH # define MLN_METAL_VEC_HH +/*! + * \file mln/metal/vec.hh + * + * \brief Definition of a generic vector class. + */ + # include <iostream> # include <cmath> Index: trunk/milena/mln/metal/unref.hh =================================================================== --- trunk/milena/mln/metal/unref.hh (revision 1340) +++ trunk/milena/mln/metal/unref.hh (revision 1341) @@ -28,6 +28,11 @@ #ifndef MLN_METAL_UNREF_HH # define MLN_METAL_UNREF_HH +/*! + * \file mln/metal/unref.hh + * + * \brief FIXME. + */ # define mlc_unref(T) typename mln::metal::unref< T >::ret Index: trunk/milena/mln/metal/is_unqualif.hh =================================================================== --- trunk/milena/mln/metal/is_unqualif.hh (revision 1340) +++ trunk/milena/mln/metal/is_unqualif.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_METAL_IS_UNQUALIF_HH # define MLN_METAL_IS_UNQUALIF_HH +/*! + * \file mln/metal/is_unqualif.hh + * + * \brief FIXME. + */ + # include <mln/metal/equal.hh> # include <mln/metal/unqualif.hh> Index: trunk/milena/mln/tag/init.hh =================================================================== --- trunk/milena/mln/tag/init.hh (revision 1340) +++ trunk/milena/mln/tag/init.hh (revision 1341) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TAG_INIT_HH -# define MLN_CORE_TAG_INIT_HH +#ifndef MLN_TAG_INIT_HH +# define MLN_TAG_INIT_HH -/*! \file mln/core/tag/init.hh +/*! \file mln/tag/init.hh * * \brief Definition of tags used in the mln::init mechanism. */ @@ -51,4 +51,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TAG_INIT_HH +#endif // ! MLN_TAG_INIT_HH Index: trunk/milena/mln/tag/skeleton.hh =================================================================== --- trunk/milena/mln/tag/skeleton.hh (revision 1340) +++ trunk/milena/mln/tag/skeleton.hh (revision 1341) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_TAG_SKELETON_HH -# define MLN_CORE_TAG_SKELETON_HH +#ifndef MLN_TAG_SKELETON_HH +# define MLN_TAG_SKELETON_HH -/*! \file mln/core/tag/skeleton.hh +/*! \file mln/tag/skeleton.hh * * \brief Definition of tags used in the skeleton types associated to * image types. @@ -57,4 +57,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_TAG_SKELETON_HH +#endif // ! MLN_TAG_SKELETON_HH Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1340) +++ trunk/milena/mln/value/graylevel.hh (revision 1341) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_VALUE_GRAYLEVEL_HH -# define MLN_CORE_VALUE_GRAYLEVEL_HH +#ifndef MLN_VALUE_GRAYLEVEL_HH +# define MLN_VALUE_GRAYLEVEL_HH /*! \file mln/value/graylevel.hh * @@ -256,4 +256,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_VALUE_GRAYLEVEL_HH +#endif // ! MLN_VALUE_GRAYLEVEL_HH Index: trunk/milena/mln/value/gray.hh =================================================================== --- trunk/milena/mln/value/gray.hh (revision 1340) +++ trunk/milena/mln/value/gray.hh (revision 1341) @@ -28,6 +28,11 @@ #ifndef MLN_VALUE_GRAY_HH # define MLN_VALUE_GRAY_HH +/*! \file mln/value/gray.hh + * + * \brief FIXME. + */ + # include <iostream> # include <cmath> Index: trunk/milena/mln/value/float01_.hh =================================================================== --- trunk/milena/mln/value/float01_.hh (revision 1340) +++ trunk/milena/mln/value/float01_.hh (revision 1341) @@ -25,8 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_VALUE_FLOAT01__HH -# define MLN_CORE_VALUE_FLOAT01__HH +#ifndef MLN_VALUE_FLOAT01__HH +# define MLN_VALUE_FLOAT01__HH + +/*! \file mln/value/float01_.hh + * + * \brief FIXME. + */ # include <iostream> # include <mln/core/contract.hh> @@ -202,4 +207,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_VALUE_FLOAT01__HH +#endif // ! MLN_VALUE_FLOAT01__HH Index: trunk/milena/mln/value/quat.hh =================================================================== --- trunk/milena/mln/value/quat.hh (revision 1340) +++ trunk/milena/mln/value/quat.hh (revision 1341) @@ -28,6 +28,11 @@ #ifndef MLN_VALUE_QUAT_HH # define MLN_VALUE_QUAT_HH +/*! \file mln/value/quat.hh + * + * \brief Define a class for quaternion values. + */ + # include <cmath> # include <mln/metal/vec.hh> Index: trunk/milena/mln/value/internal/integer.hh =================================================================== --- trunk/milena/mln/value/internal/integer.hh (revision 1340) +++ trunk/milena/mln/value/internal/integer.hh (revision 1341) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_VALUE_INTEGER_HH -# define MLN_VALUE_INTEGER_HH +#ifndef MLN_VALUE_INTERNAL_INTEGER_HH +# define MLN_VALUE_INTERNAL_INTEGER_HH -/*! \file mln/value/integer.hh +/*! \file mln/value/internal/integer.hh * * \brief Define a generic class for integer values. */ @@ -61,4 +61,4 @@ } // end of namespace mln -#endif // ! MLN_VALUE_INTEGER_HH +#endif // ! MLN_VALUE_INTERNAL_INTEGER_HH Index: trunk/milena/mln/value/float01.hh =================================================================== --- trunk/milena/mln/value/float01.hh (revision 1340) +++ trunk/milena/mln/value/float01.hh (revision 1341) @@ -28,6 +28,11 @@ #ifndef MLN_VALUE_FLOAT01_HH # define MLN_VALUE_FLOAT01_HH +/*! \file mln/value/float01.hh + * + * \brief Define a generic class for float. + */ + # include <iostream> # include <utility> Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1340) +++ trunk/milena/mln/value/rgb.hh (revision 1341) @@ -28,7 +28,7 @@ #ifndef MLN_VALUE_RGB_HH # define MLN_VALUE_RGB_HH -/*! \file mln/value/rgb8.hh +/*! \file mln/value/rgb.hh * * \brief Color class for red-green-blue where every component is * n-bit encoded. Index: trunk/milena/mln/value/float01_f.hh =================================================================== --- trunk/milena/mln/value/float01_f.hh (revision 1340) +++ trunk/milena/mln/value/float01_f.hh (revision 1341) @@ -25,8 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_VALUE_FLOAT01_F_HH -# define MLN_CORE_VALUE_FLOAT01_F_HH +#ifndef MLN_VALUE_FLOAT01_F_HH +# define MLN_VALUE_FLOAT01_F_HH + +/*! \file mln/value/float01_f.hh + * + * \brief FIXME. + */ # include <iostream> # include <mln/value/internal/value_like.hh> @@ -125,4 +130,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_VALUE_FLOAT01_F_HH +#endif // ! MLN_VALUE_FLOAT01_F_HH Index: trunk/milena/mln/value/rgb8_non_templated.hh =================================================================== --- trunk/milena/mln/value/rgb8_non_templated.hh (revision 1340) +++ trunk/milena/mln/value/rgb8_non_templated.hh (revision 1341) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_VALUE_RGB8_HH -# define MLN_VALUE_RGB8_HH +#ifndef MLN_VALUE_RGB8_NON_TEMPLATED_HH +# define MLN_VALUE_RGB8_NON_TEMPLATED_HH -/*! \file mln/value/rgb8.hh +/*! \file mln/value/rgb8_non_templated.hh * * \brief Color class for red-green-blue where every component is * 8-bit encoded. @@ -188,4 +188,4 @@ } // end of namespace mln -#endif // ! MLN_VALUE_RGB8_HH +#endif // ! MLN_VALUE_RGB8_NON_TEMPLATED_HH Index: trunk/milena/mln/pw/image.hh =================================================================== --- trunk/milena/mln/pw/image.hh (revision 1340) +++ trunk/milena/mln/pw/image.hh (revision 1341) @@ -30,7 +30,7 @@ /*! \file mln/pw/image.hh * - * \brief Definition of an image class FIXME + * \brief FIXME. */ # include <mln/core/internal/image_primary.hh> Index: trunk/milena/mln/morpho/min.hh =================================================================== --- trunk/milena/mln/morpho/min.hh (revision 1340) +++ trunk/milena/mln/morpho/min.hh (revision 1341) @@ -28,6 +28,13 @@ #ifndef MLN_MORPHO_MIN_HH # define MLN_MORPHO_MIN_HH +/*! + * \file mln/morpho/min.hh + * + * \brief Definition of a function that make a min + * (logical and or arithmetical min) of an image. + */ + # include <mln/level/compare.hh> # include <mln/logical/and.hh> # include <mln/arith/min.hh> Index: trunk/milena/mln/morpho/plus.hh =================================================================== --- trunk/milena/mln/morpho/plus.hh (revision 1340) +++ trunk/milena/mln/morpho/plus.hh (revision 1341) @@ -28,6 +28,13 @@ #ifndef MLN_MORPHO_PLUS_HH # define MLN_MORPHO_PLUS_HH +/*! + * \file mln/morpho/plus.hh + * + * \brief Definition of a function that make a plus + * (logical or or arithmetical plus) of an image. + */ + # include <mln/level/compare.hh> # include <mln/logical/or.hh> # include <mln/arith/plus.hh> Index: trunk/milena/mln/morpho/minus.hh =================================================================== --- trunk/milena/mln/morpho/minus.hh (revision 1340) +++ trunk/milena/mln/morpho/minus.hh (revision 1341) @@ -28,6 +28,13 @@ #ifndef MLN_MORPHO_MINUS_HH # define MLN_MORPHO_MINUS_HH +/*! + * \file mln/morpho/minus.hh + * + * \brief Definition of a function that make a minus (logical "and + * not" or arithmetical min) of an image. + */ + # include <mln/level/compare.hh> # include <mln/logical/and_not.hh> # include <mln/arith/minus.hh> Index: trunk/milena/mln/morpho/complementation.hh =================================================================== --- trunk/milena/mln/morpho/complementation.hh (revision 1340) +++ trunk/milena/mln/morpho/complementation.hh (revision 1341) @@ -28,6 +28,13 @@ #ifndef MLN_MORPHO_COMPLEMENTATION_HH # define MLN_MORPHO_COMPLEMENTATION_HH +/*! + * \file mln/morpho/complementation.hh + * + * \brief Definition of a function that make a complementation + * (logical or arithmetical) of an image. + */ + # include <mln/level/compare.hh> # include <mln/logical/not.hh> # include <mln/arith/revert.hh> Index: trunk/milena/mln/morpho/Rd.hh =================================================================== --- trunk/milena/mln/morpho/Rd.hh (revision 1340) +++ trunk/milena/mln/morpho/Rd.hh (revision 1341) @@ -28,6 +28,12 @@ #ifndef MLN_MORPHO_RD_HH # define MLN_MORPHO_RD_HH +/*! + * \file mln/morpho/Rd.hh + * + * \brief FIXME. + */ + # include <vector> # include <mln/core/concept/image.hh> Index: trunk/milena/mln/norm/l1.hh =================================================================== --- trunk/milena/mln/norm/l1.hh (revision 1340) +++ trunk/milena/mln/norm/l1.hh (revision 1341) @@ -30,7 +30,7 @@ /*! \file mln/norm/l1.hh * - * \brief Define some infinity-norm related routines. + * \brief Define some l1-norm related routines. */ # include <cmath> Index: trunk/milena/mln/norm/l2.hh =================================================================== --- trunk/milena/mln/norm/l2.hh (revision 1340) +++ trunk/milena/mln/norm/l2.hh (revision 1341) @@ -30,7 +30,7 @@ /*! \file mln/norm/l2.hh * - * \brief Define some infinity-norm related routines. + * \brief Define some l2-norm related routines. */ # include <cmath>

1 0

milena r1340: Update typo
by Guillaume Duhamel 16 Oct '07

16 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-16 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update typo. * mln/core/concept/generalized_pixel.hh, * mln/core/internal/box_impl.hh, * mln/core/internal/coord_impl.hh, * mln/core/pixter3d.hh, * mln/core/queue_p_fast.hh, * mln/core/queue_p_fast_priority.hh, * mln/core/queue_p_priority.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/safe.hh, * mln/core/sparse_encode.hh, * mln/core/sub_image.hh, * mln/core/tr_image.hh, * mln/core/tr_mesh.hh, * mln/core/translate_image.hh, * mln/debug/iota.hh, * mln/debug/println_with_border.hh, * mln/display/color_pretty.hh, * mln/display/save.hh, * mln/display/show.hh, * mln/geom/seeds2tiling.hh, * mln/geom/seeds2tiling_with_chamfer.hh, * mln/geom/shift.hh, * mln/io/fits/load.hh, * mln/io/internal/abort.hh, * mln/io/internal/pnm/load.hh, * mln/io/internal/pnm/load_header.hh, * mln/io/internal/pnm/save.hh, * mln/io/internal/pnm/save_header.hh, * mln/io/pbm/load.hh, * mln/io/pbm/save.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh, * mln/io/pgm/load.hh, * mln/io/pgm/save.hh, * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * mln/make/vec.hh, * mln/make/voronoi.hh, * mln/make/win_chamfer.hh: Update typo. --- core/concept/generalized_pixel.hh | 2 - core/internal/box_impl.hh | 2 - core/internal/coord_impl.hh | 2 - core/pixter3d.hh | 28 ++++++++++++------------- core/queue_p_fast.hh | 3 +- core/queue_p_fast_priority.hh | 4 +-- core/queue_p_priority.hh | 3 +- core/rle_encode.hh | 2 - core/rle_image.hh | 2 - core/safe.hh | 10 +++++++++ core/sparse_encode.hh | 2 - core/sub_image.hh | 8 +++++++ core/tr_image.hh | 4 ++- core/tr_mesh.hh | 4 ++- core/translate_image.hh | 2 - debug/iota.hh | 2 - debug/println_with_border.hh | 2 - display/color_pretty.hh | 2 - display/save.hh | 4 +-- display/show.hh | 4 +-- geom/seeds2tiling.hh | 3 +- geom/seeds2tiling_with_chamfer.hh | 2 - geom/shift.hh | 2 - io/fits/load.hh | 8 +++++++ io/internal/abort.hh | 7 ++++++ io/internal/pnm/load.hh | 12 ++++++----- io/internal/pnm/load_header.hh | 13 +++++++++--- io/internal/pnm/save.hh | 14 +++++++----- io/internal/pnm/save_header.hh | 13 +++++++++--- io/pbm/load.hh | 9 ++++++++ io/pbm/save.hh | 8 +++++++ io/pfm/load.hh | 8 +++++++ io/pfm/save.hh | 8 +++++++ io/pgm/load.hh | 8 +++++++ io/pgm/save.hh | 8 +++++++ io/ppm/load.hh | 8 +++++++ io/ppm/save.hh | 7 ++++-- make/vec.hh | 2 - make/voronoi.hh | 2 - make/win_chamfer.hh | 41 ++++++++++++++++++++++++++++++++++++++ 40 files changed, 215 insertions(+), 60 deletions(-) Index: trunk/milena/mln/debug/iota.hh =================================================================== --- trunk/milena/mln/debug/iota.hh (revision 1339) +++ trunk/milena/mln/debug/iota.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/debug/iota.hh * - * \brief FIXME + * \brief Fill an image with successive values. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/debug/println_with_border.hh =================================================================== --- trunk/milena/mln/debug/println_with_border.hh (revision 1339) +++ trunk/milena/mln/debug/println_with_border.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/debug/println_with_border.hh * - * \brief Print an image on the standard output. + * \brief Print an image on the standard output with its border. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1339) +++ trunk/milena/mln/core/translate_image.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/core/translate_image.hh * - * \brief Definition of a translated image. + * \brief Definition of an image which be translated by a delta point. */ # include <cmath> Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1339) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/core/sparse_encode.hh * - * \brief FIXME + * \brief FIXME. */ # include <mln/core/sparse_image.hh> Index: trunk/milena/mln/core/internal/coord_impl.hh =================================================================== --- trunk/milena/mln/core/internal/coord_impl.hh (revision 1339) +++ trunk/milena/mln/core/internal/coord_impl.hh (revision 1340) @@ -30,8 +30,6 @@ /*! \file mln/core/internal/coord_impl.hh * - * \internal - * * \brief Define some implementation classes for generalized points. */ Index: trunk/milena/mln/core/internal/box_impl.hh =================================================================== --- trunk/milena/mln/core/internal/box_impl.hh (revision 1339) +++ trunk/milena/mln/core/internal/box_impl.hh (revision 1340) @@ -30,8 +30,6 @@ /*! \file mln/core/internal/box_impl.hh * - * \internal - * * \brief Define some implementation classes to provide methods * related to classes having a bounding box. */ Index: trunk/milena/mln/core/queue_p_fast.hh =================================================================== --- trunk/milena/mln/core/queue_p_fast.hh (revision 1339) +++ trunk/milena/mln/core/queue_p_fast.hh (revision 1340) @@ -30,7 +30,8 @@ /*! \file mln/core/queue_p_fast.hh * - * \brief Definition of a point set class based on std::deque. + * \brief Definition of a point set class faster but needs more memory + * space. */ # include <vector> Index: trunk/milena/mln/core/queue_p_fast_priority.hh =================================================================== --- trunk/milena/mln/core/queue_p_fast_priority.hh (revision 1339) +++ trunk/milena/mln/core/queue_p_fast_priority.hh (revision 1340) @@ -30,8 +30,8 @@ /*! \file mln/core/queue_p_fast_priority.hh * - * \brief Definition of a point set class based on std::deque - * and std::map. + * \brief Definition of a point set class based on queue_p_fast with + * priority features. */ # include <vector> Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1339) +++ trunk/milena/mln/core/rle_image.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/core/rle_image.hh * - * \brief Definition of mln::rle_image + * \brief Definition of an image with rle encoding. */ # include <mln/core/internal/run_image.hh> Index: trunk/milena/mln/core/tr_image.hh =================================================================== --- trunk/milena/mln/core/tr_image.hh (revision 1339) +++ trunk/milena/mln/core/tr_image.hh (revision 1340) @@ -30,7 +30,9 @@ /*! \file mln/core/tr_image.hh * - * \brief Definition of an image class FIXME + * \brief Definition of a morpher that makes an image become + * transformed by a given transformation. + * */ # include <cmath> Index: trunk/milena/mln/core/queue_p_priority.hh =================================================================== --- trunk/milena/mln/core/queue_p_priority.hh (revision 1339) +++ trunk/milena/mln/core/queue_p_priority.hh (revision 1340) @@ -30,7 +30,8 @@ /*! \file mln/core/queue_p_priority.hh * - * \brief Definition of a point set class based on std::deque. + * \brief Definition of a point set class based on queue_p with + * priority features. */ # include <vector> Index: trunk/milena/mln/core/pixter3d.hh =================================================================== --- trunk/milena/mln/core/pixter3d.hh (revision 1339) +++ trunk/milena/mln/core/pixter3d.hh (revision 1340) @@ -64,22 +64,22 @@ private: /// Twice the size of the image border. - unsigned border_x2_; + const unsigned border_x2_; /// Row offset. - unsigned row_offset_; + const unsigned row_offset_; /// End of the current row. mln_qlf_value(I)* eor_; ///Next Slide offset for row. - unsigned next_srow_offset_; + const unsigned next_srow_offset_; /// Next Slide offset. - unsigned next_sli_offset_; + const unsigned next_sli_offset_; /// Slide offset. - unsigned sli_offset_; + const unsigned sli_offset_; /// End of the current slide. mln_qlf_value(I)* eos_; @@ -92,17 +92,17 @@ #ifndef MLN_INCLUDE_ONLY template <typename I> - fwd_pixter3d::fwd_pixter3d(I& image) : - super_(image) + fwd_pixter3d::fwd_pixter3d(I& image) + : super_(image), + border_x2_ (2 * image.border()), + row_offset_ (image.bbox().ncols() + border_x2_), + eor_ (& image.at(geom::min_sli(image), geom::min_row(image), geom::max_col(image)) + 1), + next_srow_offset_ ((image.bbox().ncols() + border_x2_) * border_x2_ ), + next_sli_offset_ (row_offset_ * border_x2_), + sli_offset_ ((image.bbox().ncols() + border_x2_) * (image.bbox().nrows() + border_x2_)), + eos_ (& image.at(geom::min_sli(image), geom::max_row(image) + 1, geom::min_col(image))) { mln_precondition(image.has_data()); - border_x2_ = 2 * image.border(); - row_offset_ = geom::max_col(image) - geom::min_col(image) + 1 + border_x2_; - eor_ = & image.at(geom::min_sli(image), geom::min_row(image), geom::max_col(image)) + 1; - next_sli_offset_ = 4 * image.border() * image.bbox().ncols() + 2 * image.border(); - sli_offset_ = (image.bbox().ncols() + border_x2_) * (image.bbox().nrows() + border_x2_); - eos_ = & image.at(geom::min_sli(image), geom::max_row(image) + 1, geom::min_col(image)); - next_srow_offset_ = (image.bbox().ncols() + border_x2_) * border_x2_; } template <typename I> Index: trunk/milena/mln/core/safe.hh =================================================================== --- trunk/milena/mln/core/safe.hh (revision 1339) +++ trunk/milena/mln/core/safe.hh (revision 1340) @@ -28,9 +28,19 @@ #ifndef MLN_CORE_SAFE_HH # define MLN_CORE_SAFE_HH +/*! + * \file safe.hh + * + * \brief Definition of a morpher that makes image become accessible + * at undefined location. + * + */ + + # include <mln/core/internal/image_identity.hh> + namespace mln { Index: trunk/milena/mln/core/sub_image.hh =================================================================== --- trunk/milena/mln/core/sub_image.hh (revision 1339) +++ trunk/milena/mln/core/sub_image.hh (revision 1340) @@ -28,6 +28,14 @@ #ifndef MLN_CORE_SUB_IMAGE_HH # define MLN_CORE_SUB_IMAGE_HH +/*! + * \file sub_image.hh + * + * \brief Definition of morpher that makes an image become restricted + * given by a point set. + * + */ + # include <mln/core/internal/image_domain_morpher.hh> Index: trunk/milena/mln/core/concept/generalized_pixel.hh =================================================================== --- trunk/milena/mln/core/concept/generalized_pixel.hh (revision 1339) +++ trunk/milena/mln/core/concept/generalized_pixel.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/core/concept/generalized_pixel.hh * - * \brief Definition of the concept of mln::Genpixel. + * \brief Definition of the concept of mln::Generalized_Pixel. */ # include <mln/core/concept/object.hh> Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1339) +++ trunk/milena/mln/core/rle_encode.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/core/rle_encode.hh * - * \brief FIXME + * \brief Definintion of function which encodes an image in rle_image. */ # include <mln/core/sparse_image.hh> Index: trunk/milena/mln/core/tr_mesh.hh =================================================================== --- trunk/milena/mln/core/tr_mesh.hh (revision 1339) +++ trunk/milena/mln/core/tr_mesh.hh (revision 1340) @@ -29,7 +29,9 @@ # define MLN_CORE_TR_MESH_HH /*! \file mln/core/tr_mesh.hh - * \brief Definition of mln::tr_mesh. + * + * \brief Definition of a mesh that is transformed by a given + * transformation. */ # include <mln/core/concept/mesh.hh> Index: trunk/milena/mln/make/win_chamfer.hh =================================================================== --- trunk/milena/mln/make/win_chamfer.hh (revision 1339) +++ trunk/milena/mln/make/win_chamfer.hh (revision 1340) @@ -1,3 +1,42 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_MAKE_WIN_CHAMFER_HH +# define MLN_MAKE_WIN_CHAMFER_HH\ + +/*! + * \file mln/make/win_chamfer.hh + * + * \brief Routine to create chamfer mln::w_window2d_int. + * + */ + + # include <mln/core/w_window2d_int.hh> # include <mln/core/w_window2d_float.hh> # include <math.h> @@ -67,3 +106,5 @@ } // end of mln::win_chamfer } // end of mln + +#endif // ! MLN_MAKE_WIN_CHAMFER_HH Index: trunk/milena/mln/make/voronoi.hh =================================================================== --- trunk/milena/mln/make/voronoi.hh (revision 1339) +++ trunk/milena/mln/make/voronoi.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/make/voronoi.hh * - * \brief Routine to construct an mln::make::voronoi. + * \brief Routine to construct a voronoi mln::mesh_p. */ # include <vector> Index: trunk/milena/mln/make/vec.hh =================================================================== --- trunk/milena/mln/make/vec.hh (revision 1339) +++ trunk/milena/mln/make/vec.hh (revision 1340) @@ -132,4 +132,4 @@ } // end of namespace mln -#endif // ! MLN_METAL_VEC_HH +#endif // ! MLN_MAKE_VEC_HH Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 1339) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1340) @@ -30,7 +30,8 @@ /*! \file mln/geom/seeds2tiling.hh * - * \brief . + * \brief Definition of a function which takes a labeled image and + * returns an image which has blew up its labeled values. */ # include <map> Index: trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 1339) +++ trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/geom/seeds2tiling_with_chamfer.hh * - * \brief . + * \brief FIXME. */ # include <map> Index: trunk/milena/mln/geom/shift.hh =================================================================== --- trunk/milena/mln/geom/shift.hh (revision 1339) +++ trunk/milena/mln/geom/shift.hh (revision 1340) @@ -30,7 +30,7 @@ /*! \file mln/geom/shift.hh * - * \brief Shift. + * \brief Define a function which shifts a window with a delta-point. */ # include <mln/core/window.hh> Index: trunk/milena/mln/display/color_pretty.hh =================================================================== --- trunk/milena/mln/display/color_pretty.hh (revision 1339) +++ trunk/milena/mln/display/color_pretty.hh (revision 1340) @@ -31,7 +31,7 @@ /*! \file mln/display/color_pretty.hh * * \brief Create a pretty image, which display its content - * with red value for non-defined point site. + * with red value for undefined point site. */ # include <mln/trait/image_from_mesh.hh> Index: trunk/milena/mln/display/save.hh =================================================================== --- trunk/milena/mln/display/save.hh (revision 1339) +++ trunk/milena/mln/display/save.hh (revision 1340) @@ -30,8 +30,8 @@ /*! \file mln/display/save.hh * - * \brief Create a pretty image, which display its content - * with red value for non-defined point site. + * \brief Definition of function which saves an image on a temporary + * files. */ # include <mln/trait/image_from_mesh.hh> Index: trunk/milena/mln/display/show.hh =================================================================== --- trunk/milena/mln/display/show.hh (revision 1339) +++ trunk/milena/mln/display/show.hh (revision 1340) @@ -30,8 +30,8 @@ /*! \file mln/display/show.hh * - * \brief Create a pretty image, which display its content - * with red value for non-defined point site. + * \brief Display the temporary image which has just been saved with + * given viewer (default xv). */ # include <mln/trait/image_from_mesh.hh> Index: trunk/milena/mln/io/pfm/save.hh =================================================================== --- trunk/milena/mln/io/pfm/save.hh (revision 1339) +++ trunk/milena/mln/io/pfm/save.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PFM_SAVE_HH # define MLN_IO_PFM_SAVE_HH +/*! + * \file mln/io/pfm/save.hh + * + * \brief Define a function which saves an image of kind pfm into + * given path. + * + */ + # include <iostream> # include <fstream> Index: trunk/milena/mln/io/pfm/load.hh =================================================================== --- trunk/milena/mln/io/pfm/load.hh (revision 1339) +++ trunk/milena/mln/io/pfm/load.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PFM_LOAD_HH # define MLN_IO_PFM_LOAD_HH +/*! + * \file mln/io/pfm/load.hh + * + * \brief Define a function which loads an image of kind pfm with + * given path. + * + */ + // # include <iostream> // # include <fstream> // # include <string> Index: trunk/milena/mln/io/pgm/save.hh =================================================================== --- trunk/milena/mln/io/pgm/save.hh (revision 1339) +++ trunk/milena/mln/io/pgm/save.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PGM_SAVE_HH # define MLN_IO_PGM_SAVE_HH +/*! + * \file mln/io/pgm/save.hh + * + * \brief Define a function which saves an image of kind pgm into + * given path. + * + */ + # include <iostream> # include <fstream> Index: trunk/milena/mln/io/pgm/load.hh =================================================================== --- trunk/milena/mln/io/pgm/load.hh (revision 1339) +++ trunk/milena/mln/io/pgm/load.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PGM_LOAD_HH # define MLN_IO_PGM_LOAD_HH +/*! + * \file mln/io/pgm/load.hh + * + * \brief Define a function which loads an image of kind pgm with + * given path. + * + */ + # include <iostream> # include <fstream> # include <string> Index: trunk/milena/mln/io/fits/load.hh =================================================================== --- trunk/milena/mln/io/fits/load.hh (revision 1339) +++ trunk/milena/mln/io/fits/load.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_FITS_LOAD_HH # define MLN_IO_FITS_LOAD_HH +/*! + * \file mln/io/fits/load.hh + * + * \brief Define a function which loads an image of kind fits with + * given path. + * + */ + # include <iostream> # include <fstream> # include <string> Index: trunk/milena/mln/io/internal/abort.hh =================================================================== --- trunk/milena/mln/io/internal/abort.hh (revision 1339) +++ trunk/milena/mln/io/internal/abort.hh (revision 1340) @@ -29,6 +29,13 @@ #ifndef MLN_IO_ABORT_HH # define MLN_IO_ABORT_HH +/*! + * \file mln/io/abort.hh + * + * \brief Define a function which aborts a process in io module. + * + */ + namespace mln { Index: trunk/milena/mln/io/internal/pnm/save_header.hh =================================================================== --- trunk/milena/mln/io/internal/pnm/save_header.hh (revision 1339) +++ trunk/milena/mln/io/internal/pnm/save_header.hh (revision 1340) @@ -26,8 +26,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_PNM_SAVE_HEADER_HH -# define MLN_IO_PNM_SAVE_HEADER_HH +#ifndef MLN_IO_INTERNAL_PNM_SAVE_HEADER_HH +# define MLN_IO_INTERNAL_PNM_SAVE_HEADER_HH + +/*! + * \file mln/io/internal/pnm/save_header.hh + * + * \brief Define a function which saves header for PNM image. + * + */ # include <iostream> # include <fstream> @@ -95,4 +102,4 @@ } // end of namespace mln -#endif // ! MLN_IO_PNM_SAVE_HEADER_HH +#endif // ! MLN_IO_INTERNAL_PNM_SAVE_HEADER_HH Index: trunk/milena/mln/io/internal/pnm/load_header.hh =================================================================== --- trunk/milena/mln/io/internal/pnm/load_header.hh (revision 1339) +++ trunk/milena/mln/io/internal/pnm/load_header.hh (revision 1340) @@ -26,8 +26,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_PNM_LOAD_HEADER_HH -# define MLN_IO_PNM_LOAD_HEADER_HH +#ifndef MLN_IO_INTERNAL_PNM_LOAD_HEADER_HH +# define MLN_IO_INTERNAL_PNM_LOAD_HEADER_HH + +/*! + * \file mln/io/internal/pnm/load_header.hh + * + * \brief Define a function which loads header for PNM image. + * + */ # include <iostream> # include <fstream> @@ -130,4 +137,4 @@ } // end of namespace mln -#endif // ! MLN_IO_PNM_LOAD_HEADER_HH +#endif // ! MLN_IO_INTERNAL_PNM_LOAD_HEADER_HH Index: trunk/milena/mln/io/internal/pnm/save.hh =================================================================== --- trunk/milena/mln/io/internal/pnm/save.hh (revision 1339) +++ trunk/milena/mln/io/internal/pnm/save.hh (revision 1340) @@ -26,12 +26,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_PNM_SAVE_HH -# define MLN_IO_PNM_SAVE_HH +#ifndef MLN_IO_INTERNAL_PNM_SAVE_HH +# define MLN_IO_INTERNAL_PNM_SAVE_HH -/*! \file mln/io/internal/pnm/save.hh +/*! + * \file mln/io/internal/pnm/save.hh * - * \brief function to save PNM images, + * \brief Define a function which saves an image of kind PNM into + * given path. * */ @@ -175,11 +177,11 @@ } // end of namespace mln::io::internal::pnm - } // end of namespace mln::internal + } // end of namespace mln::io::internal } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_PNM_SAVE_HH +#endif // ! MLN_IO_INTERNAL_PNM_SAVE_HH Index: trunk/milena/mln/io/internal/pnm/load.hh =================================================================== --- trunk/milena/mln/io/internal/pnm/load.hh (revision 1339) +++ trunk/milena/mln/io/internal/pnm/load.hh (revision 1340) @@ -26,12 +26,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_PNM_LOAD_HH -# define MLN_IO_PNM_LOAD_HH +#ifndef MLN_IO_INTERNAL_PNM_LOAD_HH +# define MLN_IO_INTERNAL_PNM_LOAD_HH -/*! \file mln/io/internal/pnm/load.hh +/*! + * \file mln/io/internal/pnm/load.hh * - * \brief load a PNM 8/16bits image + * \brief Define a function which loads an image of kind PNM 8/16bits with + * given path. */ # include <iostream> @@ -228,4 +230,4 @@ } // end of namespace mln -#endif // ! MLN_IO_PNM_LOAD_HH +#endif // ! MLN_IO_INTERNAL_PNM_LOAD_HH Index: trunk/milena/mln/io/ppm/save.hh =================================================================== --- trunk/milena/mln/io/ppm/save.hh (revision 1339) +++ trunk/milena/mln/io/ppm/save.hh (revision 1340) @@ -29,9 +29,12 @@ #ifndef MLN_IO_PPM_SAVE_HH # define MLN_IO_PPM_SAVE_HH -/*! \file mln/io/ppm/save.hh +/*! + * \file mln/io/ppm/save.hh + * + * \brief Define a function which saves an image of kind ppm into + * given path. * - * \brief save a PPM image. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/io/ppm/load.hh =================================================================== --- trunk/milena/mln/io/ppm/load.hh (revision 1339) +++ trunk/milena/mln/io/ppm/load.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PPM_LOAD_HH # define MLN_IO_PPM_LOAD_HH +/*! + * \file mln/io/ppm/load.hh + * + * \brief Define a function which loads an image of kind ppm with + * given path. + * + */ + # include <iostream> # include <fstream> # include <string> Index: trunk/milena/mln/io/pbm/save.hh =================================================================== --- trunk/milena/mln/io/pbm/save.hh (revision 1339) +++ trunk/milena/mln/io/pbm/save.hh (revision 1340) @@ -29,6 +29,14 @@ #ifndef MLN_IO_PBM_SAVE_HH # define MLN_IO_PBM_SAVE_HH +/*! + * \file mln/io/pbm/save.hh + * + * \brief Define a function which saves an image of kind pbm into + * given path. + * + */ + # include <iostream> # include <fstream> Index: trunk/milena/mln/io/pbm/load.hh =================================================================== --- trunk/milena/mln/io/pbm/load.hh (revision 1339) +++ trunk/milena/mln/io/pbm/load.hh (revision 1340) @@ -29,6 +29,15 @@ #ifndef MLN_IO_PBM_LOAD_HH # define MLN_IO_PBM_LOAD_HH +/*! + * \file mln/io/pbm/load.hh + * + * \brief Define a function which loads an image of kind pbm with + * given path. + * + */ + + # include <iostream> # include <fstream> # include <string>

1 0

milena r1339: Augment doc
by Simon Nivault 16 Oct '07

16 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-16 Simon Nivault <simon.nivault(a)lrde.epita.fr> Augment doc. * mln/convert/to_rgb.hh, * mln/core/cast_image.hh, * mln/core/decorated_image.hh, * mln/core/dpoints_piter.hh, * mln/core/dpoints_pixter.hh, * mln/core/grids.hh, * mln/core/h_mat.hh, * mln/core/h_vec.hh, * mln/core/hexa.hh, * mln/core/hexa_piter.hh, * mln/core/image2d_h.hh, * mln/core/image_if.hh, * mln/core/image_if_interval.hh, * mln/core/image_if_value.hh, * mln/core/init.hh, * mln/core/inplace.hh, * mln/core/interpolated.hh, * mln/core/mesh_image.hh, * mln/core/mesh_p.hh, * mln/core/mesh_p_piter.hh, * mln/core/mesh_psite.hh, * mln/core/plain.hh: Augment. --- convert/to_rgb.hh | 2 +- core/cast_image.hh | 3 ++- core/decorated_image.hh | 4 ++++ core/dpoints_piter.hh | 3 ++- core/dpoints_pixter.hh | 4 ++-- core/grids.hh | 2 +- core/h_mat.hh | 3 +-- core/h_vec.hh | 3 +-- core/hexa.hh | 3 ++- core/hexa_piter.hh | 2 +- core/image2d_h.hh | 5 +++-- core/image_if.hh | 3 ++- core/image_if_interval.hh | 3 ++- core/image_if_value.hh | 3 ++- core/init.hh | 3 ++- core/inplace.hh | 4 +++- core/interpolated.hh | 3 ++- core/mesh_image.hh | 2 +- core/mesh_p.hh | 2 +- core/mesh_p_piter.hh | 2 +- core/mesh_psite.hh | 2 +- core/plain.hh | 3 ++- 22 files changed, 39 insertions(+), 25 deletions(-) Index: trunk/milena/mln/core/dpoints_piter.hh =================================================================== --- trunk/milena/mln/core/dpoints_piter.hh (revision 1338) +++ trunk/milena/mln/core/dpoints_piter.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/dpoints_piter.hh * - * \brief Definition of mln::dpoints_fwd_piter and mln::dpoints_bkd_piter. + * \brief Definition of forward and backward mln::dpoint_ based + * iterators. */ # include <mln/core/internal/point_iterator_base.hh> Index: trunk/milena/mln/core/decorated_image.hh =================================================================== --- trunk/milena/mln/core/decorated_image.hh (revision 1338) +++ trunk/milena/mln/core/decorated_image.hh (revision 1339) @@ -32,6 +32,10 @@ # include <mln/value/proxy.hh> +/*! \file mln/core/decorated_image.hh + * + * \brief Definition of an image that can have additional features. + */ namespace mln { Index: trunk/milena/mln/core/mesh_psite.hh =================================================================== --- trunk/milena/mln/core/mesh_psite.hh (revision 1338) +++ trunk/milena/mln/core/mesh_psite.hh (revision 1339) @@ -30,7 +30,7 @@ /*! \file mln/core/mesh_p.hh * - * \brief Definition of mln::mesh_psite. + * \brief Definition of a graph-based point site. */ namespace mln Index: trunk/milena/mln/core/image_if.hh =================================================================== --- trunk/milena/mln/core/image_if.hh (revision 1338) +++ trunk/milena/mln/core/image_if.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/image_if.hh * - * \brief Definition of a image_if image. + * \brief Definition of a image which domain is restricted by a + * function. */ # include <mln/core/internal/image_if_base.hh> Index: trunk/milena/mln/core/mesh_p.hh =================================================================== --- trunk/milena/mln/core/mesh_p.hh (revision 1338) +++ trunk/milena/mln/core/mesh_p.hh (revision 1339) @@ -37,7 +37,7 @@ /*! \file mln/core/mesh_p.hh * - * \brief Definition of mln::mesh_p. + * \brief Definition of an point set based on graph. */ namespace mln Index: trunk/milena/mln/core/dpoints_pixter.hh =================================================================== --- trunk/milena/mln/core/dpoints_pixter.hh (revision 1338) +++ trunk/milena/mln/core/dpoints_pixter.hh (revision 1339) @@ -30,8 +30,8 @@ /*! \file mln/core/dpoints_pixter.hh * - * \brief Definition of mln::dpoints_fwd_pixter and - * mln::dpoints_bkd_pixter. + * \brief Definition of forward and backward mln::dpoint_ based + * iterators for pixels iterations. */ # include <cassert> Index: trunk/milena/mln/core/mesh_p_piter.hh =================================================================== --- trunk/milena/mln/core/mesh_p_piter.hh (revision 1338) +++ trunk/milena/mln/core/mesh_p_piter.hh (revision 1339) @@ -33,7 +33,7 @@ /*! \file mln/core/mesh_psite.hh * - * \brief Definition of a graph. + * \brief Definition of point iterator on graph-based point set. */ namespace mln Index: trunk/milena/mln/core/h_vec.hh =================================================================== --- trunk/milena/mln/core/h_vec.hh (revision 1338) +++ trunk/milena/mln/core/h_vec.hh (revision 1339) @@ -30,8 +30,7 @@ /*! \file mln/core/h_vec.hh * - * \brief Definition of the mln::h_vec alias and of its - * construction routine. + * \brief Definition of a vector with homogeneous coordinates. */ # include <mln/metal/vec.hh> Index: trunk/milena/mln/core/hexa.hh =================================================================== --- trunk/milena/mln/core/hexa.hh (revision 1338) +++ trunk/milena/mln/core/hexa.hh (revision 1339) @@ -32,7 +32,8 @@ /*! \file mln/core/hexa.hh * - * \brief Definition of the mln::hexa class. + * \brief Definition of a morpher that makes hexagonal the mesh of an + * image. */ # include <mln/core/internal/image_domain_morpher.hh> Index: trunk/milena/mln/core/hexa_piter.hh =================================================================== --- trunk/milena/mln/core/hexa_piter.hh (revision 1338) +++ trunk/milena/mln/core/hexa_piter.hh (revision 1339) @@ -30,7 +30,7 @@ /*! \file mln/core/hexa_piter.hh * - * \brief Definition of iterators on points of pset_ifes. + * \brief Definition of iterators on hexagonal points. */ # include <mln/core/internal/piter_adaptor.hh> Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1338) +++ trunk/milena/mln/core/interpolated.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/interpolated.hh * - * \brief Definition of an image class FIXME + * \brief Definition of a morpher that makes an image become readable + * with floating coordinates. */ # include <cmath> Index: trunk/milena/mln/core/image_if_value.hh =================================================================== --- trunk/milena/mln/core/image_if_value.hh (revision 1338) +++ trunk/milena/mln/core/image_if_value.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/image_if_value.hh * - * \brief Definition of a image_if_value image. + * \brief Definition of a image which domain is restricted by a + * single value. */ # include <mln/core/internal/image_if_base.hh> Index: trunk/milena/mln/core/init.hh =================================================================== --- trunk/milena/mln/core/init.hh (revision 1338) +++ trunk/milena/mln/core/init.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/init.hh * - * \brief Initialization of an image from another one. + * \brief Definition of function that initialize an image from another + * one. */ # include <mln/tag/init.hh> Index: trunk/milena/mln/core/image_if_interval.hh =================================================================== --- trunk/milena/mln/core/image_if_interval.hh (revision 1338) +++ trunk/milena/mln/core/image_if_interval.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/image_if_interval.hh * - * \brief Definition of a image_if_interval image. + * \brief Definition of a image which domain is restricted by a + * interval. */ # include <mln/core/internal/image_if_base.hh> Index: trunk/milena/mln/core/cast_image.hh =================================================================== --- trunk/milena/mln/core/cast_image.hh (revision 1338) +++ trunk/milena/mln/core/cast_image.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/cast_image.hh * - * \brief Definition of an image class FIXME + * \brief Definition of an image morpher that make the user see the + * same image but with another data type. * * \todo Rename as cast_image (without '_')! */ Index: trunk/milena/mln/core/mesh_image.hh =================================================================== --- trunk/milena/mln/core/mesh_image.hh (revision 1338) +++ trunk/milena/mln/core/mesh_image.hh (revision 1339) @@ -30,7 +30,7 @@ /*! \file mln/core/mesh_image.hh * - * \brief Definition of an image class mesh_image. + * \brief Definition of an graph-based image. */ # include <mln/core/internal/image_identity.hh> Index: trunk/milena/mln/core/h_mat.hh =================================================================== --- trunk/milena/mln/core/h_mat.hh (revision 1338) +++ trunk/milena/mln/core/h_mat.hh (revision 1339) @@ -30,8 +30,7 @@ /*! \file mln/core/h_mat.hh * - * \brief Definition of the mln::h_mat alias and of its - * construction routine. + * \brief Definition of a matrix with homogeneous coordinates. */ # include <mln/metal/mat.hh> Index: trunk/milena/mln/core/plain.hh =================================================================== --- trunk/milena/mln/core/plain.hh (revision 1338) +++ trunk/milena/mln/core/plain.hh (revision 1339) @@ -30,7 +30,8 @@ /*! \file mln/core/plain.hh * - * \brief Definition of an image class FIXME + * \brief Definition of a morpher that prevent an image from sharing + * his data. */ # include <cmath> Index: trunk/milena/mln/core/grids.hh =================================================================== --- trunk/milena/mln/core/grids.hh (revision 1338) +++ trunk/milena/mln/core/grids.hh (revision 1339) @@ -30,7 +30,7 @@ /*! \file mln/core/grids.hh * - * \brief This file defines some grid classes. + * \brief Definition of some grid classes. */ # include <mln/core/concept/regular_grid.hh> Index: trunk/milena/mln/core/inplace.hh =================================================================== --- trunk/milena/mln/core/inplace.hh (revision 1338) +++ trunk/milena/mln/core/inplace.hh (revision 1339) @@ -29,7 +29,9 @@ # define MLN_CORE_INPLACE_HH /*! \file mln/core/inplace.hh - * \brief Definition of the mln::inplace routine. + * + * \brief Definition of routine that make temporary objects become + * mutable. */ # include <mln/core/exact.hh> Index: trunk/milena/mln/core/image2d_h.hh =================================================================== --- trunk/milena/mln/core/image2d_h.hh (revision 1338) +++ trunk/milena/mln/core/image2d_h.hh (revision 1339) @@ -28,9 +28,10 @@ #ifndef MLN_CORE_IMAGE2D_H_HH # define MLN_CORE_IMAGE2D_H_HH -/*! \file mln/core/hexa_piter.hh +/*! \file mln/core/image2d_h.hh * - * \brief Definition of iterators on points of pset_ifes. + * \brief Definition of an alias for a 2d image based on an hexagonal + * mesh. */ # include <mln/core/image2d.hh> Index: trunk/milena/mln/convert/to_rgb.hh =================================================================== --- trunk/milena/mln/convert/to_rgb.hh (revision 1338) +++ trunk/milena/mln/convert/to_rgb.hh (revision 1339) @@ -28,7 +28,7 @@ #ifndef MLN_CONVERT_TO_RGB_HH # define MLN_CONVERT_TO_RGB_HH -/*! \file mln/convert/to_window.hh +/*! \file mln/convert/to_rgb.hh * * \brief Conversions to mln::value::rgb. */

1 0

milena r1338: Update typo
by Guillaume Duhamel 15 Oct '07

15 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update typo. * accu/compute.hh, * accu/median_alt.hh, * accu/take.hh, * border/duplicate.hh, * border/fill.hh, * border/find.hh, * border/get.hh, * border/mirror.hh, * border/resize.hh, * border/thickness.hh, * canvas/chamfer.hh: Update typo. --- accu/compute.hh | 2 +- accu/median_alt.hh | 2 +- accu/take.hh | 2 +- border/duplicate.hh | 2 +- border/fill.hh | 2 +- border/find.hh | 2 +- border/get.hh | 2 +- border/mirror.hh | 3 ++- border/resize.hh | 3 ++- border/thickness.hh | 3 ++- canvas/chamfer.hh | 3 +-- 11 files changed, 14 insertions(+), 12 deletions(-) Index: trunk/milena/mln/accu/take.hh =================================================================== --- trunk/milena/mln/accu/take.hh (revision 1337) +++ trunk/milena/mln/accu/take.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/accu/take.hh * - * \brief Make an accumulator take image pixels. + * \brief Define an accumulator that takes image pixels. */ # include <mln/core/concept/accumulator.hh> Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1337) +++ trunk/milena/mln/accu/median_alt.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/accu/median_alt.hh * - * \brief Define FIXME + * \brief Define alternative generic median accumulator class. */ # include <mln/accu/internal/base.hh> Index: trunk/milena/mln/accu/compute.hh =================================================================== --- trunk/milena/mln/accu/compute.hh (revision 1337) +++ trunk/milena/mln/accu/compute.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/accu/compute.hh * - * \brief Make an accumulator compute image pixels. + * \brief Define an accumulator that computes image pixels. */ # include <mln/core/concept/meta_accumulator.hh> Index: trunk/milena/mln/border/resize.hh =================================================================== --- trunk/milena/mln/border/resize.hh (revision 1337) +++ trunk/milena/mln/border/resize.hh (revision 1338) @@ -30,7 +30,8 @@ /*! \file mln/border/resize.hh * - * \brief Resize border. + * \brief Define a function that resizes the virtual border of an + * image. */ # include <cstring> Index: trunk/milena/mln/border/fill.hh =================================================================== --- trunk/milena/mln/border/fill.hh (revision 1337) +++ trunk/milena/mln/border/fill.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/border/fill.hh * - * \brief FIXME. + * \brief Define function that fills border using a given value. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/border/mirror.hh =================================================================== --- trunk/milena/mln/border/mirror.hh (revision 1337) +++ trunk/milena/mln/border/mirror.hh (revision 1338) @@ -30,7 +30,8 @@ /*! \file mln/border/mirror.hh * - * \brief FIXME. + * \brief Define function that fills border using nearer pixels with a + * mirroring effect. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/border/duplicate.hh =================================================================== --- trunk/milena/mln/border/duplicate.hh (revision 1337) +++ trunk/milena/mln/border/duplicate.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/border/duplicate.hh * - * \brief FIXME. + * \brief Define function that fills border using nearest pixels. */ # include <mln/core/concept/image.hh> Index: trunk/milena/mln/border/thickness.hh =================================================================== --- trunk/milena/mln/border/thickness.hh (revision 1337) +++ trunk/milena/mln/border/thickness.hh (revision 1338) @@ -30,7 +30,8 @@ /*! \file mln/border/thickness.hh * - * \brief FIXME. + * \brief Define the variable which specifies border thickness for + * image creation. */ Index: trunk/milena/mln/border/get.hh =================================================================== --- trunk/milena/mln/border/get.hh (revision 1337) +++ trunk/milena/mln/border/get.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/border/get.hh * - * \brief FIXME. + * \brief Define function that returns the real border thickness of image. */ # include <mln/border/find.hh> Index: trunk/milena/mln/border/find.hh =================================================================== --- trunk/milena/mln/border/find.hh (revision 1337) +++ trunk/milena/mln/border/find.hh (revision 1338) @@ -30,7 +30,7 @@ /*! \file mln/border/find.hh * - * \brief FIXME. + * \brief Define function that searches the border thickness of image. */ # include <mln/core/internal/image_morpher.hh> Index: trunk/milena/mln/canvas/chamfer.hh =================================================================== --- trunk/milena/mln/canvas/chamfer.hh (revision 1337) +++ trunk/milena/mln/canvas/chamfer.hh (revision 1338) @@ -30,8 +30,7 @@ /*! \file mln/canvas/chamfer.hh * - * \brief Connected component chamfer of the object part in a binary - * image. + * \brief Apply chamfer algorithm to a binary image. */ namespace mln

1 0

milena r1337: Fix slow_seed2tiling
by Guillaume Duhamel 15 Oct '07

15 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix slow_seed2tiling. * slow_seed2tiling.cc: Fix for compiling. --- slow_seed2tiling.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/duhamel/slow_seed2tiling.cc =================================================================== --- trunk/milena/sandbox/duhamel/slow_seed2tiling.cc (revision 1336) +++ trunk/milena/sandbox/duhamel/slow_seed2tiling.cc (revision 1337) @@ -64,6 +64,7 @@ # include <mln/norm/l2.hh> # include <mln/norm/l1.hh> +# include <mln/norm/infty.hh> namespace mln { @@ -87,9 +88,7 @@ for_all(p2) if (input(p2) != 0) { mln_dpoint(I) dp = p1 - p2; - float new_distance = norm::linfty<2, unsigned> (dp.to_vec ()); - std::cout << new_distance - << std::endl; + float new_distance = norm::l2<2, unsigned> (dp.to_vec ()); if (new_distance < d) { output(p1) = input(p2);

1 0

milena r1336: Add slow version of seed2tiling
by Guillaume Duhamel 15 Oct '07

15 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add slow version of seed2tiling. * slow_seed2tiling.cc: New. --- slow_seed2tiling.cc | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) Index: trunk/milena/sandbox/duhamel/slow_seed2tiling.cc =================================================================== --- trunk/milena/sandbox/duhamel/slow_seed2tiling.cc (revision 0) +++ trunk/milena/sandbox/duhamel/slow_seed2tiling.cc (revision 1336) @@ -0,0 +1,157 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +/*! \file tests/slow_seeds2tiling.cc + * + * \brief Test on mln::geom::seed2tiling*.hh. + */ + + +# include <mln/core/image2d.hh> +# include <mln/core/sub_image.hh> +# include <mln/core/neighb2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/level/fill.hh> +# include <mln/level/stretch.hh> +# include <mln/border/fill.hh> +# include <mln/io/pbm/load.hh> +# include <mln/io/pgm/save.hh> +# include <mln/labeling/foreground.hh> +# include <mln/debug/println.hh> +# include <mln/draw/mesh.hh> +# include <mln/geom/seeds2tiling.hh> +# include <mln/geom/seeds2tiling_with_chamfer.hh> +# include <mln/make/voronoi.hh> + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if_value.hh> +#include <mln/core/inplace.hh> + +#include <mln/core/w_window2d_int.hh> +#include <mln/make/win_chamfer.hh> + + +# include <mln/core/queue_p.hh> +# include <mln/core/clone.hh> +# include <mln/accu/mean.hh> +# include <mln/estim/min_max.hh> +# include <mln/metal/vec.hh> + +# include <mln/norm/l2.hh> +# include <mln/norm/l1.hh> + +namespace mln +{ + + namespace geom + { + template <typename I> + I + slow_seeds2tiling (Image& input_, + float max) + { + I& input = exact(input_); + I output = clone(input_); + + mln_piter(I) p1(input.domain()); + mln_piter(I) p2(input.domain()); + + for_all(p1) if (input(p1) == 0) + { + float d = max; + for_all(p2) if (input(p2) != 0) + { + mln_dpoint(I) dp = p1 - p2; + float new_distance = norm::linfty<2, unsigned> (dp.to_vec ()); + std::cout << new_distance + << std::endl; + if (new_distance < d) + { + output(p1) = input(p2); + d = new_distance; + } + } + } + return output; + } + } +} + +int main(int argc, char** argv) +{ + if (argc < 2) + { + std::cerr << "missing argument : specify the location of the binary image (*.pbm)" << std::endl; + return 1; + } + using namespace mln; + using value::int_u8; + float max = 2048; + + image2d<bool> input = io::pbm::load(argv[1]); + + { + image2d<unsigned> lab(input.domain()); + image2d<unsigned> inte(input.domain()); + image2d<int_u8> inte2(input.domain()); + image2d<int_u8> out(input.domain()); + + // const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2,3> (); + + unsigned n; + labeling::foreground(input, c4(), lab, n); + std::cout << "number of labels = " << n << std::endl; + + + inte = geom::slow_seeds2tiling(lab, max); + border::fill (inte, 0); + level::stretch (inte, inte2); + io::pgm::save(inte2, "ima_slow.pgm"); + std::cout << "ima_slow generate with seeds2tiling" + << std::endl; + + inte = geom::seeds2tiling(lab, c4 ()); + border::fill (inte, 0); + level::stretch (inte, inte2); + io::pgm::save(inte2, "ima1.pgm"); + std::cout << "ima1 generate with seeds2tiling" + << std::endl; + + +// std::cout << "ima1 generate with seeds2tiling" +// << std::endl; +// inte = geom::seeds2tiling_with_chamfer(lab, w_win, max, c4 ()); +// border::fill (inte, 0); +// level::stretch (inte, inte2); + +// io::pgm::save(inte2, "ima2.pgm"); +// std::cout << "ima2 generate with seeds2tiling_with_chamfer" +// << std::endl; + } + +}

1 0