Index: olena/ChangeLog from Giovanni Palma <giovanni@lrde.epita.fr> * oln/convol/fast_convolution.hh: Add macro to compile doc without libfft. * oln/makefile.src: Add qsort reference. * oln/morpho/attribute_closing_opening.hh: Correct doc. Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Fri, 09 Jul 2004 17:34:56 +0200 palma_g (oln/q/49_attribute_ 1.25 640) +++ olena/oln/morpho/attribute_closing_opening.hh Fri, 09 Jul 2004 19:18:38 +0200 palma_g (oln/q/49_attribute_ 1.26 640) @@ -270,7 +270,7 @@ xxx_opening_decl(integral) /*! - ** \brief Perform an integral closing. + ** \brief Perform a volume closing. ** ** \code ** #include <oln/basics2d.hh> @@ -283,7 +283,7 @@ ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); ** oln::morpho::env::OtherImageEnv<im_type> env(im1); - ** im1 = oln::morpho::fast::integral_closing(im1, oln::neighb_c4(), 200, env); + ** im1 = oln::morpho::fast::volume_closing(im1, oln::neighb_c4(), 200, env); ** oln::save(im1, IMG_OUT "oln_morpho_fast_volume_closing.ppm"); ** return 0; ** } @@ -291,15 +291,15 @@ ** \image html lena128_pgm.png ** \image latex lena128_pgm.png ** => - ** \image html oln_morpho_fast_integral_closing.png - ** \image latex oln_morpho_fast_integral_closing.png + ** \image html oln_morpho_fast_volume_closing.png + ** \image latex oln_morpho_fast_volume_closing.png ** */ xxx_closing_im_env_decl(volume) /*! - ** \brief Perform an integral opening. + ** \brief Perform a volume opening. ** ** \code ** #include <oln/basics2d.hh> @@ -311,16 +311,17 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im1 = oln::morpho::fast::integral_opening(im1, oln::neighb_c4(), 200); - ** oln::save(im1, IMG_OUT "oln_morpho_fast_integral_opening.ppm"); + ** oln::morpho::env::OtherImageEnv<im_type> env(im1); + ** im1 = oln::morpho::fast::volume_opening(im1, oln::neighb_c4(), 200, env); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_volume_opening.ppm"); ** return 0; ** } ** \endcode ** \image html lena128_pgm.png ** \image latex lena128_pgm.png ** => - ** \image html oln_morpho_fast_integral_opening.png - ** \image latex oln_morpho_fast_integral_opening.png + ** \image html oln_morpho_fast_volume_opening.png + ** \image latex oln_morpho_fast_volume_opening.png ** */ xxx_opening_im_env_decl(volume) Index: olena/oln/makefile.src --- olena/oln/makefile.src Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/4_makefile.s 1.5 644) +++ olena/oln/makefile.src Tue, 13 Jul 2004 11:44:08 +0200 palma_g (oln/r/4_makefile.s 1.6 644) @@ -227,6 +227,7 @@ utils/md5.hxx \ utils/buffer.hh \ utils/buffer.hxx \ + utils/qsort.hh \ utils/histogram.hh \ utils/se_stat.hh \ utils/se_stat.hxx \ Index: olena/oln/convol/fast_convolution.hh --- olena/oln/convol/fast_convolution.hh Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/12_fast_convo 1.3 600) +++ olena/oln/convol/fast_convolution.hh Fri, 09 Jul 2004 18:44:18 +0200 palma_g (oln/r/12_fast_convo 1.4 600) @@ -126,6 +126,7 @@ convolve(const abstract::image< I >& input, const abstract::image< J >& k) { +# ifdef HAVE_LIBfft mlc::eq<I::dim, J::dim>::ensure(); mlc::eq<I::dim, 2>::ensure(); @@ -188,6 +189,9 @@ output[input_iter] = piece_output[input_iter]; return output; +# else + assert(0); +# endif // !HAVE_LIBfft } /*! -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74