- Olena-patches

oln 10.222: Adjust for G++ 4.0
by Roland Levillain 15 Sep '05

15 Sep '05

J'utilise encore Olena 0.10 pour SWT, et plusieurs outils que j'avais écrits ne passent plus l'édition de liens depuis la mise à jour des compilateurs G++ 3.3 et 3.4 dans Debian, à cause de ce bug : http://article.gmane.org/gmane.comp.graphics.crystalspace.general/6771 (... referenced in section `.rodata' of ...: defined in discarded section `.gnu.linkonce.t...) Il a donc fallu que je rende Olena 0.10 G++-4.0-compliant (en tout cas, la partie que j'utilise). Ce qui me fait penser qu'on pourrait terminer ce nettoyage et faire une release corrective de 0.10 qui soit compatible avec G++ 4.0, que l'on pourrait nommer Olena 0.11, ou plus modestement 0.10.1. Qu'en pensez-vous ? Index: ChangeLog Index: integre/ChangeLog Index: olena/ChangeLog Index: olena/oln/arith/logic.hh Index: olena/oln/core/window2d.hh Index: olena/oln/io/gz_stream.hh Index: config/oln.m4 --- ChangeLog Wed, 08 Sep 2004 18:56:06 +0200 thivol_d (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.18 600) +++ ChangeLog Thu, 15 Sep 2005 17:36:52 +0200 levill_r (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.18 600) @@ -1,3 +1,8 @@ +2005-09-15 Roland Levillain <roland(a)lrde.epita.fr> + + * config/oln.m4 (OLN_VERSION): Set to 0.10a. + Remove duplicate definition. + 2004-09-08 Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Minor fix. --- integre/ChangeLog Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/q/35_ChangeLog 1.12.1.2.1.47 600) +++ integre/ChangeLog Thu, 15 Sep 2005 17:42:26 +0200 levill_r (oln/q/35_ChangeLog 1.12.1.2.1.47 600) @@ -1,3 +1,14 @@ +2005-09-15 Roland Levillain <roland(a)lrde.epita.fr> + + Adjust for G++ 4.0. + + * ntg/color/color.hh + (typetraits<color<ncomps, qbits, color_system> >::nb_comp): Make + it a static const unsigned instead of an enum. + * ntg/vect/cplx.hh (cplx<rect, T>::to_polar): Move the definition + of this function outside the declaration of cplx<rect, T>, so as + to have it know the size of cplx<polar, T>. + 2004-06-26 Damien Thivolle <damien(a)lrde.epita.fr> * ntg/core/internal/global_ops.hh: Make compliant to g++-3.4. --- olena/ChangeLog Thu, 24 Feb 2005 10:10:35 +0100 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.3 600) +++ olena/ChangeLog Thu, 15 Sep 2005 17:20:50 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.3 600) @@ -1,3 +1,14 @@ +2005-09-15 Roland Levillain <roland(a)lrde.epita.fr> + + Adjust for G++ 4.0. + + * oln/core/window2d.hh (neighb_type): Remove duplicate typedef. + * oln/topo/dmap.hh, oln/topo/dmap.hxx (operator[], operator()): + Return a copy, not a reference on a temporary. + * oln/arith/logic.hh: Remove superfluous semi-colons. + * oln/io/gz_stream.hh (zifstream, zofstream): Add forward + declarations. + 2005-02-24 Roland Levillain <roland(a)lrde.epita.fr> * oln/core/abstract/image.hh (oln_fwd_iter_type_): Fix macro --- olena/oln/arith/logic.hh Sat, 13 Mar 2004 17:58:18 +0100 van-vl_n (oln/b/24_logic.hh 1.6.1.4 600) +++ olena/oln/arith/logic.hh Thu, 15 Sep 2005 16:06:43 +0200 levill_r (oln/b/24_logic.hh 1.6.1.4 600) @@ -56,16 +56,16 @@ oln_arith_declare_unfixedtype_functor_(logic_not, ntg::bin, ! val); /// AND NOT operators. - oln_arith_declare_all_nongenericbinop_procs_(logic_and); + oln_arith_declare_all_nongenericbinop_procs_(logic_and) /// OR operators. - oln_arith_declare_all_nongenericbinop_procs_(logic_or); + oln_arith_declare_all_nongenericbinop_procs_(logic_or) /// AND NOT operators. - oln_arith_declare_all_nongenericbinop_procs_(logic_and_not); + oln_arith_declare_all_nongenericbinop_procs_(logic_and_not) /// NOT operator. - oln_arith_declare_nongenericunop_procs_(logic_not); + oln_arith_declare_nongenericunop_procs_(logic_not) } // end of arith --- olena/oln/core/window2d.hh Fri, 02 Apr 2004 16:00:03 +0200 van-vl_n (oln/c/14_window2d.h 1.22 600) +++ olena/oln/core/window2d.hh Thu, 15 Sep 2005 16:50:52 +0200 levill_r (oln/c/14_window2d.h 1.22 600) @@ -77,7 +77,6 @@ typedef struct_elt_traits< self_type >::iter_type iter_type; typedef struct_elt_traits< self_type >::neighb_type neighb_type; - typedef struct_elt_traits< self_type >::neighb_type neighb_type; ///< Type of neighbor. /*! --- olena/oln/io/gz_stream.hh Fri, 02 Apr 2004 18:35:36 +0200 van-vl_n (oln/f/17_gz_stream. 1.11 600) +++ olena/oln/io/gz_stream.hh Thu, 15 Sep 2005 17:20:09 +0200 levill_r (oln/f/17_gz_stream. 1.11 600) @@ -296,6 +296,10 @@ }; + // Forward declarations. + class zifstream; + class zofstream; + ///Define an interface for compressed file stream manipulation. class zfilestream_common : virtual public std::ios { --- config/oln.m4 Wed, 08 Sep 2004 18:56:06 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.10 600) +++ config/oln.m4 Thu, 15 Sep 2005 17:45:58 +020Index: 10.221/olena/oln/topo/dmap.hh Index: olena/oln/topo/dmap.hxx Index: integre/ntg/vect/cplx.hh Index: integre/ntg/color/color.hh 0 levill_r (oln/j/15_oln.m4 1.38.1.10 600) @@ -648,7 +648,6 @@ ### # $Format: "m4_define([OLN_VERSION], [0.$ProjectMajorVersion$])"$ -m4_define([OLN_VERSION], [0.10]) m4_define([OLN_CONTACT], [olena-bugs(a)lrde.epita.fr] # OLN_COLLECTION([subdirs-variable-name], --- olena/oln/topo/dmap.hh Mon, 15 Mar 2004 17:40:54 +0100 van-vl_n (oln/p/2_dmap.hh 1.11 600) +++ olena/oln/topo/dmap.hh Thu, 15 Sep 2005 16:11:09 +0200 levill_r (oln/p/2_dmap.hh 1.11 600) @@ -690,11 +690,11 @@ to_image() const; /// Distance of a point p. - const T& + const T operator[](const point_type& p) const; /// Distance of a point2d(row, col). - const T& + const T operator()(coord row, coord col) const; private: --- olena/oln/topo/dmap.hxx Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/p/3_dmap.hxx 1.7.1.11 600) +++ olena/oln/topo/dmap.hxx Thu, 15 Sep 2005 16:16:57 +0200 levill_r (oln/p/3_dmap.hxx 1.7.1.11 600) @@ -321,14 +321,14 @@ } template <class T, class T2> - const T& + const T dmap<T, T2>::operator[](const point_type& p) const { return imap_[p] / ch_.coef; } template <class T, class T2> - const T& + const T dmap<T, T2>::operator()(coord row, coord col) const { return imap_(row, col) / ch_.coef; --- integre/ntg/vect/cplx.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/t/19_cplx.hh 1.5 600) +++ integre/ntg/vect/cplx.hh Thu, 15 Sep 2005 16:49:38 +0200 levill_r (oln/t/19_cplx.hh 1.5 600) @@ -323,11 +323,9 @@ return cplx<rect, T>(-this->val_[0], -this->val_[1]); } + // Forward declaration. const cplx<polar, float_d> - to_polar() const - { - return cplx<polar, float_d>(magn(), angle()); - } + to_polar() const; }; @@ -423,6 +421,13 @@ }; template<class T> + const cplx<polar, float_d> + cplx<rect, T>::to_polar() const + { + return cplx<polar, float_d>(magn(), angle()); + } + + template<class T> inline std::ostream& operator<<(std::ostream& ostr, const cplx<rect, T>& rhs) { --- integre/ntg/color/color.hh Tue, 30 Mar 2004 12:40:46 +0200 van-vl_n (oln/t/20_color.hh 1.7 600) +++ integre/ntg/color/color.hh Thu, 15 Sep 2005 16:56:10 +0200 levill_r (oln/t/20_color.hh 1.7 600) @@ -56,7 +56,7 @@ template <unsigned> class color_system> struct typetraits<color<ncomps, qbits, color_system> > { - enum { nb_comp = ncomps }; + static const unsigned nb_comp = ncomps; typedef color<ncomps, qbits, color_system> self; typedef self ntg_type;

1 0

proto-1.0 273: Update.
by Thierry GERAUD 14 Sep '05

14 Sep '05

2005-09-14 Thierry GERAUD <theo(a)lrde.epita.fr> * ntg/core/predecls.hh (lor_): Replace by ors.

1 0

proto-1.0 272: Better list of ors.
by Thierry GERAUD 14 Sep '05

14 Sep '05

2005-09-14 Thierry GERAUD <theo(a)lrde.epita.fr> * mlc/bool.hh (lor_): Replace by ors. * mlc/types.hh (value.hh): Remove useless include.

1 0

proto-1.0 271: Add general inheritance for oln objects and new overloading mechanism for operators.
by Thierry GERAUD 14 Sep '05

14 Sep '05

2005-09-14 Thierry GERAUD <theo(a)lrde.epita.fr> Add general inheritance for oln objects and new overloading mechanism for operators. * oln/core/abstract/any.hh: New file. Abstract type for every oln objects. * oln/core/gen/cst.hh: New file. oln::cst<T> is the type for literals in oln. * oln/ops/overload.hh: New file. Make mlc overload mechanism relies on overload declarations within oln. * oln/funobj/logic.hh: Remove obsolete file. Replace by mlc/flogic.hh. * oln/funobj/cmp.hh: Remove obsolete file. Replace by mlc/fcmp.hh. * oln/makefile.src (OLN_DEP): Update. * oln/funobj/infsup.hh (oln/funobj/logic.hh): Comment useless include. * oln/core/typedefs.hh (exact_type): New typedef decl. * oln/core/abstract/image.hh: Update. * oln/core/abstract/piter.hh (mlc/any.hh): Remove useless include. * oln/core/abstract/grid.hh: Update inheritance. * oln/core/abstract/point.hh: Likewise. * oln/core/abstract/data_storage.hh: Likewise. * oln/core/abstract/dpoint.hh: Likewise. * oln/core/abstract/iter.hh: Likewise. * oln/core/abstract/neighborhood.hh: Likewise. * oln/core/abstract/window.hh: Likewise. * oln/core/abstract/size.hh: Likewise. * oln/core/abstract/internal/image_impl.hh: Likewise. * oln/core/coord.hh: Likewise. (operators): Change to regular writting. * oln/core/2d/dpoint2d.hh: Likewise. * oln/core/2d/point2d.hh: Likewise. * oln/core/2d/size2d.hh (operator_eq): Remove. * oln/core/3d/image3d.hh (mlc/traits.hh): Remove include. * oln/core/pw/binary_op.hh: Update to conform to mlc/afun.hh. (oln/funobj/abstract/binary.hh): Remove obsolete include. (binary_op): New ctor with a fun as 1st arg. (decl_overload): New overloads for mlc::abstract::meta_*_function when args are pw::abstract::functions and abstract::images. * oln/core/pw/unary_op.hh: Likewise. * oln/core/pw/image.hh (image_from_pwf): Rename class as image. (image_for_all_p): Rename as pw_image. * oln/core/pw/check.hh: Update. (pw_check): New facade procedure. * oln/core/pw/abstract/function.hh: Update inheritance. * oln/core/pw/apply.hh: Add fixme. * oln/core/pw/macros.hh: Remove contents. Macros are split in the three following files. * oln/core/pw/arith.hh: Rewrite. * oln/core/pw/logic.hh: Rewrite. * oln/core/pw/cmp.hh: Rewrite. * oln/utils/overload.hh: Remove contents. Former contents has been split in oln/ops/{overload,arith,logic,cmp}.hh. * oln/ops/macro.hh: Likewise. * oln/ops/arith.hh: Rewrite. * oln/ops/logic.hh: Rewrite. * oln/ops/cmp.hh: Rewrite. * oln/basics.hh: Update include. * oln/morpho/local.hh: Likewise. * oln/level/arith.hh: Update.

1 0

proto-1.0 268: Fix bkd_less in point
by Damien Thivolle 14 Sep '05

14 Sep '05

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/core/abstract/point.hh: Fix bkd_less. point.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: oln/core/abstract/point.hh --- oln/core/abstract/point.hh (revision 267) +++ oln/core/abstract/point.hh (working copy) @@ -139,7 +139,7 @@ /// Anteriority w.r.t. to a bkd image browsing. bool bkd_less(const exact_type& rhs) const { - return not (*this == rhs and not this->fwd_less(rhs)); + return not (*this == rhs or this->fwd_less(rhs)); } /*! \brief Test difference of two points. Nota bene: this method

2 2

proto-1.0 270: New traits in ntg.
by Thierry GERAUD 14 Sep '05

14 Sep '05

2005-09-14 Thierry GERAUD <theo(a)lrde.epita.fr> * ntg/real/range.hh (operator void()): New overload. * ntg/core/predecls.hh: Add fwd declarations. (decl_overload): Add operator overload traits when ntg is involved. * ntg/core/type_traits.hh (signed_type_traits): New traits. * ntg/core/internal/global_ops_traits.hh (operator_*_traits): New traits.

1 0

proto-1.0 269: Update.
by Thierry GERAUD 14 Sep '05

14 Sep '05

2005-09-14 Thierry GERAUD <theo(a)lrde.epita.fr> * mlc/traits.hh: Delete; replace by... * mlc/ftraits.hh: ...this new file. * mlc/farith.hh: New file. * mlc/fcmp.hh: Update. * mlc/fun.hh: Comment contents so that it does not conflict with... * mlc/afun.hh: ...this file and its update. * mlc/bool.hh (lor_): New meta function. * mlc/typedef.hh (mlc_typedef_onlyif_of): New macro and related equipment. * mlc/flogic.hh: Update. * mlc/makefile.src: Update. * mlc/overload.hh: Update. (f_overload): Change meta-algorithm. * mlc/array/1d.hh: Remove dependency on ntg. * mlc/array/2d.hh: Likewise. * mlc/array/3d.hh: Likewise.

1 0

proto-1.0 267: Fix a mis-spellt binary name
by Simon Odou 07 Sep '05

07 Sep '05

Index: ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * tests/check/Makefile.runtests: Fix a mis-spellt `runtests' call. Makefile.runtests | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: tests/check/Makefile.runtests --- tests/check/Makefile.runtests (revision 266) +++ tests/check/Makefile.runtests (working copy) @@ -16,7 +16,7 @@ CPPFLAGS="$(CPPFLAGS_RUNTESTS)" \ CXXFLAGS="$(CXXFLAGS_RUNTESTS)" \ LDADD="$(LDADD_RUNTESTS)" \ - $(SHELL) $(top_srcdir)/contrib/runtesst $(TESTS) + $(SHELL) $(top_srcdir)/contrib/runtests $(TESTS) distclean-runtests: rm -rf runs

1 0

proto-1.0 266: Fix a doxygen error in documentation
by Simon Odou 07 Sep '05

07 Sep '05

Index: ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * oln/appli/astro/tree_coherence_check.hh: Remove a badly used doxygen command. * oln/appli/astro/tree_statistics.hh: Likewise. tree_coherence_check.hh | 12 ------------ tree_statistics.hh | 8 -------- 2 files changed, 20 deletions(-) Index: oln/appli/astro/tree_coherence_check.hh --- oln/appli/astro/tree_coherence_check.hh (revision 265) +++ oln/appli/astro/tree_coherence_check.hh (working copy) @@ -58,11 +58,9 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** The count of points that are parent of themselves ** should be exactly one. - ** \endcode ** ** \return true if tree is ok. ** @@ -96,13 +94,11 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** for all points (p) from input ** check if children's parent is (p) ** - ** \endcode ** ** \return true if relationships are ok. ** @@ -138,7 +134,6 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** For all points (p) of input @@ -148,7 +143,6 @@ ** else ** // nothing, root parent of itself ** - ** \endcode ** ** \return true if relationships are ok. ** @@ -194,14 +188,12 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** For all points (p) of input ** for all children (c) of (p) ** ensure (c) is not (p) ** - ** \endcode ** ** \return true if there is no recursion. ** @@ -243,7 +235,6 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** For all points (p) in decreasing order @@ -252,7 +243,6 @@ ** ensure they were seen before ** mark (p) as seen ** - ** \endcode ** ** \return true if tree is good. ** @@ -299,14 +289,12 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** Tree is traversed using breadth-first traversal with a queue. ** Every point is marked, at the end all the points must ** have been marked. ** - ** \endcode ** ** \return True if all points were marked. ** Index: oln/appli/astro/tree_statistics.hh --- oln/appli/astro/tree_statistics.hh (revision 265) +++ oln/appli/astro/tree_statistics.hh (working copy) @@ -56,13 +56,11 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** Tree is traversed using breadth-first traversal with a queue. ** Increments count on leaf (no children). ** - ** \endcode ** ** \return Number of leafs (terminal nodes). ** @@ -100,12 +98,10 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** Number of points - leafs count ** - ** \endcode ** ** \return Number of internal nodes. ** @@ -127,7 +123,6 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** count <- 0 @@ -137,7 +132,6 @@ ** then increment count (p is a local root) ** at the end, return the count ** - ** \endcode ** ** \return Number of local roots. ** @@ -167,14 +161,12 @@ ** ** \warning Maxtree should have already been computed. ** - ** \code ** Algorithm used : ** ** Tree is traversed using breadth-first traversal with a queue. ** Counts the children and nodes, The average is ** children_count / node_count. ** - ** \endcode ** ** \return Children per node average. **

1 0

proto-1.0 265: Fix configure for doc generation
by Simon Odou 07 Sep '05

07 Sep '05

Index: ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * configure.ac: Exports TOOLS_LDFLAGS for exdoc. configure.ac | 1 + 1 files changed, 1 insertion(+) Index: configure.ac --- configure.ac (revision 264) +++ configure.ac (working copy) @@ -270,6 +270,7 @@ AC_SUBST([DOC_CPPFLAGS]) +AC_SUBST([TOOLS_LDFLAGS]) AC_OUTPUT

1 0