- Olena-patches

oln 10.142: Repairing swilena
by Damien Thivolle 19 Apr '04

19 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Add support for ruby-1.7, ruby-1.8. Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/oln/core/point2d.hh: Add header include. * olena/oln/core/point2d.hxx: Likewise. * olena/oln/core/point3d.hh: Likewise. * olena/oln/core/point3d.hxx: Likewise. Index: tools/swilena/ChangeLog -2004-10-04 Niels Van Vliet <niels(a)lrde.epita.fr> +2004-04-11 Damien Thivolle <damien(a)lrde.epita.fr> - * tools/swilena/meta/swilena_structelt.i: Fix a bug. - * tools/swilena/doc/swilena.texi: Fix a bug. - * tools/swilena/python/Makefile.am: Add clean_local. + * swilena/expand.sh: Split morpho modules to make the code compile + faster. + * swilena/generate_morpho_instantiations.py: Likewise. + * swilena/meta/swilena_ntg.i: Add `do_nothing' argument to empty SWIG + macros since the SWIG preprocessor does not support them. + * swilena/meta/swilena_morpho.i: Likewise. + +2004-04-10 Niels Van Vliet <niels(a)lrde.epita.fr> + + * swilena/meta/swilena_structelt.i: Fix a bug. + * swilena/doc/swilena.texi: Fix a bug. + * swilena/python/Makefile.am: Add clean_local. 2004-01-26 Astrid Wang <astrid(a)lrde.epita.fr> Index: configure.ac --- configure.ac Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.1 600) +++ configure.ac Fri, 09 Apr 2004 19:14:02 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.2 600) @@ -416,7 +416,7 @@ AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h]) AC_ARG_WITH([ruby-includedir], [Include path for ruby.h], [RUBY_CPPFLAGS="-I$withval"], - [RUBY_CPPFLAGS="-I/usr/lib/ruby/1.6/i386-linux"]) + [RUBY_CPPFLAGS="-I/usr/lib/ruby/1.6/i386-linux -I/usr/lib/ruby/1.7/i386-linux -I/usr/lib/ruby/1.8/i386-linux"]) CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, Index: olena/oln/core/point2d.hh --- olena/oln/core/point2d.hh Mon, 29 Mar 2004 09:26:50 +0200 odou_s (oln/c/30_point2d.hh 1.14 600) +++ olena/oln/core/point2d.hh Sun, 11 Apr 2004 19:09:24 +0200 thivol_d (oln/c/30_point2d.hh 1.15 600) @@ -29,7 +29,7 @@ # define OLENA_CORE_POINT2D_HH # include <oln/core/coord.hh> -# include <oln/core/abstract/point.hh> +# include <oln/core/point1d.hh> # include <iostream> namespace oln { Index: olena/oln/core/point2d.hxx --- olena/oln/core/point2d.hxx Mon, 29 Mar 2004 09:26:50 +0200 odou_s (oln/c/29_point2d.hx 1.7 600) +++ olena/oln/core/point2d.hxx Sun, 11 Apr 2004 19:16:23 +0200 thivol_d (oln/c/29_point2d.hx 1.8 600) @@ -28,6 +28,7 @@ #ifndef OLENA_CORE_POINT2D_HXX # define OLENA_CORE_POINT2D_HXX +# include <oln/core/point1d.hh> # include <oln/core/dpoint2d.hh> # include <iostream> Index: olena/oln/core/point3d.hh --- olena/oln/core/point3d.hh Mon, 29 Mar 2004 09:26:50 +0200 odou_s (oln/c/28_point3d.hh 1.16 600) +++ olena/oln/core/point3d.hh Sun, 11 Apr 2004 19:09:05 +0200 thivol_d (oln/c/28_point3d.hh 1.17 600) @@ -30,7 +30,7 @@ # include <ntg/core/predecls.hh> # include <oln/core/coord.hh> -# include <oln/core/abstract/point.hh> +# include <oln/core/point2d.hh> # include <iostream> Index: olena/oln/core/point3d.hxx --- olena/oln/core/point3d.hxx Mon, 29 Mar 2004 09:26:50 +0200 odou_s (oln/c/27_point3d.hx 1.6 600) +++ olena/oln/core/point3d.hxx Sun, 11 Apr 2004 19:16:31 +0200 thivol_d (oln/c/27_point3d.hx 1.7 600) @@ -28,6 +28,7 @@ #ifndef OLENA_CORE_POINT3D_HXX # define OLENA_CORE_POINT3D_HXX +# include <oln/core/point2d.hh> # include <oln/core/dpoint3d.hh> # include <iostream> Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/s/25_expand.sh 1.12 700) +++ tools/swilena/expand.sh Sun, 11 Apr 2004 17:54:54 +0200 thivol_d (oln/s/25_expand.sh 1.13 700) @@ -45,8 +45,12 @@ make_image(image${dim}d_float, $dim, ntg_float, ntg_float_value) EOF + TYPES="ntg_bin ntg_int_u8 ntg_int_u32 ntg_int_s8 ntg_int_s32 ntg_float" + ## Morpho algorithms - MODULES="$MODULES morpho${dim}d" + for types in $TYPES; do + MODULES="$MODULES morpho${dim}d_${types}" + done $SWILENA/generate_morpho_instantiations.py $SWILENA/src ## Arith @@ -114,7 +118,7 @@ sdir=meta fi echo "swilena_${mod}_wrap.cxx swilena_${mod}.py: \$(srcdir)/../$sdir/swilena_${mod}.i" - echo -e "\t\$(SWIG) -c -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" + echo -e "\t\$(SWIG) -noruntime -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" echo done } Index: tools/swilena/meta/swilena_ntg.i --- tools/swilena/meta/swilena_ntg.i Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/s/33_swilena_nt 1.7 600) +++ tools/swilena/meta/swilena_ntg.i Sun, 11 Apr 2004 19:10:54 +0200 thivol_d (oln/s/33_swilena_nt 1.8 600) @@ -157,7 +157,7 @@ }; %enddef -%define decl_complex() +%define decl_complex(do_nothing) template<typename repr, typename T> class cplx { @@ -185,7 +185,8 @@ }; %enddef -%define decl_ntg() +// Swig preprocessor does not understand empty call to macros. +%define decl_ntg(do_nothing) %include <ntg/vect/cplx_representation.hh> %include <ntg/core/predecls.hh> %{ @@ -201,12 +202,12 @@ decl_scalar_class(ntg, int_s, long) decl_bin_class(ntg, bin, bool) - decl_complex() + decl_complex(do_nothing) } %enddef -decl_ntg() +decl_ntg(do_nothing) /* Macro are defined for every type and should be used in all modules Index: tools/swilena/meta/swilena_morpho.i --- tools/swilena/meta/swilena_morpho.i Sat, 27 Sep 2003 19:02:23 +0200 burrus_n (oln/s/34_swilena_mo 1.2 600) +++ tools/swilena/meta/swilena_morpho.i Sun, 11 Apr 2004 16:03:09 +0200 thivol_d (oln/s/34_swilena_mo 1.3 600) @@ -182,7 +182,7 @@ Declare generic functions for classical algorithms */ -%define decl_classical_family() +%define decl_classical_family(do_nothing) decl_morpho_2(<oln/morpho/erosion.hh>, erosion, 1) decl_morpho_2(<oln/morpho/dilation.hh>, dilation, 1) decl_morpho_2(<oln/morpho/opening.hh>, opening, 1) @@ -237,7 +237,7 @@ | Extrema killer family | `----------------------*/ -%define decl_extrema_killer_family() +%define decl_extrema_killer_family(do_nothing) decl_morpho_extrema_killer(<oln/morpho/extrema_killer.hh>, sure_maxima_killer) decl_morpho_extrema_killer(<oln/morpho/extrema_killer.hh>, @@ -252,12 +252,12 @@ | Watershed family | `-----------------*/ -%define decl_watershed_family() +%define decl_watershed_family(do_nothing) decl_morpho_watershed(watershed_seg) decl_morpho_watershed(watershed_con) decl_morpho_3(<oln/morpho/watershed.hh>, watershed_seg_or, 0) %enddef -decl_classical_family() -decl_watershed_family() -decl_extrema_killer_family() +decl_classical_family(do_nothing) +decl_watershed_family(do_nothing) +decl_extrema_killer_family(do_nothing) Index: tools/swilena/meta/swilena_exception.i --- tools/swilena/meta/swilena_exception.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/37_swilena_ex 1.2 600) +++ tools/swilena/meta/swilena_exception.i Sun, 11 Apr 2004 15:38:57 +0200 thivol_d (oln/s/37_swilena_ex 1.3 600) @@ -9,7 +9,7 @@ // Olena uses classes that derive from std::exception. Declare it. namespace std { class exception { public: const char *what() const; }; } -%define START_PROTECT() +%define START_PROTECT(do_nothing) %exception { try { $action @@ -26,8 +26,8 @@ } %enddef -%define END_PROTECT() +%define END_PROTECT(do_nothing) %exception; %enddef -START_PROTECT() +START_PROTECT(do_nothing) Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/24_generate_m 1.4 700) +++ tools/swilena/generate_morpho_instantiations.py Sun, 11 Apr 2004 17:47:33 +0200 thivol_d (oln/v/24_generate_m 1.5 700) @@ -3,6 +3,10 @@ import sys files = [] +dict_type_num = {1: "ntg_bin", 2: "ntg_int_u8", 3: "ntg_int_u32", + 4: "ntg_int_s8", 5: "ntg_int_s32", 6: "ntg_float"} +dict_num_type = {"ntg_bin": 1, "ntg_int_u8": 2, "ntg_int_u32": 3, + "ntg_int_s8": 4, "ntg_int_s32": 5, "ntg_float": 6} def close_files(): for file in files: @@ -10,14 +14,18 @@ def open_files(path): for dim in range(1, 4): - files.append(open(path + "/swilena_morpho%(dim)sd.i" % vars(), 'w')) + for type in range(1, 7): + str_type = dict_type_num[type] + files.append(open(path + "/swilena_morpho%(dim)sd_%(str_type)s.i" % vars(), 'w')) def write_headers(): for dim in range(1, 4): - file = files[dim - 1] + for type in range(1, 7): + str_type = dict_type_num[type] + file = files[(dim - 1)* 6 + type - 1] file.write("""// Note: this file was generated by generate_morpho.py. -%%module swilena_morpho%(dim)sd +%%module swilena_morpho%(dim)sd_%(str_type)s %%include swilena_exception.i @@ -30,8 +38,8 @@ """ % vars()) -def instantiate(dim, algorithm, *args): - file = files[dim - 1] +def instantiate(idx, algorithm, *args): + file = files[idx - 1] swilena_algorithm = "my_" + algorithm params = args[0] for param in args[1:]: @@ -51,77 +59,80 @@ win_type = "::oln::window%(dim)sd" % vars() neighb_type = "::oln::neighborhood%(dim)sd" % vars() + idx = (dim - 1) * 6 + dict_num_type[type] + + print idx # FIXME: these algorithms do not work with floats if type != "ntg_float": - instantiate(dim, "erosion", img_type, img_type, win_type) - instantiate(dim, "fast_erosion", img_type, img_type, win_type) + instantiate(idx, "erosion", img_type, img_type, win_type) + instantiate(idx, "fast_erosion", img_type, img_type, win_type) - instantiate(dim, "dilation", img_type, img_type, win_type) - instantiate(dim, "fast_dilation", img_type, img_type, win_type) + instantiate(idx, "dilation", img_type, img_type, win_type) + instantiate(idx, "fast_dilation", img_type, img_type, win_type) - instantiate(dim, "opening", img_type, img_type, win_type) - instantiate(dim, "fast_opening", img_type, img_type, win_type) + instantiate(idx, "opening", img_type, img_type, win_type) + instantiate(idx, "fast_opening", img_type, img_type, win_type) - instantiate(dim, "closing", img_type, img_type, win_type) - instantiate(dim, "fast_closing", img_type, img_type, win_type) + instantiate(idx, "closing", img_type, img_type, win_type) + instantiate(idx, "fast_closing", img_type, img_type, win_type) - instantiate(dim, "thickening", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_thickening", img_type, img_type, win_type, win_type) + instantiate(idx, "thickening", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_thickening", img_type, img_type, win_type, win_type) - instantiate(dim, "thinning", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_thinning", img_type, img_type, win_type, win_type) + instantiate(idx, "thinning", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_thinning", img_type, img_type, win_type, win_type) - instantiate(dim, "geodesic_erosion", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sure_geodesic_erosion", img_type, img_type, img_type, neighb_type) + instantiate(idx, "geodesic_erosion", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sure_geodesic_erosion", img_type, img_type, img_type, neighb_type) - instantiate(dim, "geodesic_dilation", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sure_geodesic_dilation", img_type, img_type, img_type, neighb_type) + instantiate(idx, "geodesic_dilation", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sure_geodesic_dilation", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sure_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sequential_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - instantiate(dim, "hybrid_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sure_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sequential_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) + instantiate(idx, "hybrid_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sure_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - instantiate(dim, "sequential_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - instantiate(dim, "hybrid_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sure_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) + instantiate(idx, "sequential_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) + instantiate(idx, "hybrid_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - instantiate(dim, "hit_or_miss", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_hit_or_miss", img_type, img_type, win_type, win_type) + instantiate(idx, "hit_or_miss", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_hit_or_miss", img_type, img_type, win_type, win_type) - instantiate(dim, "hit_or_miss_opening", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_hit_or_miss_opening", img_type, img_type, win_type, win_type) + instantiate(idx, "hit_or_miss_opening", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_hit_or_miss_opening", img_type, img_type, win_type, win_type) - instantiate(dim, "hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) + instantiate(idx, "hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) - instantiate(dim, "hit_or_miss_closing", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_hit_or_miss_closing", img_type, img_type, win_type, win_type) + instantiate(idx, "hit_or_miss_closing", img_type, img_type, win_type, win_type) + instantiate(idx, "fast_hit_or_miss_closing", img_type, img_type, win_type, win_type) - instantiate(dim, "hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) - instantiate(dim, "fast_hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) + 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 if type != "ntg_bin": - instantiate(dim, "beucher_gradient", img_type, img_type, win_type) - instantiate(dim, "fast_beucher_gradient", img_type, img_type, win_type) + instantiate(idx, "beucher_gradient", img_type, img_type, win_type) + instantiate(idx, "fast_beucher_gradient", img_type, img_type, win_type) - instantiate(dim, "internal_gradient", img_type, img_type, win_type) - instantiate(dim, "fast_internal_gradient", img_type, img_type, win_type) + instantiate(idx, "internal_gradient", img_type, img_type, win_type) + instantiate(idx, "fast_internal_gradient", img_type, img_type, win_type) - instantiate(dim, "external_gradient", img_type, img_type, win_type) - instantiate(dim, "fast_external_gradient", img_type, img_type, win_type) + instantiate(idx, "external_gradient", img_type, img_type, win_type) + instantiate(idx, "fast_external_gradient", img_type, img_type, win_type) - instantiate(dim, "white_top_hat", img_type, img_type, win_type) - instantiate(dim, "fast_white_top_hat", img_type, img_type, win_type) + instantiate(idx, "white_top_hat", img_type, img_type, win_type) + instantiate(idx, "fast_white_top_hat", img_type, img_type, win_type) - instantiate(dim, "black_top_hat", img_type, img_type, win_type) - instantiate(dim, "fast_black_top_hat", img_type, img_type, win_type) + instantiate(idx, "black_top_hat", img_type, img_type, win_type) + instantiate(idx, "fast_black_top_hat", img_type, img_type, win_type) - instantiate(dim, "self_complementary_top_hat", img_type, img_type, win_type) - instantiate(dim, "fast_self_complementary_top_hat", img_type, img_type, win_type) + instantiate(idx, "self_complementary_top_hat", img_type, img_type, win_type) + instantiate(idx, "fast_self_complementary_top_hat", img_type, img_type, win_type) - instantiate(dim, "top_hat_contrast_op", img_type, img_type, win_type) - instantiate(dim, "fast_top_hat_contrast_op", img_type, img_type, win_type) + 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": -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 4

oln 10.139: Fixes for g++-3.2 and the documentation generation
by Damien Thivolle 19 Apr '04

19 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Add a workaround for some versions of cc1plus. Add new variable `DOC_CPPFLAGS' for the documentation generation. * config/oln.m4: Readd normal flags for g++-3.2 Add `DOC_CPPFLAGS ' affectation. +2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr> + * cleanup.sh: Replace `-or' by `-o' which is more portable. * config/oln.m4: Improve quoting. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * doc/ref/Makefile.am: Remove MY_CPPFLAGS. * doc/ref/exdoc.pl: Likewise. * doc/ref/out/exdoc.config.in: Remove the use of the third argument. The script directly use the `DOC_CPPFLAGS' variable. +2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr> + * doc/ref/Makefile.am: Fix files cleaning. Add MY_CPPFLAGS=... when running make on out/makefile. * doc/ref/exdoc.pl: Add a third argument to the generated scripts. Index: configure.ac --- configure.ac Mon, 29 Mar 2004 00:39:14 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16 600) +++ configure.ac Fri, 09 Apr 2004 16:51:18 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.17 600) @@ -436,6 +436,18 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) + +# Workaround for old versions of cc1plus. + +if test x"$srcdir" = x. ; then + DEFAULT_INCLUDES=-I. +else + DEFAULT_INCLUDES="-I. -I\$(srcdir)" +fi +AC_SUBST([DEFAULT_INCLUDES]) +AC_SUBST([DOC_CPPFLAGS]) + + AC_OUTPUT if test "x$oln_cxxflags_clean" = xno; then Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.18 600) +++ doc/ref/Makefile.am Fri, 09 Apr 2004 16:07:11 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.19 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 MY_CPPFLAGS="$(CPPFLAGS)" + cd $(OUT_DIR) && $(MAKE) -f makefile $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config Index: config/oln.m4 --- config/oln.m4 Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/j/15_oln.m4 1.39 600) +++ config/oln.m4 Fri, 09 Apr 2004 16:48:18 +0200 thivol_d (oln/j/15_oln.m4 1.40 600) @@ -350,6 +350,7 @@ CPPFLAGS=$oln_save_CPPFLAGS]) if test "x$[]oln_cv_$1_flags" = xredef; then CPPFLAGS="$CPPFLAGS -DNEED_$2" + DOC_CPPFLAGS="$DOC_CPPFLAGS -DNEED_$2" elif test "x$[]oln_cv_$1_flags" = xisodef; then CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE=1" fi @@ -435,7 +436,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\.[234]'] >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: doc/ref/exdoc.pl --- doc/ref/exdoc.pl Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/v/26_exdoc.pl 1.5 700) +++ doc/ref/exdoc.pl Fri, 09 Apr 2004 16:07:29 +0200 thivol_d (oln/v/26_exdoc.pl 1.6 700) @@ -254,7 +254,7 @@ print $makefile "chmod 700 ./\$<.cmd "; print $makefile "&& eval ./\$@."; print $makefile $config[$i]{"ext"}; - print $makefile ".cmd \$< \$@ \"\$(MY_CPPFLAGS)\""; + print $makefile ".cmd \$< \$@"; print $makefile "\n\n"; } Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 13:01:18 +0200 thivol_d (oln/k/7_exdoc.conf 1.6 600) +++ doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 16:07:42 +0200 thivol_d (oln/k/7_exdoc.conf 1.7 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 = $3 @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 + OPTIONS = @DOC_CPPFLAGS@ @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 -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

3 4

ChangeLog
by Akim Demaille 19 Apr '04

19 Apr '04

Merci de prendre soin dans la rédaction des ChangeLogs. Récemment la qualité a baissé, et ce n'est pas rendre service aux mainteneurs que de continuer ainsi. Je vous rappelle cette page : http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/ChangeLogs

1 0

oln 10.140: An error has occured in the prcs repository
by Damien Thivolle 19 Apr '04

19 Apr '04

Je sais pas ce que j'ai fait, mais on pouvait plus faire de checkout des versions 10.138 et 10.139. Je suis reparti de la 10.137 et j'ai refait les modifs. Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * cleanup.sh: Replace `-or' by `-o' to improve portability. * configure.ac: Add `DOC_CPPFLAGS' substitution. * config/oln.m4: Add `DOC_CPPFLAGS' variable. Improve portability. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to delete files. * doc/ref/out/exdoc.config.in: Add `DOC_CPPFLAGS' to the compilation flags. Index: cleanup.sh --- cleanup.sh Mon, 03 Mar 2003 18:06:54 +0100 burrus_n (oln/o/29_cleanup.sh 1.5 700) +++ cleanup.sh Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/o/29_cleanup.sh 1.5.1.1 700) @@ -2,16 +2,16 @@ { find . -name \*~ \ - -or -name \*\# \ - -or -name .\#\* \ - -or -name \*.log \ - -or -name diffs.patch + -o -name \*\# \ + -o -name .\#\* \ + -o -name \*.log \ + -o -name diffs.patch echo "olena/oln/config/pconf-inc.in" echo "olena/oln/config/pconf.inc" echo "olena/oln/config/pconf.hh" } | xargs rm -f find . -name autom4te.cache \ - -or -name .libs \ - -or -name .deps \ + -o -name .libs \ + -o -name .deps \ | xargs rm -rf Index: configure.ac --- configure.ac Mon, 29 Mar 2004 00:39:14 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16 600) +++ configure.ac Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.1 600) @@ -436,6 +436,8 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) +AC_SUBST([DOC_CPPFLAGS]) + AC_OUTPUT if test "x$oln_cxxflags_clean" = xno; then Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Wed, 07 Apr 2004 19:04:46 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.17 600) +++ doc/ref/Makefile.am Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.17.1.1 600) @@ -7,14 +7,8 @@ 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 +CLEANFILES = html.tar.gz \ + oln-ref.pdf doc: html.tar.gz oln-ref.pdf @@ -36,11 +30,15 @@ dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl -dist-local: - rm -rf img/* +clean-local: + rm -rf img out/out* html latex out/makefile out/all.mk + +distclean-local: + rm -f out/exdoc.config + MAINTAINERCLEANFILES = $(dist_noinst_DATA) \ - ./html/* ./img/* ./$(OUT_DIR)/* + ./html/* ./img/* # ### # ### What gets installed. Index: config/oln.m4 --- config/oln.m4 Wed, 07 Apr 2004 19:04:46 +0200 thivol_d (oln/j/15_oln.m4 1.38 600) +++ config/oln.m4 Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.1 600) @@ -350,6 +350,7 @@ CPPFLAGS=$oln_save_CPPFLAGS]) if test "x$[]oln_cv_$1_flags" = xredef; then CPPFLAGS="$CPPFLAGS -DNEED_$2" + DOC_CPPFLAGS="$DOC_CPPFLAGS -DNEED_$2" elif test "x$[]oln_cv_$1_flags" = xisodef; then CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE=1" fi @@ -435,7 +436,7 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep " 3\.$3\|4$" >/dev/null ; then + if $CXX --version | grep [' 3\.[234]'] >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 10:59:55 +0200 palma_g (oln/k/7_exdoc.conf 1.5 600) +++ doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/k/7_exdoc.conf 1.5.1.1 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_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 + OPTIONS = @DOC_CPPFLAGS@ @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 -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 1

oln 10.174: Correct NEWS
by Niels Van Vliet 15 Apr '04

15 Apr '04

Index: ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * NEWS: Correct English. Index: NEWS --- NEWS Thu, 15 Apr 2004 18:13:03 +0200 thivol_d (oln/0_NEWS 1.22 600) +++ NEWS Thu, 15 Apr 2004 19:42:49 +0200 van-vl_n (oln/0_NEWS 1.22 600) @@ -1,20 +1,18 @@ Olena 0.10 April 15, 2004 - * New documentaion system. + * New documentation system. Now any comment should use doxygen style (i.e. /*! ... */). - You can also put some code in comments to make them - compile at documentation generation time. It is useful to - illustrate some algorithm with concrete input and output. To - use this feature the only thing to be done is to put the - code into \code and \endcode tags. If you produce an image, - you can include it in the comments with the \image command, - using the same name you used to produce it, but with the png - extension. To make sure your image will not overwrite - another existing one, you should name it taking care of + You can also write some programs inside the comments. They are + compiled at documentation generation time. It is useful to + illustrate some algorithms with concrete input and output. To + use this feature the program has to be between \code and \endcode + tags. If you produce an image, you can include it in the comments + with the \image command, using the same name you used to produce + it, but with the png extension. To make sure your image will not + overwrite another existing one, you should name it taking care of the namespace you are using: e.g. if you comment the function - oln::boo::bar::fun, an image should be named oln_foo_bar_fun.ppm - It can be added that two macros are provided to make abstraction - of input and output directories, they are named IMG_IN and IMG_OUT. + oln::boo::bar::fun, the image should be named oln_foo_bar_fun.ppm. + The macros IMG_IN and IMG_OUT correspond to the path of the images. * Border behavior can be controlled with the behavior hierarchy. If an algorithm support it, you can choose the way the image

1 0

oln 10.168: Add a '.i' to the dist
by Niels Van Vliet 15 Apr '04

15 Apr '04

Index: doc/ChangeLog -2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr> +2004-04-15 Niels Van Vliet <niels(a)lrde.epita.fr> * doc/ref/Makefile.am: Changed 'make' to '$(MAKE)' Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * tools/swilena/meta/Makefile.am: Add swilena_ntg_macros.i to the dist. Index: tools/swilena/meta/Makefile.am --- tools/swilena/meta/Makefile.am Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/s/26_Makefile.a 1.3 600) +++ tools/swilena/meta/Makefile.am Thu, 15 Apr 2004 15:35:01 +0200 van-vl_n (oln/s/26_Makefile.a 1.3 600) @@ -3,6 +3,7 @@ EXTRA_DIST = swilena_core.i swilena_decl.i swilena_describe.i \ swilena_exception.i swilena_image.i swilena_imagesize.i \ swilena_morpho.i swilena_arith.i swilena_conversions.i \ - swilena_ntg.i swilena_point.i \ + swilena_ntg.i swilena_ntg_macros.i swilena_point.i \ swilena_structelt.i \ swilena_w_win.i +

1 0

oln 10.166: make -> $(MAKE)
by Niels Van Vliet 15 Apr '04

15 Apr '04

Index: doc/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * doc/ref/Makefile.am: Changed 'make' to '$(MAKE)' Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Tue, 13 Apr 2004 14:42:20 +0200 palma_g (oln/d/51_Makefile.a 1.27.1.17.1.3 600) +++ doc/ref/Makefile.am Thu, 15 Apr 2004 15:21:39 +0200 van-vl_n (oln/d/51_Makefile.a 1.27.1.17.1.3 600) @@ -33,7 +33,7 @@ $(TAR) -czf $@ html oln-ref.pdf: html.tar.gz - make -C ./latex || echo "Discarding problems..." # FIXME: Find a better way to use large graph with pdflatex. + $(MAKE) -C ./latex || echo "Discarding problems..." # FIXME: Find a better way to use large graph with pdflatex. cp latex/refman.pdf ./$@ dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl

1 0

oln 10.158: Fix doxygen detection
by Damien Thivolle 14 Apr '04

14 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Remove doxygen detection when ./configure is run with `--without-doc'. Index: configure.ac --- configure.ac Tue, 13 Apr 2004 17:38:53 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.4 600) +++ configure.ac Wed, 14 Apr 2004 16:41:06 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.4 600) @@ -235,8 +235,12 @@ ### The reference manual uses Doxygen ### FIXME: could be much better. -AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen]) + AC_ARG_WITH([doc], + [Doxygen is needed to build the doc], + [], + [AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen]) AC_CHECK_DOXYGEN_VERSION + ]) ## if test -z "$DOXYGEN"; then ## AC_MSG_WARN([`doxygen' not found -- `doxygen' must be installed to generate the documentation]) -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

1 0

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