Olena-patches April 2004

olena-patches@lrde.epita.fr

8 participants
59 discussions

oln 10.147: Swig, python, ruby versions detection
by Damien Thivolle 20 Apr '04

20 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Check the swig version to choose between -c and -noruntime flag. Make the python and ruby libraries path detection more efficient. * config/oln.m4: Add `AC_CHECK_SWIG_FLAGS' macros. * tools/swilena/expand.sh: Use `SWIG_FLAGS' variable. +2004-04-11 Damien Thivolle <damien(a)lrde.epita.fr> + * configure.ac: Add support for ruby-1.7, ruby-1.8. 2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr> Index: configure.ac --- configure.ac Sun, 11 Apr 2004 19:23:53 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.2 600) +++ configure.ac Mon, 12 Apr 2004 19:17:34 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.2 600) @@ -371,6 +371,8 @@ AC_MSG_ERROR([You need swig >= 1.3 to compile swilena. You can disable swilena by specifying --without-swilena to configure.]) fi + AC_CHECK_SWIG_FLAGS + AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) @@ -390,7 +392,7 @@ AC_ARG_VAR([PYTHON_CPPFLAGS], [Path to Python.h]) AC_ARG_WITH([python-includedir], [Include path for Python.h], [PYTHON_CPPFLAGS="-I $withval"], - [PYTHON_CPPFLAGS="-I/usr/include/python$PYTHON_VERSION"]) + [PYTHON_CPPFLAGS="-I"`echo "import sys; print sys.prefix" | python`"/include/python$PYTHON_VERSION"]) CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AC_CHECK_HEADERS([Python.h],, @@ -416,8 +418,11 @@ 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 -I/usr/lib/ruby/1.7/i386-linux -I/usr/lib/ruby/1.8/i386-linux"]) - + [RUBY_CPPFLAGS="-I`ruby -e 'puts $:.join("\n")' | while read line; do + if [[ -f ${line}/ruby.h ]]; then + echo $line + fi + done`"]) CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, AC_MSG_ERROR( Index: config/oln.m4 --- config/oln.m4 Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.1 600) +++ config/oln.m4 Mon, 12 Apr 2004 19:20:51 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.1 600) @@ -319,6 +319,29 @@ AC_LANG_POP([C++]) ]) +# Recent versions of SWIG use -nountime instead of -c + +AC_DEFUN([AC_CHECK_SWIG_FLAGS], +[dnl + AC_CACHE_CHECK([for SWIG supports for -noruntime], + [ac_cv_swig_flags], + [if swig -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then + ac_cv_swig_flags=recent + else + ac_cv_swig_flags=old + fi]) + case "$ac_cv_swig_flags" in + recent) + SWIG_FLAGS="-noruntime" + ;; + old) + SWIG_FLAGS="-c" + ;; + esac + + AC_SUBST([SWIG_FLAGS]) +]) + # AC_CXX_CHECK_MATH([FUNCTION], [MACRO_NAME], [TEST]) # Checks for the availability of a particular math function Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Mon, 12 Apr 2004 01:16:17 +0200 thivol_d (oln/s/25_expand.sh 1.14 700) +++ tools/swilena/expand.sh Mon, 12 Apr 2004 19:13:29 +0200 thivol_d (oln/s/25_expand.sh 1.14 700) @@ -125,7 +125,7 @@ sdir=meta fi echo "swilena_${mod}_wrap.cxx swilena_${mod}.py: \$(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 -e "\t\$(SWIG) \$(SWIG_FLAGS) -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" echo done } @@ -173,7 +173,7 @@ sdir=meta fi echo "swilena_${mod}_wrap.cxx: \$(srcdir)/../$sdir/swilena_${mod}.i" - echo -e "\t\$(SWIG) -c -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" + echo -e "\t\$(SWIG) \$(SWIG_FLAGS) -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" echo done } -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 5

oln 10.152: Fix macros for ICC
by Niels Van Vliet 19 Apr '04

19 Apr '04

Index: 10.151/integre/ChangeLog 0a1,8 > 2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr> > > * ntg/real/optraits_builtin_int.hh: Add white space after variables > of macros used as template parameters (ICC error). > * ntg/real/typetraits_builtin_int.hh: Likewise. > * ntg/core/internal/macros.hh: Likewise. > * ntg/core/macros.hh: Likewise. > Index: 10.151/metalic/ChangeLog 0a1,10 > 2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr> > > * mlc/type.hh: Add white space after variables of macros used as > template parameters (ICC error). > * mlc/array/1d.hh: Likewise. > * mlc/array/2d.hh: Likewise. > * mlc/array/3d.hh: Likewise. > * mlc/optional.hh: Likewise. > * mlc/is_a.hh: Likewise. > Index: 10.151/olena/ChangeLog 0a1,11 > 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. > * oln/topo/dmap.hxx: Likewise. > * oln/transforms/dwt.hh: Likewise. > * oln/core/abstract/image.hh: Likewise. > * oln/morpho/attributes.hh: Likewise. > * oln/topo/tarjan/tarjan.hh: Likewise. > Index: 10.151/olena/oln/arith/internal/opdecls.hh 72c72 < : public f_##OPNAME< T1, T2, ntg_return_type(OPNAME, T1, T2) > \ --- > : public f_##OPNAME< T1, T2, ntg_return_type(OPNAME, T1, T2)> \ 139c139 < struct f_##OPNAME##_cst: std::unary_function<const TYPE, TYPE> \ --- > struct f_##OPNAME##_cst: std::unary_function<const TYPE, TYPE > \ 281c281 < return apply2<f_##OPNAME>(input1, input2); \ --- > return apply2<f_##OPNAME >(input1, input2); \ 345c345 < return apply<f_##OPNAME>(input1); \ --- > return apply<f_##OPNAME >(input1); \ 389c389 < return apply2<f_##OPNAME>(input1, input2); \ --- > return apply2<f_##OPNAME >(input1, input2); \ Index: 10.151/metalic/mlc/type.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 242,245c242,245 < # define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret < # define mlc_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret < # define mlc_exact_vt_type_(T, Exact) mlc::exact_vt<T, Exact>::ret < # define mlc_2_exact_vt_type_(self, T, Exact) mlc::exact_vt<self<T, Exact>, Exact>::ret --- > # define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact >::ret > # define mlc_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact >, Exact >::ret > # define mlc_exact_vt_type_(T, Exact) mlc::exact_vt<T, Exact >::ret > # define mlc_2_exact_vt_type_(self, T, Exact) mlc::exact_vt<self<T, Exact >, Exact >::ret Index: 10.151/metalic/mlc/array/1d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 270c270 < static internal::array1d_start_<T> T##s_1d = internal::array1d_start_<T>() --- > static internal::array1d_start_<T > T##s_1d = internal::array1d_start_<T >() Index: 10.151/metalic/mlc/array/2d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 299c299 < static internal::array2d_start_<T> T##s_2d = internal::array2d_start_<T>() --- > static internal::array2d_start_<T > T##s_2d = internal::array2d_start_<T >() Index: 10.151/metalic/mlc/array/3d.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 304c304 < static internal::array3d_start_<T> T##s_3d = internal::array3d_start_<T>() --- > static internal::array3d_start_<T > T##s_3d = internal::array3d_start_<T >() Index: 10.151/metalic/mlc/optional.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 36c36 < namespace mlc --- > namespace mlc 57,59c57,59 < // argument is given. < // example: < // --- > // argument is given. > // example: > // 62c62 < // {} --- > // {} 68c68 < # define Optional(T, v) ((Option<T> v) = none()) --- > # define Optional(T, v) ((Option<T > v) = none()) 73c73 < --- > 80c80 < --- > 82c82 < static inline void do_it(T) --- > static inline void do_it(T) 86c86 < static inline void do_it(T, U) --- > static inline void do_it(T, U) 90c90 < static inline void do_it(T, U, V) --- > static inline void do_it(T, U, V) Index: 10.151/metalic/mlc/is_a.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 35,36c35,37 < # define is_a__check_result_ \ < sizeof(helper<T,U>::check( (T*) helper<T,U>::makeT() )) == sizeof(mlc::internal::yes_) --- > # define is_a__check_result_ \ > sizeof(helper<T ,U >::check( (T *) helper<T,U >::makeT() )) \ > == sizeof(mlc::internal::yes_) 39c40 < namespace mlc --- > namespace mlc 42c43 < namespace internal --- > namespace internal 48,49c49,50 < // FIXME: This type is a workaround for g++-2.95 problem with implicit < // typename in <foo<T>::ret::dim>, --- > // FIXME: This type is a workaround for g++-2.95 problem with implicit > // typename in <foo<T>::ret::dim>, 52c53 < --- > 73c74 < --- > 95c96 < --- > 107,108c108,109 < < --- > > 121c122 < --- > 128c129 < --- > 179c180 < # define is_a__2nd_is_meta(T,U) mlc::internal::is_a_< id_of_typeform(U) >::check<T, U> --- > # define is_a__2nd_is_meta(T,U) mlc::internal::is_a_< id_of_typeform(U) >::check<T, U > 183c184 < # define id_of_typeform(T) sizeof(mlc::form::get<T>()) --- > # define id_of_typeform(T) sizeof(mlc::form::get<T >()) 189,190c190,191 < # define mlc_is_a(T, U) mlc::internal::wrap<typename mlc::internal::is_a_< id_of_typeform(U) >::check<T, U> > < # define mlc_is_a_(T, U) mlc::internal::wrap<mlc::internal::is_a_< id_of_typeform(U) >::check<T, U> > --- > # define mlc_is_a(T, U) mlc::internal::wrap<typename mlc::internal::is_a_< id_of_typeform(U) >::check<T, U > > > # define mlc_is_a_(T, U) mlc::internal::wrap<mlc::internal::is_a_< id_of_typeform(U) >::check<T, U > > Index: 10.151/olena/oln/morpho/watershed.hxx 43c43 < const DestValue mask = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 2); \ --- > const DestValue mask = ntg::cast::force<DestValue >(ntg_max_val(DestValue) - 2); \ 45,47c45,47 < const DestValue init = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 1); \ < const DestValue inqueue = ntg::cast::force<DestValue>(ntg_max_val(DestValue) - 3); \ < const DestValue maxlevel = ntg::cast::force<DestValue>(inqueue - 1) /* no ; */ --- > const DestValue init = ntg::cast::force<DestValue >(ntg_max_val(DestValue) - 1); \ > const DestValue inqueue = ntg::cast::force<DestValue >(ntg_max_val(DestValue) - 3); \ > const DestValue maxlevel = ntg::cast::force<DestValue >(inqueue - 1) /* no ; */ Index: 10.151/olena/oln/topo/dmap.hxx 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 53c53 < coord --- > coord 135c135 < mk_chamfer_##D##x##D< I, J>(E); \ --- > mk_chamfer_##D##x##D< I, J >(E); \ 139,140c139,140 < # define oln_topo_chamfer3_(Name, I, J, K, D, E) \ < inline const chamfer<int>& Name##_##I##_##J##_##K() \ --- > # define oln_topo_chamfer3_(Name, I, J, K, D, E) \ > inline const chamfer<int>& Name##_##I##_##J##_##K() \ 143c143 < mk_chamfer_##D##x##D< I, J, K>(E); \ --- > mk_chamfer_##D##x##D< I, J, K >(E); \ 213c213 < void --- > void Index: 10.151/olena/oln/transforms/dwt.hh 52c52 < struct Name : public oln::internal::wavelet_coeffs_<Type, Size, Name> \ --- > struct Name : public oln::internal::wavelet_coeffs_<Type, Size, Name > \ Index: 10.151/integre/ntg/real/optraits_builtin_int.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 50c50 < struct optraits<Name> : public optraits<uint_value<Name> > \ --- > struct optraits<Name > : public optraits<uint_value<Name > > \ 58c58 < struct optraits<Name> : public optraits<sint_value<Name> > \ --- > struct optraits<Name > : public optraits<sint_value<Name > > \ 74c74 < --- > 79c79 < --- > 83c83 < // char is not the same as signed char. --- > // char is not the same as signed char. Index: 10.151/integre/ntg/real/typetraits_builtin_int.hh 1c1 < // Copyright (C) 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2002, 2003, 2004 EPITA Research and Development Laboratory 41c41 < struct typetraits<Name> : public typetraits<Value<Name> > \ --- > struct typetraits<Name> : public typetraits<Value<Name > > \ 44,45c44,45 < typedef builtin::to_ntg<Name>::ret ntg_type; \ < typedef builtin::abstract_trait<Name>::ret abstract_type; \ --- > typedef builtin::to_ntg<Name >::ret ntg_type; \ > typedef builtin::abstract_trait<Name >::ret abstract_type; \ 49c49 < typedef typename builtin::value_type<Name, E>::ret ret; \ --- > typedef typename builtin::value_type<Name, E >::ret ret; \ 58,65c58,65 < typedef builtin::signed_trait<Name>::ret signed_type; \ < typedef builtin::unsigned_trait<Name>::ret unsigned_type; \ < typedef builtin::cumul_trait<Name>::ret cumul_type; \ < typedef builtin::largest_trait<Name>::ret largest_type; \ < typedef builtin::signed_largest_trait<Name>::ret signed_largest_type; \ < typedef builtin::signed_cumul_trait<Name>::ret signed_cumul_type; \ < typedef builtin::unsigned_largest_trait<Name>::ret unsigned_largest_type; \ < typedef builtin::unsigned_cumul_trait<Name>::ret unsigned_cumul_type; \ --- > typedef builtin::signed_trait<Name >::ret signed_type; \ > typedef builtin::unsigned_trait<Name >::ret unsigned_type; \ > typedef builtin::cumul_trait<Name >::ret cumul_type; \ > typedef builtin::largest_trait<Name >::ret largest_type; \ > typedef builtin::signed_largest_trait<Name >::ret signed_largest_type; \ > typedef builtin::signed_cumul_trait<Name >::ret signed_cumul_type; \ > typedef builtin::unsigned_largest_trait<Name >::ret unsigned_largest_type; \ > typedef builtin::unsigned_cumul_trait<Name >::ret unsigned_cumul_type; \ 115c115 < --- > 126c126 < --- > 158c158 < --- > 161c161 < --- > Index: 10.151/integre/ntg/core/internal/macros.hh 1c1 < // Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory --- > // Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory 46c46 < typename ntg::internal::typetraits<T>::storage_type --- > typename ntg::internal::typetraits< T >::storage_type 49c49 < typename ntg::internal::typetraits<T>::abstract_type --- > typename ntg::internal::typetraits< T >::abstract_type 52c52 < typename ntg::internal::typetraits<T>::optraits_type --- > typename ntg::internal::typetraits< T >::optraits_type 55c55 < typename ntg::internal::typetraits<T>::behavior_type --- > typename ntg::internal::typetraits< T >::behavior_type 58c58 < typename ntg::internal::typetraits<T>::base_type --- > typename ntg::internal::typetraits< T >::base_type 61c61 < typename ntg::internal::typetraits<T>::signed_type --- > typename ntg::internal::typetraits< T >::signed_type 64c64 < typename ntg::internal::typetraits<T>::unsigned_type --- > typename ntg::internal::typetraits< T >::unsigned_type 67c67 < typename ntg::internal::typetraits<T>::cumul_type --- > typename ntg::internal::typetraits< T >::cumul_type 70c70 < typename ntg::internal::typetraits<T>::largest_type --- > typename ntg::internal::typetraits< T >::largest_type 73c73 < typename ntg::internal::typetraits<T>::signed_largest_type --- > typename ntg::internal::typetraits< T >::signed_largest_type 76c76 < typename ntg::internal::typetraits<T>::signed_cumul_type --- > typename ntg::internal::typetraits< T >::signed_cumul_type 79c79 < typename ntg::internal::typetraits<T>::unsigned_largest_type --- > typename ntg::internal::typetraits< T >::unsigned_largest_type 82c82 < typename ntg::internal::typetraits<T>::unsigned_cumul_type --- > typename ntg::internal::typetraits< T >::unsigned_cumul_type 85c85 < typename ntg::internal::typetraits<T>::integer_type --- > typename ntg::internal::typetraits< T >::integer_type Index: 10.151/integre/ntg/core/macros.hh 35,36c35,36 < # define ntg_type(T) typename ntg::type_traits<T>::ntg_type < # define ntg_type_(T) typename ntg::type_traits<T>::ntg_type --- > # define ntg_type(T) typename ntg::type_traits< T >::ntg_type > # define ntg_type_(T) typename ntg::type_traits< T >::ntg_type 45,46c45,46 < # define ntg_is_a(T, U) mlc_is_a(typename ntg::type_traits<T>::abstract_type, U) < # define ntg_is_a_(T, U) mlc_is_a_(ntg::type_traits<T>::abstract_type, U) --- > # define ntg_is_a(T, U) mlc_is_a(typename ntg::type_traits< T >::abstract_type, U) > # define ntg_is_a_(T, U) mlc_is_a_(ntg::type_traits< T >::abstract_type, U) 52,53c52,53 < # define ntg_abstract_type(T) typename ntg::type_traits<T>::abstract_type < # define ntg_abstract_type_(T) ntg::type_traits<T>::abstract_type --- > # define ntg_abstract_type(T) typename ntg::type_traits< T >::abstract_type > # define ntg_abstract_type_(T) ntg::type_traits< T >::abstract_type 55,56c55,56 < # define ntg_storage_type(T) typename ntg::type_traits<T>::storage_type < # define ntg_storage_type_(T) ntg::type_traits<T>::storage_type --- > # define ntg_storage_type(T) typename ntg::type_traits< T >::storage_type > # define ntg_storage_type_(T) ntg::type_traits< T >::storage_type 58,59c58,59 < # define ntg_base_type(T) typename ntg::type_traits<T>::base_type < # define ntg_base_type_(T) ntg::type_traits<T>::base_type --- > # define ntg_base_type(T) typename ntg::type_traits< T >::base_type > # define ntg_base_type_(T) ntg::type_traits< T >::base_type 61,62c61,62 < # define ntg_signed_type(T) typename ntg::type_traits<T>::signed_type < # define ntg_signed_type_(T) ntg::type_traits<T>::signed_type --- > # define ntg_signed_type(T) typename ntg::type_traits< T >::signed_type > # define ntg_signed_type_(T) ntg::type_traits< T >::signed_type 64,65c64,65 < # define ntg_unsigned_type(T) typename ntg::type_traits<T>::unsigned_type < # define ntg_unsigned_type_(T) ntg::type_traits<T>::unsigned_type --- > # define ntg_unsigned_type(T) typename ntg::type_traits< T >::unsigned_type > # define ntg_unsigned_type_(T) ntg::type_traits< T >::unsigned_type 67,68c67,68 < # define ntg_integer_type(T) typename ntg::type_traits<T>::integer_type < # define ntg_integer_type_(T) ntg::type_traits<T>::integer_type --- > # define ntg_integer_type(T) typename ntg::type_traits< T >::integer_type > # define ntg_integer_type_(T) ntg::type_traits< T >::integer_type 70,71c70,71 < # define ntg_cumul_type(T) typename ntg::type_traits<T>::cumul_type < # define ntg_cumul_type_(T) ntg::type_traits<T>::cumul_type --- > # define ntg_cumul_type(T) typename ntg::type_traits< T >::cumul_type > # define ntg_cumul_type_(T) ntg::type_traits< T >::cumul_type 74,75c74,75 < typename ntg::type_traits<T>::signed_cumul_type < # define ntg_signed_cumul_type_(T) ntg::type_traits<T>::signed_cumul_type --- > typename ntg::type_traits< T >::signed_cumul_type > # define ntg_signed_cumul_type_(T) ntg::type_traits< T >::signed_cumul_type 78,79c78,79 < typename ntg::type_traits<T>::unsigned_cumul_type < # define ntg_unsigned_cumul_type_(T) ntg::type_traits<T>::unsigned_cumul_type --- > typename ntg::type_traits< T >::unsigned_cumul_type > # define ntg_unsigned_cumul_type_(T) ntg::type_traits< T >::unsigned_cumul_type 81,82c81,82 < # define ntg_largest_type(T) typename ntg::type_traits<T>::largest_type < # define ntg_largest_type_(T) ntg::type_traits<T>::largest_type --- > # define ntg_largest_type(T) typename ntg::type_traits< T >::largest_type > # define ntg_largest_type_(T) ntg::type_traits< T >::largest_type 85,86c85,86 < typename ntg::type_traits<T>::signed_largest_type < # define ntg_signed_largest_type_(T) ntg::type_traits<T>::signed_largest_type --- > typename ntg::type_traits< T >::signed_largest_type > # define ntg_signed_largest_type_(T) ntg::type_traits< T >::signed_largest_type 89c89 < typename ntg::type_traits<T>::unsigned_largest_type --- > typename ntg::type_traits< T >::unsigned_largest_type 91c91 < ntg::type_traits<T>::unsigned_largest_type --- > ntg::type_traits< T >::unsigned_largest_type 94c94 < typename ntg::type_traits<T>::comp_type --- > typename ntg::type_traits< T >::comp_type 96c96 < ntg::type_traits<T>::comp_type --- > ntg::type_traits< T >::comp_type 98,99c98,99 < # define ntg_unsafe_type(T) typename ntg::type_traits<T>::unsafe_type < # define ntg_unsafe_type_(T) ntg::type_traits<T>::unsafe_type --- > # define ntg_unsafe_type(T) typename ntg::type_traits< T >::unsafe_type > # define ntg_unsafe_type_(T) ntg::type_traits< T >::unsafe_type 105c105 < # define ntg_zero_val(T) ntg::type_traits<T>::zero() --- > # define ntg_zero_val(T) ntg::type_traits< T >::zero() 107c107 < # define ntg_unit_val(T) ntg::type_traits<T>::unit() --- > # define ntg_unit_val(T) ntg::type_traits< T >::unit() 109c109 < # define ntg_max_val(T) ntg::type_traits<T>::max() --- > # define ntg_max_val(T) ntg::type_traits< T >::max() 111c111 < # define ntg_min_val(T) ntg::type_traits<T>::min() --- > # define ntg_min_val(T) ntg::type_traits< T >::min() 113c113 < # define ntg_inf_val(T) ntg::type_traits<T>::inf() --- > # define ntg_inf_val(T) ntg::type_traits< T >::inf() 115c115 < # define ntg_sup_val(T) ntg::type_traits<T>::sup() --- > # define ntg_sup_val(T) ntg::type_traits< T >::sup() 117c117 < # define ntg_max_print_width(T) ntg::type_traits<T>::max_print_width() --- > # define ntg_max_print_width(T) ntg::type_traits< T >::max_print_width() 119c119 < # define ntg_nb_comp(T) ntg::type_traits<T>::nb_comp --- > # define ntg_nb_comp(T) ntg::type_traits< T >::nb_comp 126c126 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::ret --- > typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op , T1, T2 >::ret 128c128 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::ret --- > ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 >::ret 131c131 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2> --- > typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 > 133c133 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2> --- > ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 > 136c136 < typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::impl --- > typename ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 >::impl 138c138 < ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2>::impl --- > ntg::internal::deduce_from_traits<ntg::internal::operator_##Op, T1, T2 >::impl 144c144 < # define ntg_name(T) ntg::type_traits<T>::name() --- > # define ntg_name(T) ntg::type_traits< T >::name() 155c155 < # define ntg_get_value_type(T, E) ntg::type_traits<T>::build_value_type<E> --- > # define ntg_get_value_type(T, E) ntg::type_traits< T >::build_value_type<E > 161c161 < #define ntg_nbits(T) ntg::internal::typetraits<T>::size --- > #define ntg_nbits(T) ntg::internal::typetraits< T >::size 195c195 < ntg_if_vectorial_nb_comp(B)> >::ret --- > ntg_if_vectorial_nb_comp(B) > >::ret 206c206 < ntg_if_vectorial_nb_comp_(B)> >::ret --- > ntg_if_vectorial_nb_comp_(B) > >::ret Index: 10.151/olena/oln/core/abstract/image.hh 344c344 < typename oln::mute<ImgType>::ret --- > typename oln::mute<ImgType >::ret Index: 10.151/olena/oln/morpho/attributes.hh 36,42c36,42 < # define attr_lambda_type(T) typename oln::morpho::attr::attr_traits<T>::lambda_type < # define attr_env_type(T) typename oln::morpho::attr::attr_traits<T>::env_type < # define attr_value_type(T) typename oln::morpho::attr::attr_traits<T>::value_type < < # define attr_lambda_type_(T) oln::morpho::attr::attr_traits<T>::lambda_type < # define attr_env_type_(T) oln::morpho::attr::attr_traits<T>::env_type < # define attr_value_type_(T) oln::morpho::attr::attr_traits<T>::value_type --- > # define attr_lambda_type(T) typename oln::morpho::attr::attr_traits< T >::lambda_type > # define attr_env_type(T) typename oln::morpho::attr::attr_traits< T >::env_type > # define attr_value_type(T) typename oln::morpho::attr::attr_traits< T >::value_type > > # define attr_lambda_type_(T) oln::morpho::attr::attr_traits< T >::lambda_type > # define attr_env_type_(T) oln::morpho::attr::attr_traits< T >::env_type > # define attr_value_type_(T) oln::morpho::attr::attr_traits< T >::value_type Index: 10.151/olena/oln/topo/tarjan/tarjan.hh 33,35c33,35 < # define oln_tarjan_input_type(T) typename oln::topo::tarjan::tarjan_traits<T>::input_type < # define oln_tarjan_output_type(T) typename oln::topo::tarjan::tarjan_traits<T>::output_type < # define oln_tarjan_attr_type(T) typename oln::topo::tarjan::tarjan_traits<T>::attr_type --- > # define oln_tarjan_input_type(T) typename oln::topo::tarjan::tarjan_traits<T >::input_type > # define oln_tarjan_output_type(T) typename oln::topo::tarjan::tarjan_traits<T >::output_type > # define oln_tarjan_attr_type(T) typename oln::topo::tarjan::tarjan_traits<T >::attr_type

2 3

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

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