[Olena-patches] oln 10.143: Repairing swilena 2

Index: tools/swilena/meta/swilena_ntg.i --- tools/swilena/meta/swilena_ntg.i Sun, 11 Apr 2004 19:23:53 +0200 thivol_d (oln/s/33_swilena_nt 1.8 600) +++ tools/swilena/meta/swilena_ntg.i Sun, 11 Apr 2004 19:37:17 +0200 van-vl_n (oln/s/33_swilena_nt 1.8 600) @@ -157,7 +157,7 @@ }; %enddef -%define decl_complex(do_nothing) +%define decl_complex template<typename repr, typename T> class cplx { @@ -186,7 +186,7 @@ %enddef // Swig preprocessor does not understand empty call to macros. -%define decl_ntg(do_nothing) +%define decl_ntg %include <ntg/vect/cplx_representation.hh> %include <ntg/core/predecls.hh> %{ @@ -202,12 +202,12 @@ decl_scalar_class(ntg, int_s, long) decl_bin_class(ntg, bin, bool) - decl_complex(do_nothing) + decl_complex } %enddef -decl_ntg(do_nothing) +decl_ntg /* 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 Sun, 11 Apr 2004 19:23:53 +0200 thivol_d (oln/s/34_swilena_mo 1.3 600) +++ tools/swilena/meta/swilena_morpho.i Sun, 11 Apr 2004 19:37:40 +0200 van-vl_n (oln/s/34_swilena_mo 1.3 600) @@ -182,7 +182,7 @@ Declare generic functions for classical algorithms */ -%define decl_classical_family(do_nothing) +%define decl_classical_family 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(do_nothing) +%define decl_extrema_killer_family 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(do_nothing) +%define decl_watershed_family 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(do_nothing) -decl_watershed_family(do_nothing) -decl_extrema_killer_family(do_nothing) +decl_classical_family +decl_watershed_family +decl_extrema_killer_family Index: tools/swilena/meta/swilena_exception.i --- tools/swilena/meta/swilena_exception.i Sun, 11 Apr 2004 19:23:53 +0200 thivol_d (oln/s/37_swilena_ex 1.3 600) +++ tools/swilena/meta/swilena_exception.i Sun, 11 Apr 2004 19:37:52 +0200 van-vl_n (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(do_nothing) +%define START_PROTECT %exception { try { $action @@ -26,8 +26,8 @@ } %enddef -%define END_PROTECT(do_nothing) +%define END_PROTECT %exception; %enddef -START_PROTECT(do_nothing) +START_PROTECT Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Sun, 11 Apr 2004 19:23:53 +0200 thivol_d (oln/v/24_generate_m 1.5 700) +++ tools/swilena/generate_morpho_instantiations.py Sun, 11 Apr 2004 19:25:22 +0200 van-vl_n (oln/v/24_generate_m 1.5 700) @@ -61,7 +61,6 @@ idx = (dim - 1) * 6 + dict_num_type[type] - print idx # FIXME: these algorithms do not work with floats if type != "ntg_float": instantiate(idx, "erosion", img_type, img_type, win_type)