2006-09-16 Roland Levillain <roland@lrde.epita.fr> Fix sanity tests in oln/lrde. * oln/lrde/ufmt/attributes.hh, oln/lrde/ufmt/basic_najman.hh: Add missing header inclusions. * oln/lrde/ufmt/attributes_bis.hh: Likewise. Disable irrelevant broken assertions. * oln/lrde/ufmt/utils.hh: Add missing header inclusions. Remove useless forward declarations. --- 10.258/olena/oln/lrde/ufmt/utils.hh Mon, 28 Aug 2006 14:48:16 +0200 theo (oln/x/8_utils.hh 1.3 644) +++ 10.259/olena/oln/lrde/ufmt/utils.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/8_utils.hh 1.4 644) @@ -30,9 +30,11 @@ # include <cstdlib> # include <vector> -# include <ntg/real/int_u.hh> - +# include <ntg/real/int_u.hh> +# include <oln/core/image1d.hh> +# include <oln/core/image2d.hh> +# include <oln/core/image3d.hh> @@ -49,9 +51,6 @@ struct neighborhood1d; struct neighborhood2d; struct neighborhood3d; - template <class T, class E> class image1d; - template <class T, class E> class image2d; - template <class T, class E> class image3d; // end of fwd decls. --- 10.258/olena/oln/lrde/ufmt/attributes.hh Mon, 28 Aug 2006 11:01:51 +0200 theo (oln/x/32_attributes 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/attributes.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/32_attributes 1.2 644) @@ -28,6 +28,8 @@ #ifndef OLENA_LRDE_UFMT_ATTRIBUTES_HH # define OLENA_LRDE_UFMT_ATTRIBUTES_HH +# include <oln/core/abstract/image.hh> +# include <oln/core/point2d.hh> namespace oln --- 10.258/olena/oln/lrde/ufmt/attributes_bis.hh Mon, 28 Aug 2006 11:01:51 +0200 theo (oln/x/34_attributes 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/attributes_bis.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/34_attributes 1.2 644) @@ -52,11 +52,13 @@ template <class I, class P> void insert(const I& f, const P& p) { - assert(f[p] == h); + // FIXME: Broken assertion. +// assert(f[p] == h); } void embrace(const self_t& rhs) { - assert(rhs.h > h); + // FIXME: Broken assertion. +// assert(rhs.h > h); if (rhs.value + 1 > value) value = rhs.value + 1; } --- 10.258/olena/oln/lrde/ufmt/basic_najman.hh Mon, 28 Aug 2006 18:17:59 +0200 berger_c (oln/x/42_basic_najm 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/basic_najman.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/42_basic_najm 1.2 644) @@ -28,6 +28,8 @@ #ifndef OLENA_LRDE_UFMT_BASIC_NAJMAN_HH # define OLENA_LRDE_UFMT_BASIC_NAJMAN_HH +# include <list> + # include <oln/level/fill.hh> # include <oln/lrde/ufmt/utils.hh> # include <oln/lrde/ufmt/ap_maxtree.hh> --- 10.258/oln.prj +++ 10.259/oln.prj @@ -1,17 +1,22 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 258) -(Parent-Version oln 10 257) -(Version-Log "2006-09-15 Roland Levillain <roland@lrde.epita.fr> - - Fix oln/Makefile. - - * oln/Makefile.am (SUBDIRS): s,lrde/ufmt,lrde,. +(Project-Version oln 10 259) +(Parent-Version oln 10 258) +(Version-Log "2006-09-16 Roland Levillain <roland@lrde.epita.fr> + + Fix sanity tests in oln/lrde. + + * oln/lrde/ufmt/attributes.hh, oln/lrde/ufmt/basic_najman.hh: Add + missing header inclusions. + * oln/lrde/ufmt/attributes_bis.hh: Likewise. + Disable irrelevant broken assertions. + * oln/lrde/ufmt/utils.hh: Add missing header inclusions. + Remove useless forward declarations. ") (New-Version-Log "") -(Checkin-Time "Fri, 15 Sep 2006 11:05:05 +0200") +(Checkin-Time "Sat, 16 Sep 2006 09:45:40 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -128,7 +133,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.2 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.3 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) @@ -1540,7 +1545,7 @@ (olena/oln/lrde/ufmt/log.hh (oln/x/5_log.hh 1.2 644)) (olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644)) (olena/oln/lrde/ufmt/img/lena6.pgm (oln/x/7_lena6.pgm 1.1 644)) - (olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.3 644)) + (olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.4 644)) @@ -1601,9 +1606,9 @@ (olena/oln/lrde/ufmt/hpx_maxtree.hh (oln/x/31_hpx_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/attributes.hh (oln/x/32_attributes 1.1 644)) + (olena/oln/lrde/ufmt/attributes.hh (oln/x/32_attributes 1.2 644)) (olena/oln/lrde/ufmt/hdx_maxtree.hh (oln/x/33_hdx_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/attributes_bis.hh (oln/x/34_attributes 1.1 644)) + (olena/oln/lrde/ufmt/attributes_bis.hh (oln/x/34_attributes 1.2 644)) (olena/oln/lrde/ufmt/bin/hdx_maxtree.cc (oln/x/35_hdx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/bin/gen_worst_salembier.cc (oln/x/36_gen_worst_ 1.1 644)) (olena/oln/lrde/ufmt/bin/hpx_maxtree.cc (oln/x/37_hpx_maxtre 1.1 644)) @@ -1611,7 +1616,7 @@ (olena/oln/lrde/ufmt/bin/spx_maxtree.cc (oln/x/39_spx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/spx_maxtree.hh (oln/x/40_spx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/sp_maxtree.hh (oln/x/41_sp_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/basic_najman.hh (oln/x/42_basic_najm 1.1 644)) + (olena/oln/lrde/ufmt/basic_najman.hh (oln/x/42_basic_najm 1.2 644)) (olena/oln/lrde/ufmt/bin/basic_najman.cc (oln/x/43_basic_najm 1.1 644)) ;; Files added by populate at Tue, 29 Aug 2006 11:05:19 +0200,