Olena-patches April 2004

olena-patches@lrde.epita.fr

8 participants
59 discussions

oln 10.169: Updating thanks.
by Giovanni Palma 14 May '04

14 May '04

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * dev/thanks.texi: Update thanks. Index: doc/dev/thanks.texi --- doc/dev/thanks.texi Thu, 07 Aug 2003 20:10:12 +0200 burrus_n (oln/p/40_thanks.tex 1.6 600) +++ doc/dev/thanks.texi Thu, 15 Apr 2004 17:28:13 +0200 palma_g (oln/p/40_thanks.tex 1.6 600) @@ -45,7 +45,17 @@ @end itemize @item Astrid Wang -for her work on static arrays. +@itemize @minus +@item for her work on new documentation system, +@item for her work on static arrays. +@end itemize + +@item Damien Thivolle +@itemize @minus +@item for his contributions to document the code, +@item for his work on generic morphers, +@item for his work on the configuration system. +@end itemize @item David Lesage @itemize @minus @@ -64,7 +74,13 @@ @end itemize @item Giovanni Palma +@itemize @minus +@item for his work on color conversion, +@item for his work on attribute opening and closing algorithms, +@item for his work on new documentation system, +@item for his contributions to document the code, @item for his contributions to cleanup the sources. +@end itemize @item Heru Xue for his work on the color system. @@ -107,6 +123,14 @@ @item for his work on the source tree. @end itemize +@item Niels van Vliet +@itemize @minus +@item for his work on color conversion, +@item for his work on attribute opening and closing algorithms, +@item for his contributions to document the code, +@item for his work on histograms. +@end itemize + @item Pierre-Yves Strub @itemize @minus @item for his work on Olena morpho, @@ -134,6 +158,12 @@ @item Renaud Fran@,cois for his bibliographic research. +@item Simon Odou +@itemize @minus +@item for his contributions to document the code, +@item for his work on generic morphers. +@end itemize + @item Sylvain Berlemont @itemize @minus @item for his work on combinatorial maps, -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

4 5

oln 10.171: Updating files.
by Damien Thivolle 28 Apr '04

28 Apr '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * NEWS: Update the file. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * config/oln.m4: Correct the message that appears when doxygen is not enough up to date. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * dev/abstract.texi: Update the file. * dev/biblio.texi: Update the file. Index: NEWS --- NEWS Mon, 08 Mar 2004 08:12:15 +0100 palma_g (oln/0_NEWS 1.21 600) +++ NEWS Thu, 15 Apr 2004 18:07:12 +0200 thivol_d (oln/0_NEWS 1.21 600) @@ -1,4 +1,4 @@ -Olena 0.10 Not yet +Olena 0.10 April 15, 2004 * New documentaion system. Now any comment should use doxygen style (i.e. /*! ... */). @@ -31,6 +31,15 @@ directly into any other color system. - Conversion between 2 color systems should pass by the RGB one. + * Generic and concrete morphers are now implemented in Olena. + - Five morphers are included in this release: + Color morpher + Sub quantifying morpher + Piece morpher + Iter morpher + Slicing morpher + - These morphers can be manipulated as if they were normal images. + Olena 0.9 August 8, 2003 * New static hierarchy paradigm Index: doc/dev/biblio.texi --- doc/dev/biblio.texi Wed, 20 Aug 2003 16:58:54 +0200 astrid (oln/p/39_biblio.tex 1.4 600) +++ doc/dev/biblio.texi Thu, 15 Apr 2004 17:32:37 +0200 thivol_d (oln/p/39_biblio.tex 1.4 600) @@ -48,6 +48,12 @@ Jérôme Darbon, Thierry Géraud, and Alexandre Duret-Lutz, submitted to International Symposium On Mathematical Morphology VI (ISMM 2002), April 3-5, 2002, Sydney, Australia. + +@item + @cite{Static C++ Object-Oriented Programming (SCOOP)} + Nicolas Burrus, Alexandre Duret-Lutz, Thierry Geraud, David Lesage, + and Raphaël Poss. In the Proceedings of the Workshop on Multiple + Paradigm with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. @end itemize You can download these papers and related materials from Index: doc/dev/abstract.texi --- doc/dev/abstract.texi Sat, 23 Aug 2003 13:44:03 +0200 burrus_n (oln/p/41_abstract.t 1.7.1.2 600) +++ doc/dev/abstract.texi Thu, 15 Apr 2004 17:27:33 +0200 thivol_d (oln/p/41_abstract.t 1.7.1.2 600) @@ -14,18 +14,13 @@ prototypes and throwaway experiments before settling into the kind of programming paradigm which is finally here. -This version of Olena is quite young. In fact most of the operators -have been translated from the sources of Milena, an image processing -library which works only on 2D images (Milena stands for "mini-Olena") -and which is not publicly available. - -We haven't written a real documentation yet. In the @file{doc/} -directory you will find the start of a reference manual which presently -documents only the morphological operators, together with a developer's -guide to the use of Olena from user projects. In the @file{doc/demo/} -directory lie a few sample programs. The file @file{doc/demo/tour.cc} -attempts to introduce you to the basics of Olena. For the rest, we're -afraid you will have to dig the code or e-mail us. +The documentation does not cover the whole project. In the @file{doc/} +directory you will find the first draft of a reference manual. It +only documents the image hierarchy and image processing algorithms. +In the @file{doc/demo/} directory lie a few sample programs. +The file @file{doc/demo/tour.cc} attempts to introduce you to the basics +of Olena. +For the rest, we're afraid you will have to dig the code or e-mail us. Please direct any question or comments to @email{olena@@lrde.epita.fr}, or @email{olena-bugs@@lrde.epita.fr}. -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

3 3

oln 10.148: Make the doc have good dependencies.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ref/Makefile.am: Make the doc have good dependencies. Index: integre/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ntg/Makefile.am: Move source listing into 'makefile.src'. * ntg/makefile.src: Add file. Index: metalic/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * mlc/makefile.src: Add file. * mlc/Makefile.am: Move source listing into 'makefile.src'. Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/makefile.src: Add file. * oln/Makefile.am: Move source listing into 'makefile.src'. Index: doc/ref/Makefile.am --- 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) +++ doc/ref/Makefile.am Mon, 12 Apr 2004 16:46:38 +0200 palma_g (oln/d/51_Makefile.a 1.27.1.17.1.1 600) @@ -1,6 +1,10 @@ # ### # ### General definitions # ### +include $(top_srcdir)/olena/oln/makefile.src +include $(top_srcdir)/metalic/mlc/makefile.src +include $(top_srcdir)/integre/ntg/makefile.src + EXTRA_DIST = out/exdoc.config.in olnsrc = $(top_srcdir)/olena/oln DOXYGEN = doxygen @@ -9,22 +13,27 @@ IMG_CONV = $(srcdir)/img_conv.pl CLEANFILES = html.tar.gz \ oln-ref.pdf - +HDRS_DEP = $(NTG_DEP) +HDRS_DEP += $(MLC_DEP) +HDRS_DEP += $(OLN_DEP) +VPATH += $(top_srcdir)/olena/oln:$(top_srcdir)/integre/ntg:$(top_srcdir)/metalic/mlc:$(top_builddir)/olena/oln doc: html.tar.gz oln-ref.pdf -doxy: - $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) +html.tar.gz: $(HDRS_DEP) mkdir -p img + $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir)/olena + cd $(OUT_DIR) && $(MAKE) -f makefile + $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir)/integre + cd $(OUT_DIR) && $(MAKE) -f makefile + $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir)/metalic cd $(OUT_DIR) && $(MAKE) -f makefile $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config - -html.tar.gz: doxy $(TAR) -czf $@ html -oln-ref.pdf: doxy +oln-ref.pdf: html.tar.gz make -C ./latex || echo "Discarding problems..." # FIXME: Find a better way to use large graph with pdflatex. cp latex/refman.pdf ./$@ @@ -64,3 +73,6 @@ rm -f $(DESTDIR)$(docdir)/$$p1; \ done + + + Index: metalic/mlc/Makefile.am --- metalic/mlc/Makefile.am Fri, 07 Mar 2003 22:34:58 +0100 burrus_n (oln/q/33_Makefile.a 1.7 600) +++ metalic/mlc/Makefile.am Tue, 13 Apr 2004 13:23:24 +0200 palma_g (oln/q/33_Makefile.a 1.7 600) @@ -1,24 +1,6 @@ ## Process this file with Automake to produce Makefile.in -*- Makefile -*- +EXTRA_DIST = makefile.src +include $(srcdir)/makefile.src mlcdir = $(includedir)/mlc -nobase_mlc_HEADERS = \ - array/all.hh \ - array/1d.hh \ - array/1d.hxx \ - array/2d.hh \ - array/2d.hxx \ - array/3d.hh \ - array/3d.hxx \ - array/objs.hh \ - array/nd.hh \ - bool.hh \ - cmp.hh \ - config/system.hh \ - contract.hh \ - is_a.hh \ - loop.hh \ - math.hh \ - objs.hh \ - optional.hh \ - type.hh \ - typeadj.hh +nobase_mlc_HEADERS = $(MLC_DEP) Index: integre/ntg/Makefile.am --- integre/ntg/Makefile.am Fri, 19 Mar 2004 11:53:50 +0100 van-vl_n (oln/q/36_Makefile.a 1.8.1.2 600) +++ integre/ntg/Makefile.am Tue, 13 Apr 2004 13:23:09 +0200 palma_g (oln/q/36_Makefile.a 1.8.1.2 600) @@ -1,5 +1,9 @@ ## Process this file with Automake to produce Makefile.in -*- Makefile -*- +EXTRA_DIST = makefile.src + +include $(srcdir)/makefile.src + ntgdir = $(includedir)/ntg nobase_ntg_HEADERS = \ all.hh \ Index: olena/oln/Makefile.am --- olena/oln/Makefile.am Wed, 07 Apr 2004 19:04:46 +0200 thivol_d (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7 600) +++ olena/oln/Makefile.am Tue, 13 Apr 2004 13:22:51 +0200 palma_g (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7 600) @@ -3,228 +3,10 @@ ### ### Olena headers ### +EXTRA_DIST = makefile.src + +include $(srcdir)/makefile.src olndir = $(includedir)/oln -nobase_oln_HEADERS = \ - arith/internal/opdecls.hh \ - arith/logic.hh \ - arith/ops.hh \ - basics.hh \ - basics1d.hh \ - basics2d.hh \ - basics3d.hh \ - config/system.hh \ - config/pconf.hh \ - convert/basics.hh \ - convert/bound.hh \ - convert/cast.hh \ - convert/abstract/colorconv.hh \ - convert/abstract/conversion.hh \ - convert/conversion.hh \ - convert/conversion_ng_se.hh \ - convert/force.hh \ - convert/nrgbxyz.hh \ - convert/rgbyiq.hh \ - convert/rgbyuv.hh \ - convert/rgbhsi.hh \ - convert/rgbhsl.hh \ - convert/rgbhsv.hh \ - convert/rgbnrgb.hh \ - convert/rgbxyz.hh \ - convert/stretch.hh \ - convert/value_to_point.hh \ - convol/convolution.hh \ - convol/fast_gaussian.hh \ - convol/fast_gaussian.hxx \ - convol/fast_gaussian_coefficient.hh \ - convol/nagao.hh \ - convol/nagao.hxx \ - core/abstract/binary_image.hh \ - core/abstract/behavior.hh \ - core/abstract/dpoint.hh \ - core/abstract/image.hh \ - core/abstract/image_size.hh \ - core/abstract/image_with_dim.hh \ - core/abstract/image_with_impl.hh \ - core/abstract/image_with_type.hh \ - core/abstract/image_with_type_with_dim.hh \ - core/abstract/iter.hh \ - core/abstract/iter1d.hh \ - core/abstract/iter2d.hh \ - core/abstract/iter3d.hh \ - core/abstract/neighborhood.hh \ - core/abstract/neighborhoodnd.hh \ - core/abstract/point.hh \ - core/abstract/struct_elt.hh \ - core/abstract/w_window.hh \ - core/abstract/w_windownd.hh \ - core/abstract/window.hh \ - core/abstract/window_base.hh \ - core/abstract/windownd.hh \ - core/behavior.hh \ - core/accum.hh \ - core/apply.hh \ - core/box.hh \ - core/box.hxx \ - core/bkd_iter1d.hh \ - core/bkd_iter2d.hh \ - core/bkd_iter3d.hh \ - core/compose.hh \ - core/coord.hh \ - core/dpoint1d.hh \ - core/dpoint1d.hxx \ - core/dpoint2d.hh \ - core/dpoint2d.hxx \ - core/dpoint3d.hh \ - core/dpoint3d.hxx \ - core/fold.hh \ - core/fwd_iter1d.hh \ - core/fwd_iter2d.hh \ - core/fwd_iter3d.hh \ - core/generate.hh \ - core/image.hh \ - core/image1d.hh \ - core/image1d_size.hh \ - core/image2d.hh \ - core/image2d_size.hh \ - core/image3d.hh \ - core/image3d_size.hh \ - core/impl/image_impl.hh \ - core/impl/image_array.hh \ - core/impl/image_array1d.hh \ - core/impl/image_array2d.hh \ - core/impl/image_array3d.hh \ - core/internal/fake.hh \ - core/macros.hh \ - core/neighborhood1d.hh \ - core/neighborhood2d.hh \ - core/neighborhood3d.hh \ - core/point1d.hh \ - core/point1d.hxx \ - core/point2d.hh \ - core/point2d.hxx \ - core/point3d.hh \ - core/point3d.hxx \ - core/traverse.hh \ - core/w_window1d.hh \ - core/w_window2d.hh \ - core/w_window3d.hh \ - core/window1d.hh \ - core/window2d.hh \ - core/window3d.hh \ - core/winiter.hh \ - core/winneighb.hh \ - io/base.hh \ - io/basics.hh \ - io/file.hh \ - io/gz.hh \ - io/gz_stream.hh \ - io/image.hh \ - io/image_base.hh \ - io/image_read.hh \ - io/image_write.hh \ - io/pnm_common.hh \ - io/pnm_read.hh \ - io/pnm_read_2d.hh \ - io/pnm_read_3d.hh \ - io/pnm_read_data.hh \ - io/pnm_write.hh \ - io/pnm_write_2d.hh \ - io/pnm_write_3d.hh \ - io/pnm_write_data.hh \ - io/readable.hh \ - io/se.hh \ - io/se_neighborhood.hh \ - io/se_window.hh \ - io/stream_wrapper.hh \ - io/utils.hh \ - level/cc.hh \ - level/compare.hh \ - level/connected.hh \ - level/fill.hh \ - level/invert.hh \ - level/lut.hh \ - level/set_level.hh \ - level/threshold.hh \ - math/macros.hh \ - morpher/color_morpher.hh \ - morpher/generic_morpher.hh \ - morpher/iter_morpher.hh \ - morpher/piece_morpher.hh \ - morpher/slicing_morpher.hh \ - morpher/subq_morpher.hh \ - morpho/attribute_closing_opening.hh \ - morpho/attribute_closing_opening_map.hxx \ - morpho/attribute_closing_opening_map.hh \ - morpho/attributes.hh \ - morpho/attribute_union_find.hh \ - morpho/closing.hh \ - morpho/closing.inc \ - morpho/dilation.hh \ - morpho/environments.hh \ - morpho/erosion.hh \ - morpho/extrema.hh \ - morpho/extrema.hxx \ - morpho/extrema_killer.hh \ - morpho/fast_morpho.hh \ - morpho/fast_morpho.hxx \ - morpho/geodesic_dilation.hh \ - morpho/geodesic_erosion.hh \ - morpho/gradient.hh \ - morpho/gradient.inc \ - morpho/hit_or_miss.hh \ - morpho/hit_or_miss.inc \ - morpho/laplacian.hh \ - morpho/laplacian.inc \ - morpho/minmax.hh \ - morpho/opening.hh \ - morpho/opening.inc \ - morpho/reconstruction.hh \ - morpho/splitse.hh \ - morpho/stat.hh \ - morpho/thinning.hh \ - morpho/thinning.inc \ - morpho/thickening.hh \ - morpho/thickening.inc \ - morpho/top_hat.hh \ - morpho/top_hat.inc \ - morpho/watershed.hh \ - morpho/watershed.hxx \ - topo/combinatorial-map/cmap.hh \ - topo/combinatorial-map/internal/allfunc.hh \ - topo/combinatorial-map/internal/alpha.hh \ - topo/combinatorial-map/internal/anyfunc.hh \ - topo/combinatorial-map/internal/beta.hh \ - topo/combinatorial-map/internal/lambda.hh \ - topo/combinatorial-map/internal/level.hh \ - topo/combinatorial-map/internal/sigma.hh \ - topo/combinatorial-map/internal/zeta.hh \ - topo/dmap.hh \ - topo/dmap.hxx \ - topo/inter-pixel/bkd-dir-iter.hh \ - topo/inter-pixel/fwd-dir-iter.hh \ - topo/inter-pixel/inter-pixel.hh \ - topo/inter-pixel/node.hh \ - topo/inter-pixel/internal/dir-iter.hh \ - topo/inter-pixel/internal/dir.hh \ - topo/tarjan/flat-zone.hh \ - topo/tarjan/tarjan.hh \ - topo/tarjan/tarjan_with_attr.hh \ - topo/tarjan/union.hh \ - transforms/fft.hh \ - transforms/dwt.hh \ - transforms/wavelet_coeffs.hh \ - utils/copy.hh \ - utils/key.hh \ - utils/key.hxx \ - utils/md5.hh \ - utils/md5.hxx \ - utils/buffer.hh \ - utils/buffer.hxx \ - utils/histogram.hh \ - utils/se_stat.hh \ - utils/se_stat.hxx \ - utils/stat.hh \ - utils/special_points.hh \ - utils/timer.hh +nobase_oln_HEADERS = $(OLN_DEP) Index: doc/ref/doxygen.config.in --- doc/ref/doxygen.config.in Thu, 25 Mar 2004 15:00:37 +0100 palma_g (oln/v/29_doxygen.co 1.4 600) +++ doc/ref/doxygen.config.in Mon, 12 Apr 2004 16:08:27 +0200 palma_g (oln/v/29_doxygen.co 1.4 600) @@ -57,7 +57,9 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @top_srcdir@/ +INPUT = @top_srcdir@/olena \ + @top_srcdir@/integre \ + @top_srcdir@/metalic FILE_PATTERNS = *.hh \ *.hxx \ *.cc @@ -71,7 +73,7 @@ EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = @top_builddir@doc/ref/img/ +IMAGE_PATH = @top_builddir@/doc/ref/img/ INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- Index: integre/ntg/makefile.src --- integre/ntg/makefile.src Tue, 13 Apr 2004 13:41:56 +0200 palma_g () +++ integre/ntg/makefile.src Mon, 12 Apr 2004 15:49:19 +0200 palma_g (oln/r/2_makefile.s 644) @@ -0,0 +1,63 @@ +## +## List of headers in integre +## Include this file to have access to their name. +## + +NTG_DEP = \ + all.hh \ + basics.hh \ + bin.hh \ + color.hh \ + color/color.hh \ + color/hsi.hh \ + color/hsl.hh \ + color/hsv.hh \ + color/nrgb.hh \ + color/rgb.hh \ + color/xyz.hh \ + color/yiq.hh \ + color/yuv.hh \ + config/math.hh \ + config/system.hh \ + core/abstract_hierarchy.hh \ + real/behavior.hh \ + core/contract.hh \ + core/internal/global_ops.hh \ + core/internal/global_ops_defs.hh \ + core/internal/global_ops_traits.hh \ + core/internal/macros.hh \ + core/internal/traits.hh \ + core/interval.hh \ + core/macros.hh \ + core/pred_succ.hh \ + core/predecls.hh \ + core/type.hh \ + core/type_traits.hh \ + core/value.hh \ + cplx.hh \ + cycle.hh \ + enum/bin.hh \ + enum/builtin_bool.hh \ + enum/enum_value.hh \ + float.hh \ + int.hh \ + range.hh \ + real/builtin_int.hh \ + real/builtin_float.hh \ + real/builtin_properties.hh \ + real/cycle.hh \ + real/int_s.hh \ + real/int_u.hh \ + real/optraits_builtin_int.hh \ + real/optraits_real.hh \ + real/optraits_real_defs.hh \ + real/range.hh \ + real/real_value.hh \ + real/typetraits_builtin_int.hh \ + utils/cast.hh \ + utils/debug.hh \ + vec.hh \ + vect/cplx.hh \ + vect/cplx_representation.hh \ + vect/vec.hh \ + vect/vect_value.hh Index: metalic/mlc/makefile.src --- metalic/mlc/makefile.src Tue, 13 Apr 2004 13:41:56 +0200 palma_g () +++ metalic/mlc/makefile.src Mon, 12 Apr 2004 15:49:21 +0200 palma_g (oln/r/3_makefile.s 644) @@ -0,0 +1,26 @@ +## +## List of headers in metalic +## Include this file to have access to their name. +## + +MLC_DEP = \ + array/all.hh \ + array/1d.hh \ + array/1d.hxx \ + array/2d.hh \ + array/2d.hxx \ + array/3d.hh \ + array/3d.hxx \ + array/objs.hh \ + array/nd.hh \ + bool.hh \ + cmp.hh \ + config/system.hh \ + contract.hh \ + is_a.hh \ + loop.hh \ + math.hh \ + objs.hh \ + optional.hh \ + type.hh \ + typeadj.hh Index: olena/oln/makefile.src --- olena/oln/makefile.src Tue, 13 Apr 2004 13:41:56 +0200 palma_g () +++ olena/oln/makefile.src Mon, 12 Apr 2004 15:49:25 +0200 palma_g (oln/r/4_makefile.s 644) @@ -0,0 +1,227 @@ +## +## List of headers in olena +## Include this file to have access to their name. +## + +OLN_DEP = \ + arith/internal/opdecls.hh \ + arith/logic.hh \ + arith/ops.hh \ + basics.hh \ + basics1d.hh \ + basics2d.hh \ + basics3d.hh \ + config/system.hh \ + config/pconf.hh \ + convert/basics.hh \ + convert/bound.hh \ + convert/cast.hh \ + convert/abstract/colorconv.hh \ + convert/abstract/conversion.hh \ + convert/conversion.hh \ + convert/conversion_ng_se.hh \ + convert/force.hh \ + convert/nrgbxyz.hh \ + convert/rgbyiq.hh \ + convert/rgbyuv.hh \ + convert/rgbhsi.hh \ + convert/rgbhsl.hh \ + convert/rgbhsv.hh \ + convert/rgbnrgb.hh \ + convert/rgbxyz.hh \ + convert/stretch.hh \ + convert/value_to_point.hh \ + convol/convolution.hh \ + convol/fast_gaussian.hh \ + convol/fast_gaussian.hxx \ + convol/fast_gaussian_coefficient.hh \ + convol/nagao.hh \ + convol/nagao.hxx \ + core/abstract/binary_image.hh \ + core/abstract/behavior.hh \ + core/abstract/dpoint.hh \ + core/abstract/image.hh \ + core/abstract/image_size.hh \ + core/abstract/image_with_dim.hh \ + core/abstract/image_with_impl.hh \ + core/abstract/image_with_type.hh \ + core/abstract/image_with_type_with_dim.hh \ + core/abstract/iter.hh \ + core/abstract/iter1d.hh \ + core/abstract/iter2d.hh \ + core/abstract/iter3d.hh \ + core/abstract/neighborhood.hh \ + core/abstract/neighborhoodnd.hh \ + core/abstract/point.hh \ + core/abstract/struct_elt.hh \ + core/abstract/w_window.hh \ + core/abstract/w_windownd.hh \ + core/abstract/window.hh \ + core/abstract/window_base.hh \ + core/abstract/windownd.hh \ + core/behavior.hh \ + core/accum.hh \ + core/apply.hh \ + core/box.hh \ + core/box.hxx \ + core/bkd_iter1d.hh \ + core/bkd_iter2d.hh \ + core/bkd_iter3d.hh \ + core/compose.hh \ + core/coord.hh \ + core/dpoint1d.hh \ + core/dpoint1d.hxx \ + core/dpoint2d.hh \ + core/dpoint2d.hxx \ + core/dpoint3d.hh \ + core/dpoint3d.hxx \ + core/fold.hh \ + core/fwd_iter1d.hh \ + core/fwd_iter2d.hh \ + core/fwd_iter3d.hh \ + core/generate.hh \ + core/image.hh \ + core/image1d.hh \ + core/image1d_size.hh \ + core/image2d.hh \ + core/image2d_size.hh \ + core/image3d.hh \ + core/image3d_size.hh \ + core/impl/image_impl.hh \ + core/impl/image_array.hh \ + core/impl/image_array1d.hh \ + core/impl/image_array2d.hh \ + core/impl/image_array3d.hh \ + core/internal/fake.hh \ + core/macros.hh \ + core/neighborhood1d.hh \ + core/neighborhood2d.hh \ + core/neighborhood3d.hh \ + core/point1d.hh \ + core/point1d.hxx \ + core/point2d.hh \ + core/point2d.hxx \ + core/point3d.hh \ + core/point3d.hxx \ + core/traverse.hh \ + core/w_window1d.hh \ + core/w_window2d.hh \ + core/w_window3d.hh \ + core/window1d.hh \ + core/window2d.hh \ + core/window3d.hh \ + core/winiter.hh \ + core/winneighb.hh \ + io/base.hh \ + io/basics.hh \ + io/file.hh \ + io/gz.hh \ + io/gz_stream.hh \ + io/image.hh \ + io/image_base.hh \ + io/image_read.hh \ + io/image_write.hh \ + io/pnm_common.hh \ + io/pnm_read.hh \ + io/pnm_read_2d.hh \ + io/pnm_read_3d.hh \ + io/pnm_read_data.hh \ + io/pnm_write.hh \ + io/pnm_write_2d.hh \ + io/pnm_write_3d.hh \ + io/pnm_write_data.hh \ + io/readable.hh \ + io/se.hh \ + io/se_neighborhood.hh \ + io/se_window.hh \ + io/stream_wrapper.hh \ + io/utils.hh \ + level/cc.hh \ + level/compare.hh \ + level/connected.hh \ + level/fill.hh \ + level/invert.hh \ + level/lut.hh \ + level/set_level.hh \ + level/threshold.hh \ + math/macros.hh \ + morpher/color_morpher.hh \ + morpher/generic_morpher.hh \ + morpher/iter_morpher.hh \ + morpher/piece_morpher.hh \ + morpher/slicing_morpher.hh \ + morpher/subq_morpher.hh \ + morpho/attribute_closing_opening.hh \ + morpho/attribute_closing_opening_map.hxx \ + morpho/attribute_closing_opening_map.hh \ + morpho/attributes.hh \ + morpho/attribute_union_find.hh \ + morpho/closing.hh \ + morpho/closing.inc \ + morpho/dilation.hh \ + morpho/environments.hh \ + morpho/erosion.hh \ + morpho/extrema.hh \ + morpho/extrema.hxx \ + morpho/extrema_killer.hh \ + morpho/fast_morpho.hh \ + morpho/fast_morpho.hxx \ + morpho/geodesic_dilation.hh \ + morpho/geodesic_erosion.hh \ + morpho/gradient.hh \ + morpho/gradient.inc \ + morpho/hit_or_miss.hh \ + morpho/hit_or_miss.inc \ + morpho/laplacian.hh \ + morpho/laplacian.inc \ + morpho/minmax.hh \ + morpho/opening.hh \ + morpho/opening.inc \ + morpho/reconstruction.hh \ + morpho/splitse.hh \ + morpho/stat.hh \ + morpho/thinning.hh \ + morpho/thinning.inc \ + morpho/thickening.hh \ + morpho/thickening.inc \ + morpho/top_hat.hh \ + morpho/top_hat.inc \ + morpho/watershed.hh \ + morpho/watershed.hxx \ + topo/combinatorial-map/cmap.hh \ + topo/combinatorial-map/internal/allfunc.hh \ + topo/combinatorial-map/internal/alpha.hh \ + topo/combinatorial-map/internal/anyfunc.hh \ + topo/combinatorial-map/internal/beta.hh \ + topo/combinatorial-map/internal/lambda.hh \ + topo/combinatorial-map/internal/level.hh \ + topo/combinatorial-map/internal/sigma.hh \ + topo/combinatorial-map/internal/zeta.hh \ + topo/dmap.hh \ + topo/dmap.hxx \ + topo/inter-pixel/bkd-dir-iter.hh \ + topo/inter-pixel/fwd-dir-iter.hh \ + topo/inter-pixel/inter-pixel.hh \ + topo/inter-pixel/node.hh \ + topo/inter-pixel/internal/dir-iter.hh \ + topo/inter-pixel/internal/dir.hh \ + topo/tarjan/flat-zone.hh \ + topo/tarjan/tarjan.hh \ + topo/tarjan/tarjan_with_attr.hh \ + topo/tarjan/union.hh \ + transforms/fft.hh \ + transforms/dwt.hh \ + transforms/wavelet_coeffs.hh \ + utils/copy.hh \ + utils/key.hh \ + utils/key.hxx \ + utils/md5.hh \ + utils/md5.hxx \ + utils/buffer.hh \ + utils/buffer.hxx \ + utils/histogram.hh \ + utils/se_stat.hh \ + utils/se_stat.hxx \ + utils/stat.hh \ + utils/special_points.hh \ + utils/timer.hh -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.150: Doxygen.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ref/Makefile.am: Make the makefile use the doxygen defined by configure. +2004-04-13 Giovanni Palma <giovanni(a)lrde.epita.fr> + * ref/Makefile.am: Make the doc have good dependencies. 2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr> Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Tue, 13 Apr 2004 13:42:44 +0200 palma_g (oln/d/51_Makefile.a 1.27.1.17.1.2 600) +++ doc/ref/Makefile.am Tue, 13 Apr 2004 14:38:34 +0200 palma_g (oln/d/51_Makefile.a 1.27.1.17.1.2 600) @@ -7,7 +7,6 @@ EXTRA_DIST = out/exdoc.config.in olnsrc = $(top_srcdir)/olena/oln -DOXYGEN = doxygen EXDOC = $(srcdir)/exdoc.pl OUT_DIR = "out" IMG_CONV = $(srcdir)/img_conv.pl -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.159: Disable watershed tests.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/morpho/tests/md5_morpho_watershed_hh0: Disable the test. * tests/morpho/tests/md5_morpho_watershed_hh1: Likewise. Index: olena/tests/morpho/tests/md5_morpho_watershed_hh1 --- olena/tests/morpho/tests/md5_morpho_watershed_hh1 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/29_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_watershed_hh1 Wed, 14 Apr 2004 16:47:27 +0200 palma_g (oln/k/29_md5_morpho 1.1 600) @@ -10,16 +10,21 @@ int main() { -oln::utils::key::value_type data_key[16] = {0xdd, 0x59, 0x5a, 0x51, 0x68, 0xc5, 0xfc, 0xb7, 0x79, 0x67, 0x33, 0xa8, 0xd8, 0x40, 0x95, 0xd}; + oln::utils::key::value_type data_key[16] = {0xdd, 0x59, 0x5a, 0x51, 0x68, + 0xc5, 0xfc, 0xb7, 0x79, 0x67, + 0x33, 0xa8, 0xd8, 0x40, 0x95, + 0xd}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena256.pgm"))); - if (oln::utils::md5(oln::morpho::watershed_con<ntg:: -int_u16>(im1, oln::neighb_c4())) == key) + if (oln::utils::md5(oln::morpho::watershed_con<ntg::int_u16>(im1, + oln::neighb_c4())) == key) + { std::cout << "OK" << std::endl; + return true; // XFAIL Don't give the same result with icc and g++ + } else { std::cout << "FAIL" << std::endl; Index: olena/tests/morpho/tests/md5_morpho_watershed_hh0 --- olena/tests/morpho/tests/md5_morpho_watershed_hh0 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/k/30_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_watershed_hh0 Wed, 14 Apr 2004 16:47:25 +0200 palma_g (oln/k/30_md5_morpho 1.1 600) @@ -10,16 +10,22 @@ int main() { -oln::utils::key::value_type data_key[16] = {0xc4, 0x69, 0x68, 0x78, 0xd6, 0x80, 0x46, 0x20, 0x3f, 0x93, 0x93, 0x46, 0x9c, 0x90, 0x8d, 0x5b}; + oln::utils::key::value_type data_key[16] = {0xc4, 0x69, 0x68, 0x78, 0xd6, + 0x80, 0x46, 0x20, 0x3f, 0x93, + 0x93, 0x46, 0x9c, 0x90, 0x8d, + 0x5b}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena256.pgm"))); - if (oln::utils::md5(oln::morpho::watershed_seg<ntg:: -int_u16>(im1, oln::neighb_c4())) == key) + + if (oln::utils::md5(oln::morpho::watershed_seg<ntg::int_u16>(im1, + oln::neighb_c4())) == key) + { std::cout << "OK" << std::endl; + return true; // XFAIL Don't give the same result with icc and g++ + } else { std::cout << "FAIL" << std::endl; -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.165: Disable tests.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/morpho/tests/attr_op_cl: Disable dist closing/opening tests. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh12: Disable test. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh13: Disable test. Index: olena/tests/morpho/tests/attr_op_cl --- olena/tests/morpho/tests/attr_op_cl Wed, 10 Mar 2004 16:20:23 +0100 palma_g (oln/k/0_attr_op_cl 1.3 600) +++ olena/tests/morpho/tests/attr_op_cl Thu, 15 Apr 2004 13:42:45 +0200 palma_g (oln/k/0_attr_op_cl 1.3 600) @@ -68,7 +68,7 @@ test_op_cl(int_u8, height, lena, 4); test_op_cl(int_u8, maxvalue, lena, 100); test_op_cl(int_u8, minvalue, lena, 100); - test_op_cl(int_u8, dist, lena, 100); + // test_op_cl(int_u8, dist, lena, 100); FIXME: doesn't work. test_op_cl(int_u8, ball, lena, 100); test_op_cl(int_u8, cube, lena, 50); Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh13 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh13 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/m/6_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh13 Thu, 15 Apr 2004 13:45:15 +0200 palma_g (oln/m/6_md5_morpho 1.1 600) @@ -11,16 +11,21 @@ int main() { -oln::utils::key::value_type data_key[16] = {0xf5, 0x8f, 0xe8, 0x56, 0x5d, 0xd6, 0xf1, 0x1b, 0xa0, 0x91, 0x6b, 0x22, 0x7a, 0x3a, 0x25, 0x90}; + oln::utils::key::value_type data_key[16] = {0xf5, 0x8f, 0xe8, 0x56, 0x5d, + 0xd6, 0xf1, 0x1b, 0xa0, 0x91, + 0x6b, 0x22, 0x7a, 0x3a, 0x25, + 0x90}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); im1 = oln::morpho::fast::dist_closing(im1, oln::neighb_c4(), 5); if (oln::utils::md5(im1) == key) + { std::cout << "OK" << std::endl; + return true; // XFAIL FIXME: DO NOT GIVE THE SAME RESULT ON x86 and mac. + } else { std::cout << "FAIL" << std::endl; Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh12 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh12 Tue, 23 Mar 2004 14:36:33 +0100 palma_g (oln/m/7_md5_morpho 1.1 600) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh12 Thu, 15 Apr 2004 13:44:25 +0200 palma_g (oln/m/7_md5_morpho 1.1 600) @@ -11,16 +11,23 @@ int main() { -oln::utils::key::value_type data_key[16] = {0x8b, 0xd5, 0xbc, 0xc, 0x93, 0x3e, 0x16, 0xc3, 0xce, 0x63, 0xc1, 0x41, 0xf, 0x8f, 0xc2, 0x1a}; + oln::utils::key::value_type data_key[16] = {0x8b, 0xd5, 0xbc, 0xc, 0x93, + 0x3e, 0x16, 0xc3, 0xce, 0x63, + 0xc1, 0x41, 0xf, 0x8f, 0xc2, + 0x1a}; oln::utils::key key(data_key); - typedef oln::image2d<ntg:: -int_u8> im_type; + typedef oln::image2d<ntg::int_u8> im_type; im_type im1(oln::load(rdata("lena128.pgm"))); + im1 = oln::morpho::fast::dist_opening(im1, oln::neighb_c4(), 5); if (oln::utils::md5(im1) == key) + { std::cout << "OK" << std::endl; + + return true; // XFAIL FIXME: DO NOT GIVE THE SAME RESULT ON x86 and mac. + } else { std::cout << "FAIL" << std::endl; -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.167: Change flags order.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: tools/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * utilities/morpho/Makefile.am: Change flags order. Index: tools/utilities/morpho/Makefile.am --- tools/utilities/morpho/Makefile.am Tue, 29 Jul 2003 18:21:22 +0200 david (oln/i/32_Makefile.a 1.9.1.5 600) +++ tools/utilities/morpho/Makefile.am Thu, 15 Apr 2004 15:21:50 +0200 palma_g (oln/i/32_Makefile.a 1.9.1.5 600) @@ -1,10 +1,10 @@ ## Process this file with Automake to produce Makefile.in -*- Makefile -*- AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) $(ZLIB_CXXFLAGS) -AM_LDFLAGS = $(LDFLAGS) $(ZLIB_LDFLAGS) +AM_LDFLAGS = $(LDFLAGS) INCLUDES = -I$(srcdir)/../../lib -LDADD = ../../lib/libolntools.a +LDADD = ../../lib/libolntools.a $(ZLIB_LDFLAGS) $(srcdir)/morpho-rules.make: $(srcdir)/generate_morpho.sh $(SHELL) $(srcdir)/generate_morpho.sh $(srcdir) -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.173: Reorder flags.
by Giovanni Palma 28 Apr '04

28 Apr '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/check/Makefile.flags: Reorder flags. * tests/check/Makefile.check: Likewise. * tests/check/Makefile.runtests: Likewise. +2004-04-15 Giovanni Palma <giovanni(a)lrde.epita.fr> + * tests/morpho/tests/attr_op_cl: Disable dist closing/opening tests. Index: olena/tests/check/Makefile.flags --- olena/tests/check/Makefile.flags Fri, 01 Aug 2003 02:45:53 +0200 burrus_n (oln/q/39_Makefile.f 1.4.1.1 600) +++ olena/tests/check/Makefile.flags Thu, 15 Apr 2004 18:22:28 +0200 palma_g (oln/q/39_Makefile.f 1.4.1.1 600) @@ -2,4 +2,4 @@ AM_CXXFLAGS = $(CXXFLAGS_OPTIMIZE) $(CXXFLAGS_STRICT_ERRORS) $(ZLIB_CXXFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/metalic/tests/check -I$(top_srcdir)/olena/tests/check -AM_LDFLAGS = $(ZLIB_LDFLAGS) +AM_LDFLAGS = Index: olena/tests/check/Makefile.check --- olena/tests/check/Makefile.check Fri, 01 Aug 2003 02:45:53 +0200 burrus_n (oln/q/40_Makefile.c 1.4 600) +++ olena/tests/check/Makefile.check Thu, 15 Apr 2004 18:22:43 +0200 palma_g (oln/q/40_Makefile.c 1.4 600) @@ -2,5 +2,5 @@ # This Makefile is designed to be included by olena/tests/* directories. -LDADD = ../check/libolncheck.a +LDADD = ../check/libolncheck.a $(ZLIB_LDFLAGS) TESTS = $(check_PROGRAMS) Index: olena/tests/check/Makefile.runtests --- olena/tests/check/Makefile.runtests Tue, 05 Aug 2003 21:39:33 +0200 burrus_n (oln/u/32_Makefile.r 1.2 600) +++ olena/tests/check/Makefile.runtests Thu, 15 Apr 2004 18:36:47 +0200 palma_g (oln/u/32_Makefile.r 1.2 600) @@ -6,7 +6,7 @@ CPPFLAGS_RUNTESTS = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -I$(top_builddir) -I$(srcdir) -I. CXXFLAGS_RUNTESTS = $(CXXFLAGS) $(AM_CXXFLAGS) -LDADD_RUNTESTS = ../check/libolncheck.a +LDADD_RUNTESTS = ../check/libolncheck.a $(ZLIB_LDFLAGS) check-runtests: TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \ -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.172: Update faq.texi
by Damien Thivolle 28 Apr '04

28 Apr '04

Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * dev/faq.texi: Update the file. +2004-04-15 Damien Thivolle <damien(a)lrde.epita.fr> + * dev/abstract.texi: Update the file. * dev/biblio.texi: Update the file. Index: doc/dev/faq.texi --- doc/dev/faq.texi Sun, 04 May 2003 21:38:39 +0200 burrus_n (oln/p/44_faq.texi 1.10 600) +++ doc/dev/faq.texi Thu, 15 Apr 2004 19:28:53 +0200 thivol_d (oln/p/44_faq.texi 1.10 600) @@ -112,6 +112,12 @@ Run @command{configure CXXFLAGS=''}. See the file @file{BUILD} at the toplevel source directory. +@item Explanation 3 +Your compiler has internal problem. + +@item Solution 3 +Lower the limit of inlining: set CXXFLAGS_OPTIMIZE to -finline-limit-500 -O2 + @end table @unnumberedsubsec Wrong include path @@ -168,6 +174,22 @@ @end table +@unnumberedsubsec Errors in standard headers + +@cindex errors, in standard headers +@cindex HP-UX +@cindex NetBSD +@cindex @env{CXXFLAGS} + +@table @strong +@item Problem +The math functions (acos, ...) are not declared. + +@item Solution +Set CXXFLAGS to -includemath.h. + +@end table + @unnumberedsubsec Invalid data saved on I/O @cindex big-endian @@ -188,3 +210,5 @@ generated images are bigger. @end table + + -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 1

oln 10.162: Readd tests to swilena
by Damien Thivolle 28 Apr '04

28 Apr '04

En fait c'etait simplement ICC qui faisait des siennes. Conclusion, ICC il compile plus vite mais moins bien que g++. Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Correct the message that appears when doxygen is not enough up to date. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * configure.ac: Remove doxygen detection when ./configure is run with `--without-doc'. Index: tools/swilena/ChangeLog from 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. * swilena/python/Makefile.am: Likewise. * swilena/python/tests/morpho.py: Fix. * swilena/python/swilena_all1d.py: Adjust according to the split of swilena_morpho1d. * swilena/python/swilena_all2d.py: Likewise for swilena_morpho2d. * swilena/python/swilena_all3d.py: Likewise for swilena_morpho3d. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * tools/swilena/ruby/tests/Makefile.am: Add comments. * tools/swilena/python/tests/Makefile.am: Likewise. Index: config/oln.m4 --- config/oln.m4 Tue, 13 Apr 2004 19:49:30 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.4 600) +++ config/oln.m4 Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.5 600) @@ -354,7 +354,7 @@ ac_cv_doxygen_version=old fi]) if [ [ "$ac_cv_doxygen_version" = "old" ] ] ; then - AC_MSG_ERROR([Doxygen 1.3.4 or newer is required]) + AC_MSG_ERROR([Doxygen 1.3.4 or newer is required, run ./configure with --without-doc to disable the doc build]) fi ]) Index: tools/swilena/python/tests/Makefile.am --- tools/swilena/python/tests/Makefile.am Wed, 14 Apr 2004 17:41:51 +0200 thivol_d (oln/v/15_Makefile.a 1.3 600) +++ tools/swilena/python/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/15_Makefile.a 1.4 600) @@ -8,5 +8,5 @@ IMGDIR="$(top_srcdir)/olena/img" -## Remove comments when it works -## TESTS = arith.py conversions.py simple1.py morpho.py + +TESTS = arith.py conversions.py simple1.py morpho.py Index: tools/swilena/ruby/Makefile.am --- tools/swilena/ruby/Makefile.am Wed, 14 Apr 2004 17:16:51 +0200 thivol_d (oln/v/17_Makefile.a 1.5 600) +++ tools/swilena/ruby/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/17_Makefile.a 1.6 600) @@ -3,7 +3,7 @@ ## Makefile.am for swilena/python ## -SUBDIRS = . +SUBDIRS = . tests rubydir = $(libdir)/ruby Index: tools/swilena/ruby/tests/Makefile.am --- tools/swilena/ruby/tests/Makefile.am Wed, 14 Apr 2004 17:41:51 +0200 thivol_d (oln/v/18_Makefile.a 1.2 600) +++ tools/swilena/ruby/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/18_Makefile.a 1.3 600) @@ -8,5 +8,4 @@ IMGDIR="$(top_srcdir)/olena/img" -## Remove comments when it works. -## TESTS = simple1.rb +TESTS = simple1.rb Index: tools/swilena/python/tests/morpho.py --- tools/swilena/python/tests/morpho.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/47_morpho.py 1.1 700) +++ tools/swilena/python/tests/morpho.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/47_morpho.py 1.2 700) @@ -7,5 +7,6 @@ imgdir = os.environ['IMGDIR'] lena = image2d_u8(load(imgdir + "/lena.pgm")) -closing(lena, win_c4p()) +lenas32 = cast_to_int_s32(lena) +closing(lenas32, win_c4p()) #watershed_seg(lena, neighb_c4()) Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Wed, 14 Apr 2004 17:16:51 +0200 thivol_d (oln/w/2_Makefile.a 1.3 600) +++ tools/swilena/python/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/2_Makefile.a 1.4 600) @@ -3,7 +3,7 @@ ## Makefile.am for swilena/python ## -SUBDIRS = . +SUBDIRS = . tests python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py Index: tools/swilena/python/swilena_all1d.py --- tools/swilena/python/swilena_all1d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/3_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all1d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/3_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image1d import * from swilena_imagesize1d import * from swilena_point1d import * -from swilena_morpho1d import * +from swilena_morpho1d_ntg_bin import * +from swilena_morpho1d_ntg_int_u32 import * +from swilena_morpho1d_ntg_int_u8 import * +from swilena_morpho1d_ntg_int_s32 import * +from swilena_morpho1d_ntg_int_u32 import * +from swilena_morpho1d_ntg_float import * from swilena_structelt1d import * from swilena_w_win1d import * from swilena_conversions1d import * Index: tools/swilena/python/swilena_all2d.py --- tools/swilena/python/swilena_all2d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/4_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all2d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/4_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image2d import * from swilena_imagesize2d import * from swilena_point2d import * -from swilena_morpho2d import * +from swilena_morpho2d_ntg_bin import * +from swilena_morpho2d_ntg_int_u8 import * +from swilena_morpho2d_ntg_int_u32 import * +from swilena_morpho2d_ntg_int_s8 import * +from swilena_morpho2d_ntg_int_s32 import * +from swilena_morpho2d_ntg_float import * from swilena_structelt2d import * from swilena_w_win2d import * from swilena_conversions2d import * Index: tools/swilena/python/swilena_all3d.py --- tools/swilena/python/swilena_all3d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/5_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all3d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/5_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image3d import * from swilena_imagesize3d import * from swilena_point3d import * -from swilena_morpho3d import * +from swilena_morpho3d_ntg_bin import * +from swilena_morpho3d_ntg_int_u32 import * +from swilena_morpho3d_ntg_int_u8 import * +from swilena_morpho3d_ntg_int_s32 import * +from swilena_morpho3d_ntg_int_s8 import * +from swilena_morpho3d_ntg_float import * from swilena_structelt3d import * from swilena_w_win3d import * from swilena_conversions3d import * -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 2

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