Olena-patches April 2004

olena-patches@lrde.epita.fr

8 participants
59 discussions

oln 10.157: Fix tests
by Damien Thivolle 14 Apr '04

14 Apr '04

Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test xfail. * olena/tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise. +2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr> + * olena/oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC. * olena/oln/morpho/geodesic_erosion.hh: Likewise. * olena/oln/morpho/reconstruction.hh: Likewise. Index: olena/tests/convol/tests/md5_convol_fast_gaussian_hh4 --- olena/tests/convol/tests/md5_convol_fast_gaussian_hh4 Mon, 29 Mar 2004 15:45:23 +0200 palma_g (oln/k/24_md5_convol 1.2 600) +++ olena/tests/convol/tests/md5_convol_fast_gaussian_hh4 Wed, 14 Apr 2004 00:21:59 +0200 thivol_d (oln/k/24_md5_convol 1.2 600) @@ -21,7 +21,7 @@ im_type im1(oln::load(rdata("lena256.pgm"))); if (oln::utils::md5(oln::convol::fast::gaussian_derivative(im1, 0.5)) == key) - std::cout << "OK" << std::endl; + std::cout << "OK" << std::endl; // XFAIL else { std::cout << "FAIL" << std::endl; Index: olena/tests/convol/tests/md5_convol_fast_gaussian_hh1 --- olena/tests/convol/tests/md5_convol_fast_gaussian_hh1 Mon, 29 Mar 2004 15:45:23 +0200 palma_g (oln/k/27_md5_convol 1.2 600) +++ olena/tests/convol/tests/md5_convol_fast_gaussian_hh1 Wed, 14 Apr 2004 00:25:48 +0200 thivol_d (oln/k/27_md5_convol 1.2 600) @@ -24,7 +24,7 @@ 0.5, oln::value_behavior<oln_value_type_(im_type)>(0))) == key) - std::cout << "OK" << std::endl; + std::cout << "OK" << std::endl; // XFAIL else { std::cout << "FAIL" << std::endl; -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

1 0

oln 10.155: Fix for ICC.
by Niels Van Vliet 13 Apr '04

13 Apr '04

Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/utils/md5.hxx: Changed abstract::image to oln::abstract::image (ICC error). * olena/oln/utils/md5.hh: Likewise. +2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr> + * oln/arith/internal/opdecls.hh: Add white space after variables of macros used as template parameters (ICC error). * oln/morpho/watershed.hxx: Likewise. Index: olena/oln/utils/md5.hxx --- olena/oln/utils/md5.hxx Fri, 19 Mar 2004 16:54:46 +0100 palma_g (oln/k/13_md5.hxx 1.2 600) +++ olena/oln/utils/md5.hxx Tue, 13 Apr 2004 20:11:08 +0200 van-vl_n (oln/k/13_md5.hxx 1.2 600) @@ -286,7 +286,7 @@ // md5 implementation. template <class I> inline -key md5(const abstract::non_vectorial_image &im) +key md5(const oln::abstract::non_vectorial_image &im) { oln_iter_type(I) p(im); buffer b; @@ -303,7 +303,7 @@ // md5 implementation. template <class I> inline -key md5(const abstract::vectorial_image &im) +key md5(const oln::abstract::vectorial_image &im) { oln_iter_type(I) p(im); buffer b; Index: olena/oln/utils/md5.hh --- olena/oln/utils/md5.hh Fri, 19 Mar 2004 16:54:46 +0100 palma_g (oln/k/14_md5.hh 1.2 600) +++ olena/oln/utils/md5.hh Tue, 13 Apr 2004 20:10:50 +0200 van-vl_n (oln/k/14_md5.hh 1.2 600) @@ -211,7 +211,7 @@ ** Non vectorial image version. */ template <class I> - key md5(const abstract::non_vectorial_image &im); + key md5(const oln::abstract::non_vectorial_image &im); /*! ** \brief Compute The Md5 value of an image. @@ -223,7 +223,7 @@ ** Vectorial image version. */ template <class I> - key md5(const abstract::vectorial_image &im); + key md5(const oln::abstract::vectorial_image &im); } // !utils } // !oln

1 0

oln 10.154: Minor fixes.
by Damien Thivolle 13 Apr '04

13 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Fix. +2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr> + * configure.ac: Check for doxygen version. * config/oln.m4: Add macro to check for doxygen version. Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * swilena/expand.sh: Add `DOC_CPPFLAGS' to the compilation flags. +2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr> + * tools/swilena/ruby/Makefile.am: Remove `ruby_DATA' variable. 2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr> Index: config/oln.m4 --- config/oln.m4 Tue, 13 Apr 2004 17:38:53 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.3 600) +++ config/oln.m4 Tue, 13 Apr 2004 17:48:16 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.3 600) @@ -393,6 +393,7 @@ DOC_CPPFLAGS="$DOC_CPPFLAGS -DNEED_$2" elif test "x$[]oln_cv_$1_flags" = xisodef; then CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE=1" + DOC_CPPFLAGS="$DOC_CPPFLAGS -D_ISOC99_SOURCE=1" fi AC_LANG_POP([C++]) ]) Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Mon, 12 Apr 2004 19:37:26 +0200 thivol_d (oln/s/25_expand.sh 1.15 700) +++ tools/swilena/expand.sh Tue, 13 Apr 2004 19:47:34 +0200 thivol_d (oln/s/25_expand.sh 1.15 700) @@ -78,7 +78,7 @@ INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS -AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) +AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) AM_LDFLAGS = -shared -lswigpy \$(ZLIB_LDFLAGS) EOF @@ -143,7 +143,7 @@ INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS -AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) +AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) EOF -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

1 0

oln 10.151: Nagao test.
by Giovanni Palma 13 Apr '04

13 Apr '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/convol/tests/nagao: Disable test. +2004-04-13 Giovanni Palma <giovanni(a)lrde.epita.fr> + * tests/convol/tests/md5_convol_fast_gaussian_hh3: Correct the test to make it success on mac. Index: olena/tests/convol/tests/nagao --- olena/tests/convol/tests/nagao Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/19_nagao 1.1 600) +++ olena/tests/convol/tests/nagao Tue, 13 Apr 2004 15:12:13 +0200 palma_g (oln/m/19_nagao 1.1 600) @@ -6,6 +6,10 @@ #include <oln/utils/md5.hh> #include "data.hh" #include "check.hh" + +// There is a problem with the way of testing this algorithm. Md5 +// will not return the same result since nagao result may differ a +// little bit depending on the machine used (float). int main() { bool fail (false); @@ -27,7 +31,10 @@ fail = fail | (oln::utils::md5(ng) != oln::utils::key(data_key_g)); if (!fail) + { std::cout << "OK" << std::endl; + return true; // XFAIL + } else { std::cout << "FAIL" << std::endl; -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

1 0

Re: oln 10.146: Fix swilena. Fix oln_concrete_type.
by Niels Van Vliet 12 Apr '04

12 Apr '04

from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/core/abstract/image.hh: Fix macro oln_concrete_type. * olena/tests/morpho/tests/gradient: New. +2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr> + * olena/oln/morpho/laplacian.inc: Add a FIXME. * olena/oln/morpho/watershed.hh: Add a FIXME. Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * tools/swilena/generate_morpho_instantiations.py: Remove maxima_killer minima_killer from swilena_morpho1d_* and swilena_morpho3d_*. Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Sun, 04 Apr 2004 16:48:06 +0200 odou_s (oln/t/25_image.hh 1.30 600) +++ olena/oln/core/abstract/image.hh Mon, 12 Apr 2004 12:19:23 +0200 van-vl_n (oln/t/25_image.hh 1.30 600) @@ -341,7 +341,7 @@ mlc_exact_type_(ImgType)::value_type # define oln_concrete_type(ImgType) \ -typename mute<ImgType>::ret +typename oln::mute<ImgType>::ret # define oln_exact_type(ImgType) \ mlc_exact_type(ImgType) Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 01:09:38 +0200 van-vl_n (oln/v/24_generate_m 1.7 700) +++ tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 11:32:41 +0200 van-vl_n (oln/v/24_generate_m 1.7 700) @@ -146,6 +146,7 @@ instantiate(idx, "hybrid_regional_minima", bin_img_type, img_type, neighb_type) # Extrema killers + if dim == 2: instantiate(idx, "fast_maxima_killer", img_type, neighb_type) instantiate(idx, "fast_minima_killer", img_type, neighb_type) # FIXME: This should work with other types. Index: olena/tests/morpho/tests/gradient --- olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:46 +0200 van-vl_n () +++ olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:35 +0200 van-vl_n (oln/r/1_gradient 644) @@ -0,0 +1,39 @@ +// -*- c++ -*- + +#include <oln/basics2d.hh> +#include <oln/morpho/gradient.hh> +#include <oln/level/compare.hh> +#include <ntg/all.hh> +#include "check.hh" +#include "data.hh" + + +#define OK_OR_FAIL \ + std::cout << "OK" << std::endl; \ + else \ + { \ + std::cout << "FAIL" << std::endl; \ + fail = true; \ + } + +template<class I> +bool are_not_eq(const oln::abstract::non_vectorial_image_with_dim<2, I> &im) +{ + return + !oln::level::is_equal(oln::morpho::fast::beucher_gradient(im, + oln::win_c8p()), + oln::morpho::beucher_gradient(im, oln::win_c8p())); +} + + +bool +check() +{ + bool fail = false; + + oln::image2d<ntg::int_u8> im8(oln::load(rdata("lena256.pgm"))); + if (are_not_eq(im8) == false) + OK_OR_FAIL; + + return fail; +}

1 1

oln 10.144: The resurrection of swilena.
by Niels Van Vliet 12 Apr '04

12 Apr '04

Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/morpho/laplacian.inc: Add a FIXME. * olena/oln/morpho/watershed.hh: Add a FIXME. Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * tools/swilena/generate_morpho_instantiations.py: Fix and add some algorithms. Index: olena/oln/morpho/laplacian.inc --- olena/oln/morpho/laplacian.inc Fri, 02 Apr 2004 17:50:27 +0200 van-vl_n (oln/41_laplacian. 1.16 600) +++ olena/oln/morpho/laplacian.inc Sun, 11 Apr 2004 23:50:47 +0200 van-vl_n (oln/41_laplacian. 1.16 600) @@ -110,7 +110,10 @@ ** \image latex lena256_pgm.png ** => ** \image html oln_morpho_fast_laplacian_overload.png -** \image latex oln_morpho_fast_laplacian_overload.png +** \image latex oln_morpho_fast_laplacian_overload.pn +** +** \todo FIXME: Not instantiated in swilena (see +** tools/swilena/generate_morpho_instantiations.py) */ template<class DestValue, class I, class E> typename mute<I, DestValue>::ret Index: olena/oln/morpho/watershed.hh --- olena/oln/morpho/watershed.hh Fri, 02 Apr 2004 17:50:27 +0200 van-vl_n (oln/48_watershed. 1.14 600) +++ olena/oln/morpho/watershed.hh Sun, 11 Apr 2004 23:48:41 +0200 van-vl_n (oln/48_watershed. 1.14 600) @@ -216,6 +216,9 @@ ** \arg D Input image. ** \arg M Image of labels. ** \arg Ng Neighborhood to consider. + ** + ** \todo FIXME: Not instantiated in swilena (see + ** tools/swilena/generate_morpho_instantiations.py) */ template<class I1, class I2, class N> oln_concrete_type(I2)& Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Sun, 11 Apr 2004 22:22:47 +0200 van-vl_n (oln/v/24_generate_m 1.6 700) +++ tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 01:00:19 +0200 van-vl_n (oln/v/24_generate_m 1.6 700) @@ -110,7 +110,7 @@ instantiate(idx, "hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) instantiate(idx, "fast_hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) - # FIXME: these algorithms do not work with float neither binary types + # FIXME: This should work with other types. if type != "ntg_bin": instantiate(idx, "beucher_gradient", img_type, img_type, win_type) instantiate(idx, "fast_beucher_gradient", img_type, img_type, win_type) @@ -132,36 +132,31 @@ instantiate(idx, "top_hat_contrast_op", img_type, img_type, win_type) instantiate(idx, "fast_top_hat_contrast_op", img_type, img_type, win_type) - - # FIXME: fix this when available - #if type == "ntg_int_u8": # Watershed - #img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() - #instantiate(dim, "watershed_seg", img_ret_type, img_type, neighb_type) - #instantiate(dim, "watershed_con", img_ret_type, img_type, neighb_type) - #instantiate(dim, "watershed_seg_or", img_type, img_type, img_ret_type, neighb_type) - - # FIXME: this is broken - # instantiate(dim, "laplacian", img_type, img_type, win_type) - # instantiate(dim, "fast_laplacian", img_type, img_type, win_type) - - # FIXME: this is broken - # bin_img_type = "::oln::image%(dim)sd< ntg_bin >" % vars() - # instantiate(dim, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - # instantiate(dim, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - # instantiate(dim, "hybrid_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - - # FIXME: this is broken - # instantiate(dim, "sure_regional_minima", bin_img_type, img_type, neighb_type) - # instantiate(dim, "sequential_regional_minima", bin_img_type, img_type, neighb_type) - # instantiate(dim, "hybrid_regional_minima", bin_img_type, img_type, neighb_type) + img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() + instantiate(idx, "watershed_seg", img_ret_type, img_type, neighb_type) + instantiate(idx, "watershed_con", img_ret_type, img_type, neighb_type) + bin_img_type = "::oln::image%(dim)sd< ntg_bin >" % vars() + instantiate(idx, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) + instantiate(idx, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) + instantiate(idx, "hybrid_minima_imposition", img_type, img_type, bin_img_type, neighb_type) + + instantiate(idx, "sure_regional_minima", bin_img_type, img_type, neighb_type) + instantiate(idx, "sequential_regional_minima", bin_img_type, img_type, neighb_type) + instantiate(idx, "hybrid_regional_minima", bin_img_type, img_type, neighb_type) # Extrema killers - # FIXME: extrema killers work only with ntg::int_u8 data type - # instantiate(dim, "sure_maxima_killer", img_type, neighb_type) - # instantiate(dim, "fast_maxima_killer", img_type, neighb_type) - # instantiate(dim, "sure_minima_killer", img_type, neighb_type) - # instantiate(dim, "fast_minima_killer", img_type, neighb_type) + instantiate(idx, "fast_maxima_killer", img_type, neighb_type) + instantiate(idx, "fast_minima_killer", img_type, neighb_type) + # FIXME: This should work with other types. + if type == "ntg_int_u8": + instantiate(idx, "sure_maxima_killer", img_type, neighb_type) + instantiate(idx, "sure_minima_killer", img_type, neighb_type) + + #FIXME: Does not work due to the return type: + #instantiate(idx, "watershed_seg_or", img_type, img_type, img_ret_type, neighb_type) + #instantiate(idx, "laplacian", img_type, img_type, win_type) + #instantiate(idx, "fast_laplacian", img_type, img_type, win_type) def main(): if len(sys.argv) != 2:

1 0

oln 10.137: pconf.hh problem.
by Giovanni Palma 09 Apr '04

09 Apr '04

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ref/out/exdoc.config.in: Add include directory. Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Sat, 03 Apr 2004 23:17:34 +0200 thivol_d (oln/k/7_exdoc.conf 1.4 600) +++ doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 10:54:55 +0200 palma_g (oln/k/7_exdoc.conf 1.4 600) @@ -4,7 +4,7 @@ TAG_CLOSE = endcode CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers - OPTIONS = @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags + OPTIONS = @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_builddir@/olena -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags OUT = out # FIXME: should be obsolete EXT = cc # Extension of generated file STD_OUT_EXT = std # Extension of generated file standard output -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

10.136: Fixes on makefile.am's
by Damien Thivolle 08 Apr '04

08 Apr '04

Je sais, j'ai fait des trucs super moches, mais bon c'est provisoire, des que j'aurai maitrise les autotools, je corrigerai tout ca :) Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Fix compiler detection. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * doc/ref/Makefile.am: Add `CLEANFILES' variable to delete all the created files. +2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr> + * doc/ref/out/exdoc.config.in: Remove -DNEED_ROUND -DNEED_ROUNDF flags. 2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr> Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/oln/Makefile.am: Add forgotten files to the distribution. Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Sat, 03 Apr 2004 23:02:21 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.16 600) +++ doc/ref/Makefile.am Wed, 07 Apr 2004 11:39:33 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.17 600) @@ -7,7 +7,14 @@ EXDOC = $(srcdir)/exdoc.pl OUT_DIR = "out" IMG_CONV = $(srcdir)/img_conv.pl - +CLEANFILES = -r -- html.tar.gz \ + oln-ref.pdf \ + ./$(OUT_DIR)/out* \ + ./html \ + ./latex \ + ./img \ + ./$(OUT_DIR)/makefile \ + ./$(OUT_DIR)/all.mk doc: html.tar.gz oln-ref.pdf @@ -30,7 +37,7 @@ dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl dist-local: - rm -rf img/* out/* + rm -rf img/* MAINTAINERCLEANFILES = $(dist_noinst_DATA) \ ./html/* ./img/* ./$(OUT_DIR)/* Index: config/oln.m4 --- config/oln.m4 Sat, 03 Apr 2004 23:02:21 +0200 thivol_d (oln/j/15_oln.m4 1.37 600) +++ config/oln.m4 Sun, 04 Apr 2004 22:36:14 +0200 thivol_d (oln/j/15_oln.m4 1.38 600) @@ -435,7 +435,7 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep ' 3\.[34]' >/dev/null ; then + if $CXX --version | grep " 3\.$3\|4$" >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: olena/oln/Makefile.am --- olena/oln/Makefile.am Sun, 04 Apr 2004 16:48:06 +0200 odou_s (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.6 600) +++ olena/oln/Makefile.am Sun, 04 Apr 2004 18:34:45 +0200 thivol_d (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7 600) @@ -38,6 +38,8 @@ convol/fast_gaussian.hh \ convol/fast_gaussian.hxx \ convol/fast_gaussian_coefficient.hh \ + convol/nagao.hh \ + convol/nagao.hxx \ core/abstract/binary_image.hh \ core/abstract/behavior.hh \ core/abstract/dpoint.hh \ @@ -221,6 +223,8 @@ utils/buffer.hh \ utils/buffer.hxx \ utils/histogram.hh \ + utils/se_stat.hh \ + utils/se_stat.hxx \ utils/stat.hh \ utils/special_points.hh \ utils/timer.hh -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 2

oln 10.133: Maxy fixes
by Damien Thivolle 06 Apr '04

06 Apr '04

Pour que ca compile correctement, j'ai fait quelques modifs que je ne trouve pas du tout elegante, si quelqu'un a mieux a proposer, je suis preneur. Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Remove `-Werror' flag for g++-3.2. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * doc/ref/Makefile.am: Replace `make' by $(MAKE). * doc/ref/out/exdoc.config.in: Add -DNEED_ROUND -DNEED_ROUNDF flags to examples compilation. +2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr> + * ref/Makefile.am: Correct install-data-hook rule. 2004-03-25 Giovanni Palma <giovanni(a)lrde.epita.fr> Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/oln/Makefile.am: Add files. * olena/oln/morpher/generic_morpher.hh: Repair unmorph(). * olena/oln/morpher/color_morpher.hh: Correct comments. * olena/tests/morpher/tests/color_morph: Readd a test. +2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr> + * olena/oln/morpher/generic_morpher.hh: Inherit directly from oln::image. * olena/oln/morpher/subq_morpher.hh: Change inheritance system. * olena/oln/morpher/color_morpher.hh: Likewise. Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Sat, 03 Apr 2004 14:42:26 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.15 600) +++ doc/ref/Makefile.am Sat, 03 Apr 2004 22:55:16 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.15 600) @@ -15,7 +15,7 @@ doxy: $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img - cd $(OUT_DIR) && make -f makefile + cd $(OUT_DIR) && $(MAKE) -f makefile $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config @@ -30,7 +30,7 @@ dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl dist-local: - rm -f img/* + rm -rf img/* out/* MAINTAINERCLEANFILES = $(dist_noinst_DATA) \ ./html/* ./img/* ./$(OUT_DIR)/* Index: config/oln.m4 --- config/oln.m4 Fri, 08 Aug 2003 13:24:29 +0200 burrus_n (oln/j/15_oln.m4 1.36 600) +++ config/oln.m4 Sat, 03 Apr 2004 22:53:47 +0200 thivol_d (oln/j/15_oln.m4 1.36 600) @@ -435,10 +435,10 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep '^2\.' >/dev/null ; then - ac_cv_cxx_style=weakGNU - else + if $CXX --version | grep ' 3\.[34]' >/dev/null ; then ac_cv_cxx_style=GNU + else + ac_cv_cxx_style=weakGNU fi elif $CXX -V 2>&1 | grep -i "WorkShop">/dev/null 2>&1; then ac_cv_cxx_style=Sun @@ -468,7 +468,7 @@ _CXXFLAGS_DEBUG="-g" _CXXFLAGS_OPTIMIZE="-O2 -felide-constructors -funroll-loops" _CXXFLAGS_STRICT="-Wall -pedantic" - _CXXFLAGS_STRICT_ERRORS="-Wall -pedantic -Werror" + _CXXFLAGS_STRICT_ERRORS="-Wall -pedantic" ;; Sun) _CXXFLAGS_DEBUG="-g" Index: olena/oln/Makefile.am --- olena/oln/Makefile.am Tue, 30 Mar 2004 22:10:11 +0200 thivol_d (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.4 600) +++ olena/oln/Makefile.am Sat, 03 Apr 2004 22:42:17 +0200 thivol_d (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.4 600) @@ -157,6 +157,7 @@ morpho/closing.hh \ morpho/closing.inc \ morpho/dilation.hh \ + morpho/environments.hh \ morpho/erosion.hh \ morpho/extrema.hh \ morpho/extrema.hxx \ @@ -203,6 +204,8 @@ topo/inter-pixel/internal/dir-iter.hh \ topo/inter-pixel/internal/dir.hh \ topo/tarjan/flat-zone.hh \ + topo/tarjan/tarjan.hh \ + topo/tarjan/tarjan_with_attr.hh \ topo/tarjan/union.hh \ transforms/fft.hh \ transforms/dwt.hh \ Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Wed, 10 Mar 2004 16:20:23 +0100 palma_g (oln/k/7_exdoc.conf 1.2 600) +++ doc/ref/out/exdoc.config.in Sat, 03 Apr 2004 22:55:44 +0200 thivol_d (oln/k/7_exdoc.conf 1.2 600) @@ -4,7 +4,7 @@ TAG_CLOSE = endcode CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers - OPTIONS = @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags + OPTIONS = -DNEED_ROUND -DNEED_ROUNDF @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags OUT = out # FIXME: should be obsolete EXT = cc # Extension of generated file STD_OUT_EXT = std # Extension of generated file standard output Index: olena/oln/morpher/generic_morpher.hh --- olena/oln/morpher/generic_morpher.hh Sat, 03 Apr 2004 14:42:26 +0200 thivol_d (oln/m/18_generic_mo 1.5 600) +++ olena/oln/morpher/generic_morpher.hh Sat, 03 Apr 2004 22:44:20 +0200 thivol_d (oln/m/18_generic_mo 1.5 600) @@ -65,6 +65,32 @@ namespace abstract { + template <unsigned Dim, class T> + struct dest_type; + + template <class T> + struct dest_type<1, T> + { + typedef image1d<T> ret; + }; + + + template <class T> + struct dest_type<2, T> + { + typedef image2d<T> ret; + }; + + + template <class T> + struct dest_type<3, T> + { + typedef image3d<T> ret; + }; + + + + /*! The Abstract morpher class. ** ** Define a default implementation for all the @@ -80,7 +106,7 @@ template <class SrcType, class Exact> class generic_morpher : public oln::abstract::image_with_impl<typename image_id<Exact>::impl_type, - typename image_id<Exact>::exact_type> + Exact> { protected: @@ -119,10 +145,7 @@ /// The morpher underlying implementation. typedef typename image_traits<exact_type>::impl_type impl_type; - typedef oln::image<image_traits<exact_type>::dim, - value_type, - impl_type, - mlc::final> DestType; + typedef typename dest_type<image_traits<exact_type>::dim, value_type>::ret DestType; /// Type of the decorated image. typedef SrcType src_self_type; @@ -159,6 +182,19 @@ return ima_; } + /// Instantiate and return the image that the morpher is simulating. + DestType + unmorph() const + { + DestType res(to_exact(*this).size()); + oln_iter_type(DestType) it(res); + + for_all(it) + res[it] = (*this)[it]; + return res; + } + + /*! Default implementation of at. ** ** Return the value stored at \a p in the decorated image. @@ -169,7 +205,7 @@ const src_value_type at(const src_point_type& p) const { - return to_exact(ima_).at(p); + return ima_[p]; } /*! Default implementation of at. @@ -182,31 +218,31 @@ src_value_type& at(const src_point_type& p) { - return to_exact(ima_).at(p); + return ima_[p]; } /// Default implementation of impl. const src_impl_type* impl() const { - return to_exact(ima_).impl(); + return ima_.impl(); } /// Default implementation of impl. src_impl_type* impl() { - return to_exact(ima_).impl(); + return ima_.impl(); } /*! Default implementation of clone_. ** ** Return a copy of the decorated image. */ - src_self_type + src_exact_type clone_() const { - return to_exact(ima_).clone_(); + return to_exact(ima_).clone(); } /*! Default implementation of npoints_. @@ -216,7 +252,7 @@ size_t npoints_() { - return to_exact(ima_).npoints_(); + return to_exact(ima_).npoints(); } /*! Default implementation of assign. Index: olena/oln/morpher/color_morpher.hh --- olena/oln/morpher/color_morpher.hh Sat, 03 Apr 2004 14:42:26 +0200 thivol_d (oln/m/26_color_morp 1.3 600) +++ olena/oln/morpher/color_morpher.hh Sat, 03 Apr 2004 19:25:42 +0200 thivol_d (oln/m/26_color_morp 1.3 600) @@ -72,7 +72,7 @@ /*! \brief Specialized version for color_morpher. ** - ** \param I The type of the decorated image. + ** \param SrcType The type of the decorated image. ** ** \param Exact The exact type of the object. */ @@ -89,8 +89,6 @@ /*! \brief Abstract color_morpher class used for ** code factorization. ** - ** \param DestType Output type of the morpher. - ** ** \param SrcType Input type decorated. ** ** \param Exact Exact type Index: olena/tests/morpher/tests/color_morph --- olena/tests/morpher/tests/color_morph Sat, 03 Apr 2004 14:42:26 +0200 thivol_d (oln/m/45_color_morp 1.2 600) +++ olena/tests/morpher/tests/color_morph Sat, 03 Apr 2004 22:39:14 +0200 thivol_d (oln/m/45_color_morp 1.2 600) @@ -37,8 +37,7 @@ fail = fail | (oln::utils::md5(oln::morpher::bmorph(imc)) != oln::utils::key(data_key_c_b)); fail = fail | (oln::utils::md5(oln::morpher::rmorph(imc_const)) != oln::utils::key(data_key_c_r)); fail = fail | (oln::utils::md5(mimd) != oln::utils::md5(mimc)); -// remove comments when it works ... -// fail = fail | (oln::utils::md5(*(oln::morpher::rmorph(imc).unmorph())) != oln::utils::key(data_key_c_r)); + fail = fail | (oln::utils::md5(oln::morpher::rmorph(imc).unmorph()) != oln::utils::key(data_key_c_r)); if (!fail) -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

3 2

oln 10.134: 10.133 Fix
by Damien Thivolle 06 Apr '04

06 Apr '04

Désolé pour ce mini checkin, mais je ne sais pas trop comment résoudre ce problème. Si la machine est équipée des fonctions round() et roundf(), alors `-DNEED_ROUND'et `-DNEED_ROUNDF' posent problème car les 2 fonctions sont définies 2 fois; si la machine n'est pas équipée des fonctions round() et roundf(), alors si `-DNEED_ROUNDF' et `-DNEED_ROUND' ne sont pas présentes, ca ne compile pas non plus. Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Sat, 03 Apr 2004 23:02:21 +0200 thivol_d (oln/k/7_exdoc.conf 1.3 600) +++ doc/ref/out/exdoc.config.in Sat, 03 Apr 2004 23:15:51 +0200 thivol_d (oln/k/7_exdoc.conf 1.3 600) @@ -4,7 +4,7 @@ TAG_CLOSE = endcode CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers - OPTIONS = -DNEED_ROUND -DNEED_ROUNDF @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags + OPTIONS = @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags OUT = out # FIXME: should be obsolete EXT = cc # Extension of generated file STD_OUT_EXT = std # Extension of generated file standard output -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

4 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2004