Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Niels Van Vliet

Index: integre/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * integre/ntg/core/internal/traits.hh: Include headers so as to pass sanity check. +2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr> + * tests/*/tests/* (82 files): Add copyright. 2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr> Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/convert/rgbhsl.hh: Include headers so as to pass sanity check. * olena/oln/snakes/energies.hh: Likewise. * olena/oln/utils/buffer.hh: Likewise. * olena/oln/topo/tarjan/tarjan.hh: Likewise. +2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr> + * tests/*/tests/* (168 files): Add copyright. 2004-04-15 Giovanni Palma <giovanni(a)lrde.epita.fr> Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * swilena/python/Makefile.am: Add new line at end of file. +2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr> + * swilena/python/Makefile.am: Remove clean-file. Add CLEANFILES. 2004-04-19 Damien Thivolle <damien(a)lrde.epita.fr> Index: integre/ntg/core/internal/traits.hh --- integre/ntg/core/internal/traits.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/s/16_traits.hh 1.4.1.1 600) +++ integre/ntg/core/internal/traits.hh Tue, 20 Apr 2004 15:38:21 +0200 van-vl_n (oln/s/16_traits.hh 1.4.1.1 600) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -34,7 +34,7 @@ */ # include <ntg/core/abstract_hierarchy.hh> - +# include <string> namespace ntg { namespace internal { Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/w/2_Makefile.a 1.5 600) +++ tools/swilena/python/Makefile.am Tue, 20 Apr 2004 15:27:29 +0200 van-vl_n (oln/w/2_Makefile.a 1.5 600) @@ -9,4 +9,4 @@ include makefile.swig -CLEANFILES = *.pyc *.cxx \ No newline at end of file +CLEANFILES = *.pyc *.cxx Index: olena/oln/convert/rgbhsl.hh --- olena/oln/convert/rgbhsl.hh Mon, 15 Mar 2004 15:32:27 +0100 van-vl_n (oln/j/36_rgbhsl.hh 1.4 600) +++ olena/oln/convert/rgbhsl.hh Tue, 20 Apr 2004 15:40:20 +0200 van-vl_n (oln/j/36_rgbhsl.hh 1.4 600) @@ -33,7 +33,7 @@ # include <oln/convert/abstract/colorconv.hh> # include <ntg/basics.hh> -# include <ntg/color/nrgb.hh> +# include <ntg/color/rgb.hh> # include <ntg/color/hsl.hh> # include <mlc/contract.hh> Index: olena/oln/snakes/energies.hh --- olena/oln/snakes/energies.hh Thu, 11 Mar 2004 15:41:55 +0100 van-vl_n (oln/j/22_energies.h 1.2 600) +++ olena/oln/snakes/energies.hh Tue, 20 Apr 2004 15:46:41 +0200 van-vl_n (oln/j/22_energies.h 1.2 600) @@ -28,6 +28,9 @@ #ifndef OLENA_SNAKES_ENERGIES_HH # define OLENA_SNAKES_ENERGIES_HH +# include "node.hh" +# include <ntg/float.hh> + namespace oln { namespace snakes { Index: olena/oln/utils/buffer.hh --- olena/oln/utils/buffer.hh Fri, 19 Mar 2004 15:52:57 +0100 palma_g (oln/k/10_buffer.hh 1.1 600) +++ olena/oln/utils/buffer.hh Tue, 20 Apr 2004 15:45:26 +0200 van-vl_n (oln/k/10_buffer.hh 1.1 600) @@ -29,6 +29,8 @@ #ifndef OLENA_OLN_UTILS_BUFFER_HH # define OLENA_OLN_UTILS_BUFFER_HH +# include <ntg/int.hh> +# include <vector> namespace oln { namespace utils { Index: olena/oln/topo/tarjan/tarjan.hh --- olena/oln/topo/tarjan/tarjan.hh Tue, 13 Apr 2004 17:31:32 +0200 van-vl_n (oln/m/47_tarjan.hh 1.3 600) +++ olena/oln/topo/tarjan/tarjan.hh Tue, 20 Apr 2004 15:41:29 +0200 van-vl_n (oln/m/47_tarjan.hh 1.3 600) @@ -28,7 +28,7 @@ #ifndef OLENA_TOPO_TARJAN_TARJAN_HH # define OLENA_TOPO_TARJAN_TARJAN_HH # include <oln/basics.hh> - +# include <vector> // Macros for extract information on tarjan algorithms. # 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

20 years, 8 months

oln 10.141: Minor fix.

by Niels Van Vliet

Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(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. Index: tools/swilena/doc/swilena.texi --- tools/swilena/doc/swilena.texi Mon, 26 Jan 2004 04:27:21 +0100 astrid (oln/n/40_swilena.te 1.1.1.4 600) +++ tools/swilena/doc/swilena.texi Sat, 10 Apr 2004 17:39:25 +0200 van-vl_n (oln/n/40_swilena.te 1.1.1.4 600) @@ -45,7 +45,9 @@ @node Introduction @chapter Introduction - +@menu +* Using Swilena for Olena development:: +@end menu Swilena aims at providing interpreted languages access to the Olena image software processing library. In order to reach this goal, it relies on SWIG to create interfaces to Olena in different languages. @@ -104,7 +106,10 @@ Currently, the source tree only knows about Python and Ruby, but this may evolve in the future. -@unnumberedsubsec Using Swilena for Olena development +@c FIXME: The section should be unnumbered (using @unnumberedsubsec). +@node Using Swilena for Olena development +@section Using Swilena for Olena development + Obviously, Swilena provides the developer with a programming framework around Olena that has much shorter development cycles: new algorithms Index: tools/swilena/meta/swilena_structelt.i --- tools/swilena/meta/swilena_structelt.i Sat, 27 Sep 2003 19:02:23 +0200 burrus_n (oln/s/28_swilena_st 1.3 600) +++ tools/swilena/meta/swilena_structelt.i Sat, 10 Apr 2004 18:09:41 +0200 van-vl_n (oln/s/28_swilena_st 1.3 600) @@ -22,13 +22,6 @@ // accessors & operations - T operator-() const; // senseless for neighborhoods - %extend - { - T neg() const // senseless for neighborhoods - { return -(*self); } - } - EXTEND_DESCRIBE(T) %enddef Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/2_Makefile.a 1.1 600) +++ tools/swilena/python/Makefile.am Sat, 10 Apr 2004 18:15:25 +0200 van-vl_n (oln/w/2_Makefile.a 1.1 600) @@ -8,3 +8,6 @@ python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py include makefile.swig + +clean-local: + rm -f *.pyc *.cxx

20 years, 8 months

oln 10.164: Add swilena tests to the distribution

by Damien Thivolle

Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * swilena/python/tests/Makefile.am: Add tests to the distribution. * swilena/ruby/tests/Makefile.am: Likewise. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * swilena/python/tests/Makefile.am: Readd tests for swilena. * swilena/ruby/Makefile.am: Likewise. * swilena/ruby/tests/Makefile.am: Likewise. Index: tools/swilena/python/tests/Makefile.am --- tools/swilena/python/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/15_Makefile.a 1.4 600) +++ tools/swilena/python/tests/Makefile.am Thu, 15 Apr 2004 01:36:17 +0200 thivol_d (oln/v/15_Makefile.a 1.4 600) @@ -3,6 +3,8 @@ ## Makefile.am for swilena/python/tests ## +dist_noinst_DATA = arith.py conversions.py simple1.py morpho.py + TESTS_ENVIRONMENT = \ PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ IMGDIR="$(top_srcdir)/olena/img" @@ -10,3 +12,5 @@ TESTS = arith.py conversions.py simple1.py morpho.py + + Index: tools/swilena/ruby/tests/Makefile.am --- tools/swilena/ruby/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/18_Makefile.a 1.3 600) +++ tools/swilena/ruby/tests/Makefile.am Thu, 15 Apr 2004 01:44:16 +0200 thivol_d (oln/v/18_Makefile.a 1.3 600) @@ -9,3 +9,5 @@ TESTS = simple1.rb + +dist_noinst_DATA = simple1.rb \ No newline at end of file -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 8 months

oln 10.156: Fixes to make compile with ICC

by Damien Thivolle

Index: olena/oln/morpho/geodesic_dilation.hh --- olena/oln/morpho/geodesic_dilation.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/37_geodesic_d 1.11.1.12 600) +++ olena/oln/morpho/geodesic_dilation.hh Tue, 13 Apr 2004 23:03:36 +0200 thivol_d (oln/37_geodesic_d 1.11.1.12 600) @@ -69,7 +69,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** save(oln::morpho::geodesic_dilation(im2, im1, oln::neighb_c4()), ** IMG_OUT "oln_morpho_geodesic_dilation.pbm"); @@ -130,7 +130,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** save(oln::morpho::sure::geodesic_dilation(im2, im1, oln::neighb_c4()), ** IMG_OUT "oln_morpho_sure_geodesic_dilation.pbm"); Index: olena/oln/morpho/geodesic_erosion.hh --- olena/oln/morpho/geodesic_erosion.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/36_geodesic_e 1.19 600) +++ olena/oln/morpho/geodesic_erosion.hh Tue, 13 Apr 2004 23:03:01 +0200 thivol_d (oln/36_geodesic_e 1.19 600) @@ -67,7 +67,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** save(oln::morpho::geodesic_erosion(im1, im2, oln::neighb_c4()), ** IMG_OUT "oln_morpho_geodesic_erosion.pbm"); @@ -128,7 +128,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** save(oln::morpho::sure::geodesic_erosion(im1, im2, oln::neighb_c4()), ** IMG_OUT "oln_morpho_sure_geodesic_erosion.pbm"); Index: olena/oln/morpho/reconstruction.hh --- olena/oln/morpho/reconstruction.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/35_reconstruc 1.13.1.13 600) +++ olena/oln/morpho/reconstruction.hh Tue, 13 Apr 2004 23:02:25 +0200 thivol_d (oln/35_reconstruc 1.13.1.13 600) @@ -74,7 +74,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::sure::geodesic_reconstruction_dilation(im2, ** im1, @@ -146,7 +146,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::sequential::geodesic_reconstruction_dilation(im2, ** im1, @@ -262,7 +262,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::hybrid::geodesic_reconstruction_dilation(im2, ** im1, @@ -367,7 +367,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::sure::geodesic_reconstruction_erosion(im1, ** im2, @@ -440,7 +440,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::sequential::geodesic_reconstruction_erosion(im1, ** im2, @@ -552,7 +552,7 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im_type im2(oln::morpho::opening(im1, oln::win_c4p())); + ** im_type im2 = oln::morpho::opening(im1, oln::win_c4p()); ** ** oln::save(oln::morpho::hybrid::geodesic_reconstruction_erosion(im1, ** im2, Index: olena/oln/topo/tarjan/flat-zone.hh --- olena/oln/topo/tarjan/flat-zone.hh Fri, 02 Apr 2004 16:53:54 +0200 palma_g (oln/r/35_flat-zone. 1.13 600) +++ olena/oln/topo/tarjan/flat-zone.hh Wed, 14 Apr 2004 00:03:57 +0200 thivol_d (oln/r/35_flat-zone. 1.13 600) @@ -88,7 +88,7 @@ typedef abstract::tarjan_with_attr<exact_type> super_type; ///< Type of parent class. friend class super_type; - friend class super_type::super_type; + friend class abstract::tarjan<exact_type>; /*! ** \brief Constructor. ** -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 8 months

oln 10.153: Fix doxygen version detection

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Check for doxygen version. * config/oln.m4: Add macro to check for doxygen version. Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * tools/swilena/ruby/Makefile.am: Remove `ruby_DATA' variable. Index: configure.ac --- configure.ac Mon, 12 Apr 2004 19:37:26 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.3 600) +++ configure.ac Tue, 13 Apr 2004 17:19:35 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.3 600) @@ -236,6 +236,8 @@ ### FIXME: could be much better. 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]) Index: config/oln.m4 --- config/oln.m4 Mon, 12 Apr 2004 19:37:26 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.2 640) +++ config/oln.m4 Tue, 13 Apr 2004 17:30:48 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.2 640) @@ -325,7 +325,7 @@ [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 + [if $SWIG -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then ac_cv_swig_flags=recent else ac_cv_swig_flags=old @@ -342,6 +342,23 @@ AC_SUBST([SWIG_FLAGS]) ]) +# Doxygen >= 1.3.4 is needed. + +AC_DEFUN([AC_CHECK_DOXYGEN_VERSION], +[dnl + AC_CACHE_CHECK([for doxygen >= 1.3.4], + [ac_cv_doxygen_version], + [if $DOXYGEN --version 2>&1 | grep ['1.3.[456]'] > /dev/null 2>&1; then + ac_cv_doxygen_version=recent + else + ac_cv_doxygen_version=old + fi]) + if [ [ "$ac_cv_doxygen_version" = "old" ] ] ; then + AC_MSG_ERROR([Doxygen 1.3.4 or newer is required]) + fi +]) + + # AC_CXX_CHECK_MATH([FUNCTION], [MACRO_NAME], [TEST]) # Checks for the availability of a particular math function Index: tools/swilena/ruby/Makefile.am --- tools/swilena/ruby/Makefile.am Mon, 12 Apr 2004 01:16:17 +0200 thivol_d (oln/v/17_Makefile.a 1.3 600) +++ tools/swilena/ruby/Makefile.am Tue, 13 Apr 2004 16:51:38 +0200 thivol_d (oln/v/17_Makefile.a 1.3 600) @@ -7,8 +7,6 @@ rubydir = $(libdir)/ruby -ruby_DATA = swilena_display.rb - include makefile.swig clean-local: -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 8 months

Re: oln 10.146: Fix swilena. Fix oln_concrete_type.

by Akim Demaille

>>> "Niels" == Niels Van Vliet <niels(a)lrde.epita.fr> writes: > Index: olena/tests/morpho/tests/gradient > --- olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:46 +0200 > van-vl_n () > +++ olena/tests/morpho/tests/gradient Mon, 12 Apr 2004 12:55:35 +0200 > van-vl_n (oln/r/1_gradient 644) > @@ -0,0 +1,39 @@ > +// -*- c++ -*- Pq ce fichier n'a pas d'extension ? Et attention à la license. > + > +#include <oln/basics2d.hh> > +#include <oln/morpho/gradient.hh> > +#include <oln/level/compare.hh> > +#include <ntg/all.hh> > +#include "check.hh" > +#include "data.hh" > + > + > +#define OK_OR_FAIL \ > + std::cout << "OK" << std::endl; \ > + else \ > + { \ > + std::cout << "FAIL" << std::endl; \ > + fail = true; \ > + } Ce genre de macros qu'on retrouve dans tous vos fichiers devraient être collectées dans un header pour les tests. Mais je vois qu'il y a déjà un check.hh... > + > +template<class I> > +bool are_not_eq(const oln::abstract::non_vectorial_image_with_dim<2, I> &im) > +{ > + return > + !oln::level::is_equal(oln::morpho::fast::beucher_gradient(im, > + oln::win_c8p()), > + oln::morpho::beucher_gradient(im, oln::win_c8p())); > +} > + > + > +bool > +check() > +{ > + bool fail = false; > + > + oln::image2d<ntg::int_u8> im8(oln::load(rdata("lena256.pgm"))); > + if (are_not_eq(im8) == false) > + OK_OR_FAIL; > + > + return fail; > +}

20 years, 8 months

oln 10.143: Repairing swilena 2

by Niels Van Vliet

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)

20 years, 8 months

oln 10.138: Fixes on doc generation

by Damien Thivolle

Index: ChangeLog from 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: Fix files cleaning. Add MY_CPPFLAGS=... when running make on out/makefile. * doc/ref/exdoc.pl: Add a third argument to the generated scripts. * doc/ref/out/exdoc.config.in: Add `CPPFLAGS' to the compilation line. 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 Thu, 08 Apr 2004 20:41:06 +0200 thivol_d (oln/o/29_cleanup.sh 1.6 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: 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 12:57:25 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.18 600) @@ -7,22 +7,15 @@ 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 doxy: $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img - cd $(OUT_DIR) && $(MAKE) -f makefile + cd $(OUT_DIR) && $(MAKE) -f makefile MY_CPPFLAGS="$(CPPFLAGS)" $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config @@ -36,11 +29,11 @@ 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 img latex out/makefile out/all.mk 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 Thu, 08 Apr 2004 16:13:22 +0200 thivol_d (oln/j/15_oln.m4 1.39 600) @@ -435,7 +435,7 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep " 3\.$3\|4$" >/dev/null ; then + if $CXX --version | grep [' 3\.[34]'] >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: doc/ref/exdoc.pl --- doc/ref/exdoc.pl Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/v/26_exdoc.pl 1.4 700) +++ doc/ref/exdoc.pl Fri, 09 Apr 2004 12:39:31 +0200 thivol_d (oln/v/26_exdoc.pl 1.5 700) @@ -254,7 +254,7 @@ print $makefile "chmod 700 ./\$<.cmd "; print $makefile "&& eval ./\$@."; print $makefile $config[$i]{"ext"}; - print $makefile ".cmd \$< \$@"; + print $makefile ".cmd \$< \$@ \"\$(MY_CPPFLAGS)\""; print $makefile "\n\n"; } 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 12:52:26 +0200 thivol_d (oln/k/7_exdoc.conf 1.6 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 = $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 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

20 years, 8 months

oln 10.147: Swig, python, ruby versions detection

by Damien Thivolle

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

20 years, 8 months

oln 10.152: Fix macros for ICC

by Niels Van Vliet

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

20 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches