Olena-patches April 2004

olena-patches@lrde.epita.fr

8 participants
59 discussions

oln 10.178: Add Sanity Check. Fix make clean in swilena.

by Niels Van Vliet

[Ce n'est pas mon jour, je ne devais pas checkin les generate*py. J'avais une version diminué pour accélerer la compilation de swilena] Index: integre/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * integre/tests/sanity/Makefile.am: Replace maintainer-check by check. +2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr> + * integre/ntg/core/internal/traits.hh: Include headers so as to pass sanity check. Index: metalic/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * metalic/tests/sanity/Makefile.am: Replace maintainer-check by check. +2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr> + * tests/*/tests/* (6 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/tests/sanity/Makefile.am: Replace maintainer-check by check. +2004-04-20 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. Index: tools/swilena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * tools/swilena/expand.sh (generation of makefile.swig): Add cxx files to CLEANFILES. * tools/swilena/python/Makefile.am (CLEANFILES): Remove. +2004-04-20 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> Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Tue, 20 Apr 2004 16:03:16 +0200 van-vl_n (oln/w/2_Makefile.a 1.6 600) +++ tools/swilena/python/Makefile.am Tue, 20 Apr 2004 16:08:52 +0200 van-vl_n (oln/w/2_Makefile.a 1.6 600) @@ -9,4 +9,3 @@ include makefile.swig -CLEANFILES = *.pyc *.cxx Index: olena/tests/sanity/Makefile.am --- olena/tests/sanity/Makefile.am Wed, 12 Mar 2003 17:13:14 +0100 burrus_n (oln/f/48_Makefile.a 1.4.1.2 600) +++ olena/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:05:35 +0200 van-vl_n (oln/f/48_Makefile.a 1.4.1.2 600) @@ -1,6 +1,6 @@ EXTRA_DIST = includes.test -maintainer-check: +check: TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \ TOP_BUILDDIR=$(top_builddir) \ PATH_TO_OLN_SRCDIR=$(OLN_LOCAL_SRC) \ Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Tue, 13 Apr 2004 19:49:30 +0200 thivol_d (oln/s/25_expand.sh 1.16 700) +++ tools/swilena/expand.sh Tue, 20 Apr 2004 17:42:29 +0200 van-vl_n (oln/s/25_expand.sh 1.16 700) @@ -111,9 +111,15 @@ done echo; echo echo -ne "CLEANFILES= " + echo -e " swilena_all1d_wrap.cxx \\" + echo -e " swilena_all2d_wrap.cxx \\" + echo -e " swilena_all3d_wrap.cxx \\" + echo -ne " swilena_display_wrap.cxx" for mod in $MODULES; do echo -e "\\" echo -ne "\t swilena_$mod.py" + echo -e "\\" + echo -ne "\t swilena_${mod}_wrap.cxx" done echo; echo Index: integre/tests/sanity/Makefile.am --- integre/tests/sanity/Makefile.am Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/t/0_Makefile.a 1.1 600) +++ integre/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:06:17 +0200 van-vl_n (oln/t/0_Makefile.a 1.1 600) @@ -1,6 +1,6 @@ EXTRA_DIST = includes.test -maintainer-check: +check: TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \ TOP_BUILDDIR=$(top_builddir) \ PATH_TO_NTG_SRCDIR=$(NTG_LOCAL_SRC) \ Index: metalic/tests/sanity/Makefile.am --- metalic/tests/sanity/Makefile.am Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/t/2_Makefile.a 1.1 600) +++ metalic/tests/sanity/Makefile.am Tue, 20 Apr 2004 16:06:06 +0200 van-vl_n (oln/t/2_Makefile.a 1.1 600) @@ -1,6 +1,6 @@ EXTRA_DIST = includes.test -maintainer-check: +check: TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \ TOP_BUILDDIR=$(top_builddir) \ PATH_TO_MLC_SRCDIR=$(MLC_LOCAL_SRC) \ Ne pas lire la suite, c'est une err de ma part de l'avoir checkin. Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Mon, 12 Apr 2004 12:56:30 +0200 van-vl_n (oln/v/24_generate_m 1.8 700) +++ tools/swilena/generate_morpho_instantiations.py Tue, 20 Apr 2004 16:36:38 +0200 van-vl_n (oln/v/24_generate_m 1.8 700) @@ -13,13 +13,13 @@ file.close() def open_files(path): - for dim in range(1, 4): + for dim in range(1, 2): for type in range(1, 7): str_type = dict_type_num[type] files.append(open(path + "/swilena_morpho%(dim)sd_%(str_type)s.i" % vars(), 'w')) def write_headers(): - for dim in range(1, 4): + for dim in range(1, 2): for type in range(1, 7): str_type = dict_type_num[type] file = files[(dim - 1)* 6 + type - 1] @@ -50,7 +50,7 @@ def write_algorithms(): # Algorithms with all types and all dims - for dim in range(1, 4): + for dim in range(1, 2): for type in [ "ntg_bin", "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", @@ -64,100 +64,7 @@ # FIXME: these algorithms do not work with floats if type != "ntg_float": instantiate(idx, "erosion", img_type, img_type, win_type) - instantiate(idx, "fast_erosion", img_type, img_type, win_type) - - instantiate(idx, "dilation", img_type, img_type, win_type) - instantiate(idx, "fast_dilation", img_type, img_type, win_type) - - instantiate(idx, "opening", img_type, img_type, win_type) - instantiate(idx, "fast_opening", img_type, img_type, win_type) - - instantiate(idx, "closing", img_type, img_type, win_type) - instantiate(idx, "fast_closing", img_type, img_type, win_type) - - instantiate(idx, "thickening", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_thickening", img_type, img_type, win_type, win_type) - - instantiate(idx, "thinning", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_thinning", img_type, img_type, win_type, win_type) - - instantiate(idx, "geodesic_erosion", img_type, img_type, img_type, neighb_type) - instantiate(idx, "sure_geodesic_erosion", img_type, img_type, img_type, neighb_type) - - instantiate(idx, "geodesic_dilation", img_type, img_type, img_type, neighb_type) - instantiate(idx, "sure_geodesic_dilation", img_type, img_type, img_type, neighb_type) - - instantiate(idx, "sure_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - instantiate(idx, "sequential_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - instantiate(idx, "hybrid_geodesic_reconstruction_dilation", img_type, img_type, img_type, neighb_type) - - instantiate(idx, "sure_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - instantiate(idx, "sequential_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - instantiate(idx, "hybrid_geodesic_reconstruction_erosion", img_type, img_type, img_type, neighb_type) - - instantiate(idx, "hit_or_miss", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_hit_or_miss", img_type, img_type, win_type, win_type) - - instantiate(idx, "hit_or_miss_opening", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_hit_or_miss_opening", img_type, img_type, win_type, win_type) - - instantiate(idx, "hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_hit_or_miss_opening_bg", img_type, img_type, win_type, win_type) - - instantiate(idx, "hit_or_miss_closing", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_hit_or_miss_closing", img_type, img_type, win_type, win_type) - - instantiate(idx, "hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) - instantiate(idx, "fast_hit_or_miss_closing_bg", img_type, img_type, win_type, win_type) - - # FIXME: This should work with other types. - if type != "ntg_bin": - instantiate(idx, "beucher_gradient", img_type, img_type, win_type) - instantiate(idx, "fast_beucher_gradient", img_type, img_type, win_type) - - instantiate(idx, "internal_gradient", img_type, img_type, win_type) - instantiate(idx, "fast_internal_gradient", img_type, img_type, win_type) - - instantiate(idx, "external_gradient", img_type, img_type, win_type) - instantiate(idx, "fast_external_gradient", img_type, img_type, win_type) - - instantiate(idx, "white_top_hat", img_type, img_type, win_type) - instantiate(idx, "fast_white_top_hat", img_type, img_type, win_type) - - instantiate(idx, "black_top_hat", img_type, img_type, win_type) - instantiate(idx, "fast_black_top_hat", img_type, img_type, win_type) - - instantiate(idx, "self_complementary_top_hat", img_type, img_type, win_type) - instantiate(idx, "fast_self_complementary_top_hat", img_type, img_type, win_type) - - instantiate(idx, "top_hat_contrast_op", img_type, img_type, win_type) - instantiate(idx, "fast_top_hat_contrast_op", img_type, img_type, win_type) - # Watershed - img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() - instantiate(idx, "watershed_seg", img_ret_type, img_type, neighb_type) - instantiate(idx, "watershed_con", img_ret_type, img_type, neighb_type) - bin_img_type = "::oln::image%(dim)sd< ntg_bin >" % vars() - instantiate(idx, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - instantiate(idx, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - instantiate(idx, "hybrid_minima_imposition", img_type, img_type, bin_img_type, neighb_type) - - instantiate(idx, "sure_regional_minima", bin_img_type, img_type, neighb_type) - instantiate(idx, "sequential_regional_minima", bin_img_type, img_type, neighb_type) - instantiate(idx, "hybrid_regional_minima", bin_img_type, img_type, neighb_type) - - # Extrema killers - if dim == 2: - instantiate(idx, "fast_maxima_killer", img_type, neighb_type) - instantiate(idx, "fast_minima_killer", img_type, neighb_type) - # FIXME: This should work with other types. - if type == "ntg_int_u8": - instantiate(idx, "sure_maxima_killer", img_type, neighb_type) - instantiate(idx, "sure_minima_killer", img_type, neighb_type) - - #FIXME: Does not work due to the return type: - #instantiate(idx, "watershed_seg_or", img_type, img_type, img_ret_type, neighb_type) - #instantiate(idx, "laplacian", img_type, img_type, win_type) - #instantiate(idx, "fast_laplacian", img_type, img_type, win_type) +#FIXME def main(): if len(sys.argv) != 2: Index: tools/swilena/generate_conversions_instantiations.py --- tools/swilena/generate_conversions_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/50_generate_c 1.1 700) +++ tools/swilena/generate_conversions_instantiations.py Tue, 20 Apr 2004 16:36:13 +0200 van-vl_n (oln/v/50_generate_c 1.1 700) @@ -9,11 +9,11 @@ file.close() def open_files(path): - for dim in range(1, 4): + for dim in range(1, 2): files.append(open(path + "/swilena_conversions%(dim)sd.i" % vars(), 'w')) def write_headers(): - for dim in range(1, 4): + for dim in range(1, 2): file = files[dim - 1] file.write("""// Note: this file was generated by generate_conversions_instantiations.py. @@ -73,7 +73,7 @@ scalar_types = integer_types + [ "ntg_float" ] # Algorithms with all types and all dims - for dim in range(1, 4): + for dim in range(1, 2): # stretch, bound and force for relation in reduce_relations: for algo in ["stretch", "bound"]: Index: tools/swilena/generate_arith_instantiations.py --- tools/swilena/generate_arith_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/51_generate_a 1.1 700) +++ tools/swilena/generate_arith_instantiations.py Tue, 20 Apr 2004 16:51:33 +0200 van-vl_n (oln/v/51_generate_a 1.1 700) @@ -9,11 +9,11 @@ file.close() def open_files(path): - for dim in range(1, 4): + for dim in range(1, 2): files.append(open(path + "/swilena_arith%(dim)sd.i" % vars(), 'w')) def write_headers(): - for dim in range(1, 4): + for dim in range(1, 2): file = files[dim - 1] file.write("""// Note: this file was generated by generate_arith.py. @@ -52,7 +52,7 @@ def write_algorithms(): # Algorithms with all types and all dims - for dim in range(1, 4): + for dim in range(1, 2): for type in [ "ntg_bin", "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32",

20 years

oln 10.175: Fixes in swilena's tests Makefile.am

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Check for doxygen version. Use `$SWIG' instead of `swig' Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * swilena/python/tests/Makefile.am: Factor code for `TESTS' variable declaration. * swilena/python/tests/Makefile.am: Add new line at end of file. Index: tools/swilena/python/tests/Makefile.am --- tools/swilena/python/tests/Makefile.am Thu, 15 Apr 2004 01:56:28 +0200 thivol_d (oln/v/15_Makefile.a 1.5 600) +++ tools/swilena/python/tests/Makefile.am Mon, 19 Apr 2004 12:19:32 +0200 thivol_d (oln/v/15_Makefile.a 1.6 600) @@ -9,8 +9,4 @@ PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ IMGDIR="$(top_srcdir)/olena/img" - - -TESTS = arith.py conversions.py simple1.py morpho.py - - +TESTS = $(dist_noinst_DATA) Index: tools/swilena/ruby/tests/Makefile.am --- tools/swilena/ruby/tests/Makefile.am Thu, 15 Apr 2004 01:56:28 +0200 thivol_d (oln/v/18_Makefile.a 1.4 600) +++ tools/swilena/ruby/tests/Makefile.am Mon, 19 Apr 2004 13:00:28 +0200 thivol_d (oln/v/18_Makefile.a 1.5 600) @@ -7,7 +7,6 @@ SWILENA_PATH=".." \ IMGDIR="$(top_srcdir)/olena/img" - TESTS = simple1.rb dist_noinst_DATA = simple1.rb \ No newline at end of file -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years

oln 10.177: Sanity Check

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

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

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

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

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

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

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

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

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