Commit 2a2515a4 authored by Raphal Poss's avatar Raphal Poss

Index: ChangeLog

from  Raphal Poss  <raph@lrde.epita.fr>

        * configure.ac: Add more Makefile's to the Swilena component.

        * bootstrap.sh: Invoke expand.sh in tools/swilena.

Index: integre/ChangeLog
from  Raphal Poss  <raph@lrde.epita.fr>

        * ntg/predecls.hh (ntg): Help SWIG parse the file.

Index: olena/ChangeLog
from  Raphal Poss  <raph@lrde.epita.fr>

        * oln/core/internal/real_image2d.hh (operator<<): Remove reference
        to optraits<T>::max so that images of floats can print.

        * oln/core/internal/real_image3d.hh (operator<<): Likewise.

Index: tools/swilena/ChangeLog
from  Raphal Poss  <raph@lrde.epita.fr>

        * doc/swilena.texi (Top): Add off-sync notice.

        * meta/Makefile.am, meta/swilena_w_win.i, meta/swilena_point.i,
        meta/swilena_morpho.i, meta/swilena_structelt.i,
        meta/swilena_ntg.i, meta/swilena_ntg_cplx.i,
        meta/swilena_ntg_int_u.i, meta/swilena_ntg_int_s.i,
        meta/swilena_imagesize.i, meta/swilena_image.i,
        meta/swilena_exception.i, meta/swilena_describe.i,
        meta/swilena_decl.i, meta/swilena_core.i: Add.

        * meta/attic: New directory.

        * src/swilena.i, src/swilena1d.i, src/swilena1d_convert.i,
        src/swilena1d_morpho.i, src/swilena2d.i, src/swilena2d_convert.i,
        src/swilena2d_morpho.i, src/swilena3d.i, src/swilena3d_convert.i,
        src/swilena3d_morpho.i, src/swilena_conversions.i,
        src/swilena_convert_dim.i, src/swilena_convoldefs.i,
        src/swilena_dim.i, src/swilena_dpoint.i, src/swilena_exceptions.i,
        src/swilena_image.i, src/swilena_meta_win.i,
        src/swilena_morpho_dim.i, src/swilena_morphodefs.i,
        src/swilena_neighborhood.i, src/swilena_point.i,
        src/swilena_typedefs.i, src/swilena_types.i,
        src/swilena_w_window.i, src/swilena_window.i: Move to `meta/attic'.

        * expand.sh: Add. Most files are now generated from this script.

        * TODO: Update.

        * Makefile.am (SUBDIRS): Mention new directory `meta'.

    prcs2git-id: 8.40
......@@ -2,9 +2,9 @@
;; REALLY bad things.
(Created-By-Prcs-Version 1 3 3)
(doc/Makefile.am 142 1043333462 e/0_Makefile.a 1.14)
(olena/oln/core/internal/real_image3d.hh 4336 1047072898 d/3_real_image 1.6)
(olena/oln/core/internal/real_image3d.hh 4408 1052196974 d/3_real_image 1.6.1.1)
(metalic/tests/check/main.cc 226 1017340236 e/43_main.cc 1.1)
(olena/oln/core/w_window3d.hh 3566 1047072898 c/17_w_window3d 1.7)
(olena/oln/core/w_window3d.hh 3605 1051893844 c/17_w_window3d 1.9)
(doc/dev/build.texi 9679 1045816900 p/42_build.texi 1.9)
(olena/oln/convert/force.hh 2147 1047072898 20_force.hh 1.6)
(doc/dev/thanks.texi 3332 1049920315 p/40_thanks.tex 1.4)
......@@ -21,58 +21,59 @@
(olena/oln/basics1d.hh 1724 1042737226 d/41_basics1d.h 1.2)
(olena/tests/convert/Makefile.am 1336 1046524058 f/0_Makefile.a 1.8)
(integre/ntg/global_ops.hh 5861 1047049040 g/27_global_ops 1.11.1.4)
(tools/swilena/src/swilena1d_convert.i 143 1039630292 n/48_swilena1d_ 1.1)
(olena/oln/convert/bound.hh 2143 1047072898 22_bound.hh 1.6)
(olena/oln/core/internal/real_image2d.hh 4174 1047072898 d/4_real_image 1.6)
(olena/oln/core/internal/real_image2d.hh 4255 1052196974 d/4_real_image 1.6.1.1)
(olena/tests/check/defs.in 263 1046524058 q/37_defs.in 1.1)
(tools/swilena/meta/attic/swilena_convert_dim.i 1605 1039630292 n/49_swilena_co 1.1)
(integre/ntg/optraits_builtins_int_defs.hh 2010 1042737226 g/17_optraits_b 1.4)
(tools/swilena/src/lena3.pnm 524335 1039630292 o/4_lena3.pnm 1.1)
(tools/swilena/meta/swilena_morpho.i 10063 1052196974 s/34_swilena_mo 1.1)
(olena/oln/convol/fast_gaussian_coefficient.hh 7591 1047049040 24_fast_gauss 1.5.1.2)
(olena/oln/core/point3d.hh 2635 1047072898 c/28_point3d.hh 1.7)
(olena/oln/morpho/opening.inc 2097 1047049040 40_opening.in 1.7)
(integre/ntg/predecls.hh 4269 1047049040 g/10_predecls.h 1.10.1.3)
(integre/ntg/predecls.hh 4309 1052196974 g/10_predecls.h 1.10.1.3.1.1)
(tools/lib/getopt.hh 414 1043138750 p/32_getopt.hh 1.1)
(doc/demo/morpholena-grad.cc 614 1047049040 p/7_morpholena 1.3)
(olena/tests/convol/sobel_gradient.cc 607 1047049040 f/45_sobel_grad 1.3.1.4)
(olena/conf/configure.ac 872 1046453201 p/23_configure. 1.5.1.1)
(olena/oln/convert/nrgbhsv.hh 4084 1047072898 11_nrgbhsv.hh 1.7)
(tools/swilena/Makefile.am 121 1047485594 o/25_Makefile.a 1.3)
(tools/swilena/Makefile.am 126 1052196974 o/25_Makefile.a 1.4)
(metalic/Makefile.am 111 1048348987 q/32_Makefile.a 1.3)
(tools/swilena/meta/attic/swilena_types.i 5184 1051185193 o/3_swilena_ty 1.3)
(metalic/mlc/type.hh 6137 1047077746 c/21_type.hh 1.14)
(tools/swilena/python/Makefile.am 2099 1047485594 n/44_Makefile.a 1.4)
(integre/tests/types/tests/op1 303 1030531145 h/15_op1 1.2)
(metalic/tests/array/test_array3d.cc 762 1047049040 f/24_test_array 1.5)
(integre/tests/types/tests/op2 83 1030531145 h/6_op2 1.2)
(tools/swilena/meta/attic/swilena2d_convert.i 143 1039630292 n/47_swilena2d_ 1.1)
(olena/oln/math/macros.hh 3657 1047049040 b/21_macros.hh 1.6.1.2)
(olena/oln/core/internal/window.hh 3651 1047222639 d/0_window.hh 1.10)
(metalic/tests/array/gen_test.cc 10905 1046711214 f/34_gen_test.c 1.11.1.3)
(config/oln-local.m4 3543 1047490026 p/37_oln-local. 1.5)
(metalic/mlc/Makefile.am 504 1047072898 q/33_Makefile.a 1.7)
(tools/swilena/meta/swilena_describe.i 447 1052196974 s/38_swilena_de 1.1)
(olena/tests/core/tests/w_window 494 1051893844 s/8_w_window 1.1)
(doc/dev/oln-dev.texi 2777 1049920315 j/1_oln-dev.te 1.6.1.2)
(olena/oln/arith/internal/opdecls.hh 11902 1047049040 b/22_opdecls.hh 1.6)
(olena/oln/convert/nrgbhsl.hh 4309 1047072898 12_nrgbhsl.hh 1.9)
(tools/swilena/src/lena.pgm 262159 1039630292 o/20_lena.pgm 1.1)
(doc/dev/Makefile.am 864 1049920315 p/38_Makefile.a 1.6.1.3)
(olena/oln/core/point2d.hh 2510 1047072898 c/30_point2d.hh 1.6)
(metalic/mlc/loop.hh 2610 1047049040 c/2_control.hh 1.7)
(olena/oln/io/se_window.hxx 4446 1047049040 i/46_se_window. 1.4)
(olena/oln/morpho/minmax.hh 2246 1042737226 b/0_minmax.hh 1.4)
(tools/swilena/src/swilena_neighborhood.i 1161 1039630292 o/8_swilena_ne 1.1)
(olena/oln/core/neighborhood3d.hh 4725 1047072898 c/35_neighborho 1.10)
(olena/oln/topo/inter-pixel/internal/dir-iter.hh 2670 1049118738 r/47_dir-iter.h 1.1)
(olena/img/lena256.pgm 65551 1039630292 n/14_lena256.pg 1.1)
(metalic/tests/check/compile.hh 343 1043267165 p/35_compile.hh 1.1)
(doc/demo/morpholena-ops.cc 537 1047049040 p/11_morpholena 1.3)
(tools/swilena/src/swilena_typedefs.i 712 1039630292 o/16_swilena_ty 1.1)
(integre/ntg/Makefile.am 1279 1046782660 q/36_Makefile.a 1.2)
(olena/oln/io/base.hxx 7964 1042737226 b/18_base.hxx 1.4)
(tools/swilena/src/swilena_meta_win.i 1185 1039630292 o/7_swilena_me 1.1)
(olena/oln/core/internal/image2d_data.hh 5322 1046730339 d/13_image2d_da 1.7)
(integre/tests/types/tests/unsafe1 50 1030375252 h/2_unsafe1 1.1)
(integre/tests/types/tests/unsafe2 36 1030375252 g/41_unsafe2 1.1)
(olena/img/face_se.pbm 2311 1039630292 n/17_face_se.pb 1.1)
(integre/ntg/vec.hh 3683 1047049040 h/43_vec.hh 1.7.1.4)
(tools/swilena/meta/attic/swilena.i 485 1039630292 o/24_swilena.i 1.1)
(olena/oln/topo/inter-pixel/bkd-dir-iter.hh 2549 1049118738 r/45_bkd-dir-it 1.1)
(tools/swilena/meta/attic/swilena_neighborhood.i 1161 1039630292 o/8_swilena_ne 1.1)
(integre/tests/types/tests/optrait2a 58 1047049040 h/28_optrait2a 1.2)
(integre/tests/types/tests/optrait2b 63 1030961585 h/27_optrait2b 1.1)
(metalic/tests/array/gen_test_utils/errors.hh 928 1026208207 f/32_errors.hh 1.1)
......@@ -87,6 +88,7 @@
(doc/demo/test-reconstruction.cc 2034 1047049040 e/22_test-recon 1.7.1.3)
(olena/oln/core/window2d.hh 5594 1047072898 c/14_window2d.h 1.9)
(metalic/mlc/contract.hh 3765 1047049040 d/31_contract.h 1.8)
(tools/swilena/meta/attic/swilena3d_convert.i 143 1039630292 n/46_swilena3d_ 1.1)
(olena/oln/morpho/watershed.hh 5807 1042737226 48_watershed. 1.5)
(doc/demo/Makefile.am 1963 1047485594 d/44_Makefile.a 1.16)
(doc/demo/morpholena-wshed.cc 354 1047049040 p/5_morpholena 1.3)
......@@ -99,8 +101,9 @@
(olena/oln/topo/inter-pixel/internal/dir.hh 2347 1049118738 r/48_dir.hh 1.1)
(olena/oln/morpho/gradient.hh 1751 1046369269 b/3_gradient.h 1.6)
(integre/ntg/yiq.hh 1909 1047049040 i/23_yiq.hh 1.3.1.2)
(configure.ac 12542 1049583896 3_configure. 1.47.1.1.1.1.1.4.1.14)
(configure.ac 12632 1052196974 3_configure. 1.47.1.1.1.1.1.4.1.15.1.1)
(olena/oln/arith/logic.hh 2389 1047049040 b/24_logic.hh 1.6.1.2)
(tools/swilena/meta/swilena_structelt.i 2338 1052196974 s/28_swilena_st 1.1)
(olena/oln/topo/combinatorial-map/internal/zeta.hh 2148 1049118738 r/43_zeta.hh 1.1)
(metalic/tests/array/gen_test_utils/postlude 60 1026208207 f/31_postlude 1.1)
(integre/ntg/debug.hh 1868 1047049040 i/8_debug.hh 1.2.1.3)
......@@ -114,16 +117,16 @@
(integre/ntg/int_u.hh 5734 1047049040 g/23_int_u.hh 1.19.1.3)
(doc/ref/Makefile.am 3163 1046711214 d/51_Makefile.a 1.27.1.3)
(integre/ntg/optraits.hh 1960 1047049040 g/21_optraits.h 1.8)
(tools/swilena/meta/attic/swilena_morphodefs.i 7836 1045569366 o/18_swilena_mo 1.2)
(olena/oln/core/window3d.hh 7746 1047072898 c/13_window3d.h 1.8)
(olena/oln/core/point.hh 1969 1047072898 c/33_point.hh 1.7)
(tools/swilena/src/swilena2d.i 108 1039630292 o/2_swilena2d. 1.1)
(olena/oln/core/pointnd.hh 3016 1047072898 c/10_pointnd.hh 1.8)
(olena/oln/core/window.hh 1804 1047072898 c/16_window.hh 1.7)
(integre/tests/types/tests/int_u1 54 1030531145 h/22_int_u1 1.1)
(olena/oln/topo/inter-pixel/inter-pixel.hxx 2028 1049118738 r/31_inter-pixe 1.3)
(attic/oln-ChangeLog 90565 1041965925 6_ChangeLog 1.50.1.98.1.5)
(olena/oln/Makefile.am 5511 1049462965 q/47_Makefile.a 1.3.1.1)
(olena/ChangeLog 39957 1049739456 o/30_ChangeLog 1.27.1.36)
(olena/ChangeLog 40746 1052196974 o/30_ChangeLog 1.27.1.36.1.3.1.2)
(doc/ref/ref-types.tex 20386 1049920315 g/34_ref-types. 1.6)
(olena/tests/convol/slow_sum_2d_1.cc 1123 1047049040 f/41_slow_sum_2 1.2.1.4)
(integre/tests/types/tests/int_u4 49 1030531145 h/19_int_u4 1.1)
......@@ -136,7 +139,6 @@
(integre/tests/types/tests/int_u6 46 1031762486 h/37_int_u6 1.2)
(integre/ntg/typetraits.hh 1620 1047049040 g/5_typetraits 1.7)
(doc/demo/image.cc 2830 1047049040 d/46_image.cc 1.5)
(tools/swilena/src/swilena_image.i 1740 1039630292 o/12_swilena_im 1.1)
(olena/oln/utils/histogram.hh 8115 1047049040 10_histogram. 1.6.1.2)
(tools/lib/gettext.h 3049 1043138750 p/31_gettext.h 1.1)
(olena/oln/morpho/extrema.hh 1785 1042737226 38_extrema.hh 1.11)
......@@ -154,19 +156,19 @@
(olena/tests/arith/runtests 2172 1045569366 o/45_runtests 1.8)
(tools/utilities/morpho/generate_morpho.sh 4537 1045569366 i/30_generate_m 1.3.1.5.1.2)
(olena/oln/core/border1d.hh 3244 1042737226 d/34_border1d.h 1.4)
(integre/tests/types/tests/int_u5c 72 1051893844 s/11_int_u5c 1.1)
(olena/tests/topo/Makefile.am 415 1049118738 r/26_Makefile.a 1.3)
(olena/oln/core/pred_image.hh 1729 1047072898 c/24_pred_image 1.5)
(doc/ref/processing.tpl 7420 1047077746 d/48_processing 1.16)
(tools/swilena/src/swilena3d_morpho.i 142 1039630292 n/45_swilena3d_ 1.1)
(tools/swilena/meta/attic/swilena_dim.i 2053 1046525524 o/22_swilena_di 1.2)
(integre/ntg/typetraits_builtins.hh 1633 1047049040 i/27_typetraits 1.2.1.2)
(integre/ntg/type.hh 2116 1047049040 g/6_type.hh 1.5)
(integre/ntg/behaviour.hh 8019 1047049040 g/31_behaviour. 1.13.1.4)
(olena/oln/io/pnm_write_common.hxx 3202 1047049040 b/8_pnm_write_ 1.8.1.2)
(integre/ntg/optraits_builtins_bool.hh 1651 1047049040 i/10_optraits_b 1.3.1.2)
(olena/oln/core/dpoint1d.hxx 2557 1042737226 d/26_dpoint1d.h 1.4)
(tools/swilena/src/swilena_types.i 5184 1051185193 o/3_swilena_ty 1.3)
(tools/swilena/src/swilena_dim.i 2053 1046525524 o/22_swilena_di 1.2)
(olena/tests/arith/Makefile.am 330 1047485594 o/43_Makefile.a 1.4)
(tools/swilena/meta/swilena_ntg.i 9797 1052196974 s/33_swilena_nt 1.1)
(integre/ntg/typetraits_builtins_float.hh 2703 1047049040 g/4_typetraits 1.8.1.2)
(olena/oln/core/internal/neighborhood.hh 2605 1047072898 d/7_neighborho 1.6)
(olena/oln/core/fwd_iter3d.hh 2705 1047072898 d/19_fwd_iter3d 1.7)
......@@ -186,6 +188,7 @@
(olena/oln/morpho/splitse.hh 3146 1043018093 34_splitse.hh 1.4)
(integre/tests/Makefile.am 136 1047490026 q/41_Makefile.a 1.3)
(integre/tests/types/tests/int_u2f 81 1032173227 h/41_int_u2f 1.1)
(tools/swilena/meta/attic/swilena_exceptions.i 398 1039630292 o/21_swilena_ex 1.1)
(olena/oln/io/pnm_read_common.hxx 3018 1049583896 b/10_pnm_read_c 1.7.1.3)
(olena/oln/core/border.hh 3097 1046730339 d/35_border.hh 1.8)
(olena/oln/morpho/attribute_union_find.hh 6463 1047064106 q/50_attribute_ 1.2)
......@@ -193,21 +196,21 @@
(olena/oln/topo/combinatorial-map/internal/cmap-functor.hh 7505 1049118738 r/29_cmap-funct 1.3)
(olena/oln/morpho/attribute_closing_opening.hh 3938 1047205953 q/49_attribute_ 1.3)
(olena/img/Makefile.am 1847 1049739456 o/34_Makefile.a 1.5)
(tools/swilena/meta/attic/swilena3d.i 109 1039630292 o/1_swilena3d. 1.1)
(tools/swilena/meta/attic/swilena1d.i 108 1039630292 o/17_swilena1d. 1.1)
(tools/lib/getopt.c 34355 1043138750 p/30_getopt.c 1.1)
(olena/conf/compilers.def 68 1046782660 p/26_compilers. 1.3)
(tools/swilena/src/swilena2d_morpho.i 142 1039630292 n/51_swilena2d_ 1.1)
(olena/tests/transforms/fft.cc 1484 1047049040 i/37_fft.cc 1.6.1.3)
(integre/tests/types/tests/int_u3a 59 1030531145 h/18_int_u3a 1.1)
(integre/tests/types/tests/int_u3b 59 1030531145 h/23_int_u3b 1.1)
(tools/swilena/src/swilena_morphodefs.i 7836 1045569366 o/18_swilena_mo 1.2)
(doc/dev/faq.texi 5027 1046367772 p/44_faq.texi 1.9)
(olena/oln/morpho/extrema_killer.hh 14301 1047049040 e/19_extrema_ki 1.7.1.4.1.2)
(tools/swilena/meta/swilena_point.i 2370 1052196974 s/29_swilena_po 1.1)
(tools/lib/getopt.h 6404 1043138750 p/29_getopt.h 1.1)
(integre/ntg/optraits_range.hh 2915 1047049040 g/13_optraits_r 1.5.1.2)
(olena/oln/core/fwd_iter2d.hh 2605 1047072898 d/20_fwd_iter2d 1.7)
(olena/tests/io/pretty.cc 217 1044294362 i/42_pretty.cc 1.2)
(tools/utilities/morpho/morpho_template_with_functor.cc 3858 1046525524 j/10_morpho_tem 1.1.1.2.1.2)
(tools/swilena/src/swilena_window.i 1206 1039630292 o/9_swilena_wi 1.1)
(Makefile.am 1623 1049920315 n/32_Makefile.a 1.17.1.2.1.5)
(olena/oln/core/dpoint1d.hh 2479 1047072898 d/27_dpoint1d.h 1.7)
(olena/tests/topo/test-cmap.ref 1172 1049118738 r/38_test-cmap. 1.2)
......@@ -220,11 +223,10 @@
(integre/tests/types/tests/int_sc1 231 1030375657 g/37_int_sc1 1.2)
(integre/tests/types/tests/conv2 106 1039105505 g/42_conv2 1.2)
(integre/tests/types/tests/optrait1a 697 1047049040 h/25_optrait1a 1.2)
(olena/tests/core/runtests 2172 1051893844 s/9_runtests 1.1)
(integre/tests/types/tests/int_sc2 168 1030375252 g/36_int_sc2 1.1)
(olena/oln/core/dpoint3d.hxx 3059 1042737226 d/22_dpoint3d.h 1.4)
(integre/tests/types/tests/optrait1b 917 1047060405 h/26_optrait1b 1.2)
(tools/swilena/src/swilena_convoldefs.i 956 1039630292 o/10_swilena_co 1.1)
(tools/swilena/python/typedefs.hh 3155 1046525524 n/43_typedefs.h 1.3)
(olena/oln/utils/timer.hh 2566 1046730339 8_timer.hh 1.5)
(integre/tests/types/tests/int_sc3 140 1030375252 g/35_int_sc3 1.1)
(integre/ntg/cplx_representation.hh 1678 1047049040 i/3_cplx_repre 1.3)
......@@ -240,7 +242,6 @@
(integre/tests/types/tests/cplx4 328 1032459279 h/51_cplx4 1.1)
(olena/oln/core/bkd_iter3d.hh 2747 1047072898 d/36_bkd_iter3d 1.8)
(integre/tests/types/tests/float2 88 1032173227 h/40_float2 1.1)
(tools/swilena/src/swilena_morpho_dim.i 2949 1045569366 n/50_swilena_mo 1.2)
(integre/tests/types/tests/cplx5 234 1032539759 i/7_cplx5 1.1)
(olena/oln/level/connected.hh 4742 1047049040 30_connected. 1.9.1.2)
(attic/doc-ChangeLog 5622 1039630292 e/1_ChangeLog 1.31)
......@@ -259,16 +260,14 @@
(integre/tests/types/tests/comp3 80 1030464612 h/7_comp3 1.1)
(attic/tests-ChangeLog 10875 1039648472 e/30_ChangeLog 1.52)
(metalic/tests/main/Makefile.am 407 1046860854 r/23_Makefile.a 1.1)
(tools/swilena/src/swilena_dpoint.i 993 1039630292 o/13_swilena_dp 1.1)
(olena/oln/topo/combinatorial-map/cmap.hh 7404 1049118738 r/36_cmap.hh 1.3)
(tools/swilena/meta/attic/swilena_typedefs.i 712 1039630292 o/16_swilena_ty 1.1)
(olena/oln/core/internal/rec_operable.hh 3909 1042737226 d/2_rec_operab 1.2)
(olena/oln/morpho/top_hat.hh 1722 1042737226 49_top_hat.hh 1.4)
(olena/oln/morpho/closing.hh 1683 1046369269 b/6_closing.hh 1.6)
(olena/oln/transforms/wavelet_coeffs.hh 5233 1047049040 i/34_wavelet_co 1.4)
(tools/swilena/src/lena128.pgm 16442 1039630292 o/19_lena128.pg 1.1)
(olena/oln/transforms/fft.hh 12013 1047049040 i/36_fft.hh 1.4.1.2)
(tools/ChangeLog 5459 1047485594 o/32_ChangeLog 1.10.1.7)
(tools/swilena/src/swilena.i 485 1039630292 o/24_swilena.i 1.1)
(olena/oln/core/bkd_iter2d.hh 2642 1047072898 d/37_bkd_iter2d 1.8)
(integre/tests/types/tests/range3b 67 1031668960 h/32_range3b 1.1)
(integre/tests/types/tests/vec1 93 1032198742 h/49_vec1 1.1)
......@@ -288,11 +287,10 @@
(olena/oln/io/pnm_read.hxx 6291 1049583896 b/16_pnm_read.h 1.9.1.3)
(olena/oln/morpho/fast_morpho.hh 1816 1042737226 46_fast_morph 1.4)
(integre/tests/types/tests/vec7 114 1032278254 h/50_vec7 1.1)
(tools/swilena/src/swilena_exceptions.i 398 1039630292 o/21_swilena_ex 1.1)
(olena/oln/config/system.hh 1606 1046782660 7_system.hh 1.17)
(olena/oln/morpho/thinning.inc 1987 1049462965 e/26_thinning.i 1.6)
(tools/swilena/meta/swilena_decl.i 1827 1052196974 s/39_swilena_de 1.1)
(integre/tests/types/runtests 2250 1047049040 h/3_runtests 1.14.1.3)
(tools/swilena/src/swilena_point.i 1364 1039630292 o/11_swilena_po 1.1)
(olena/tests/check/data.cc 358 1044806178 f/5_data.cc 1.8)
(doc/dev/conf.texi 12560 1049920315 q/2_conf.texi 1.4)
(integre/tests/types/tests/range2b 61 1031668960 h/36_range2b 1.1)
......@@ -307,18 +305,19 @@
(olena/oln/core/box.hh 2714 1042737226 o/51_box.hh 1.3)
(olena/oln/morpho/dilation.hh 4507 1047049040 b/5_dilation.h 1.11)
(olena/oln/transforms/dwt.hh 11981 1047049040 i/35_dwt.hh 1.2.1.4.1.3)
(tools/swilena/meta/Makefile.am 372 1052196974 s/26_Makefile.a 1.1)
(olena/oln/io/gz.hh 2491 1042737226 f/16_gz.hh 1.3)
(metalic/tests/check/verbose.cc 262 1041584692 e/41_verbose.cc 1.3)
(tools/swilena/src/swilena1d_morpho.i 142 1039630292 o/0_swilena1d_ 1.1)
(integre/tests/types/tests/int1b 44 1030375252 g/48_int1b 1.1)
(metalic/mlc/array/2d.hxx 6803 1047049040 f/20_array2d.hx 1.8)
(integre/ntg/range.hh 4260 1047049040 g/9_range.hh 1.9.1.3)
(tools/utilities/morpho/morpho_template_with_neighb.cc 3879 1046525524 j/7_morpho_tem 1.1.1.2.1.2)
(olena/oln/core/internal/fake.hh 1893 1042737226 d/17_fake.hh 1.3)
(olena/oln/level/invert.hh 2818 1047049040 33_invert.hh 1.5.2.2)
(integre/tests/types/tests/builtin1 51 1051701979 s/7_builtin1 1.1)
(tools/utilities/morpho/morpho_template_extrema.cc 3974 1046525524 j/5_morpho_tem 1.1.1.2.1.2)
(tools/swilena/src/swilena_convert_dim.i 1605 1039630292 n/49_swilena_co 1.1)
(olena/oln/morpho/fast_morpho.hxx 8816 1047049040 45_fast_morph 1.8)
(tools/swilena/meta/attic/swilena_w_window.i 669 1039630292 o/6_swilena_w_ 1.1)
(olena/oln/core/winiter.hh 2657 1047049040 c/12_winiter.hh 1.4)
(olena/oln/io/se.hh 1499 1042737226 i/45_se.hh 1.2)
(olena/oln/convert/nrgbyuv.hh 3145 1047072898 13_nrgbyuv.hh 1.6)
......@@ -329,7 +328,6 @@
(olena/tests/io/se_pass.cc 850 1044294362 i/44_se_pass.cc 1.2)
(integre/tests/types/Makefile.am 407 1046782660 h/5_Makefile.a 1.8)
(olena/oln/core/internal/iter3d.hh 4389 1047072898 d/8_iter3d.hh 1.6)
(tools/swilena/src/swilena2d_convert.i 143 1039630292 n/47_swilena2d_ 1.1)
(integre/ntg/typetraits_builtins_bool.hh 2146 1047049040 i/9_typetraits 1.4.1.2)
(doc/dev/biblio.texi 2360 1045816900 p/39_biblio.tex 1.3)
(metalic/tests/main/tests/is_a1 696 1047049040 r/17_is_a1 1.2)
......@@ -338,12 +336,11 @@
(metalic/tests/main/runtests 2172 1046860854 r/24_runtests 1.1)
(metalic/mlc/array/all.hh 1524 1047049040 f/36_array.hh 1.7)
(metalic/tests/array/gen_test_utils/prelude 438 1047049040 f/30_prelude 1.5)
(tools/swilena/swilena.prj 3090 1039630292 n/38_swilena.pr 1.1)
(integre/ntg/optraits_bin.hh 4161 1047049040 g/20_optraits_b 1.9.1.2)
(metalic/ChangeLog 4366 1048348987 q/30_ChangeLog 1.3.1.15)
(olena/oln/morpho/geodesic_erosion.hh 4762 1047049040 36_geodesic_e 1.11)
(olena/oln/convert/basics.hh 1589 1042737226 23_basics.hh 1.4)
(tools/swilena/doc/swilena.texi 34923 1039630292 n/40_swilena.te 1.1)
(tools/swilena/doc/swilena.texi 35035 1052196974 n/40_swilena.te 1.1.1.1)
(doc/demo/convol-gaussian.cc 439 1047049040 p/14_morpholena 1.4)
(olena/oln/core/box.hxx 5534 1047049040 p/0_box.hxx 1.4.1.1)
(olena/oln/core/point1d.hh 2520 1047072898 c/32_point1d.hh 1.7)
......@@ -351,12 +348,14 @@
(tools/utilities/morpho/morpho_template_gaussian.cc 3727 1046525524 j/8_morpho_tem 1.1.1.2.1.2)
(metalic/tests/main/tests/ensure1 102 1047049040 r/21_ensure1 1.2)
(metalic/tests/main/tests/ensure2 116 1047049040 r/19_ensure2 1.2)
(tools/swilena/meta/attic/swilena_morpho_dim.i 2949 1045569366 n/50_swilena_mo 1.2)
(integre/ntg/builtins_properties.hh 4443 1047049040 g/29_builtins_p 1.9)
(integre/ntg/hsv.hh 1912 1047049040 i/22_hsv.hh 1.3.1.2)
(metalic/tests/main/tests/ensure3 133 1047049040 r/18_ensure3 1.2)
(integre/ntg/yuv.hh 1911 1047049040 i/25_yuv.hh 1.3.1.2)
(integre/ntg/cplx.hh 6564 1047049040 i/4_cplx.hh 1.9.1.4)
(integre/tests/types/tests/int_s1 73 1030375252 g/40_int_s1 1.1)
(tools/swilena/meta/attic/swilena1d_morpho.i 142 1039630292 o/0_swilena1d_ 1.1)
(olena/oln/convert/nrgbhsi.hh 3601 1047072898 15_nrgbhsi.hh 1.6)
(olena/oln/morpho/top_hat.inc 7124 1042737226 39_top_hat.in 1.5)
(integre/tests/types/tests/int_s2 76 1030375252 g/39_int_s2 1.1)
......@@ -365,8 +364,10 @@
(integre/ntg/bin.hh 3192 1047049040 g/30_bin.hh 1.9.1.3)
(olena/oln/basics.hh 2039 1047072898 d/42_basics.hh 1.9)
(olena/tests/check/Makefile.am 1076 1048348987 q/38_Makefile.a 1.3)
(tools/swilena/meta/attic/swilena_point.i 1364 1039630292 o/11_swilena_po 1.1)
(olena/oln/convol/convolution.hh 2909 1047049040 f/39_convolutio 1.4.1.4.1.3)
(olena/oln/basics2d.hh 1793 1042737226 b/7_basics2d.h 1.3)
(tools/swilena/meta/attic/swilena_conversions.i 934 1039630292 o/15_swilena_co 1.1)
(olena/tests/morpho/extrkiller.cc 1063 1047049040 e/31_extrkiller 1.5.1.4)
(olena/oln/core/internal/image3d_data.hh 6239 1046730339 d/11_image3d_da 1.7)
(olena/oln/convert/conversion.hh 8494 1047072898 21_conversion 1.8)
......@@ -377,12 +378,12 @@
(olena/oln/level/threshold.hh 2383 1047072898 f/15_threshold. 1.7)
(integre/ntg/optraits_vec.hh 9971 1047049040 h/42_optraits_v 1.10.1.3)
(olena/oln/topo/dmap.hxx 10612 1047049040 p/3_dmap.hxx 1.7.1.2)
(tools/swilena/meta/attic/swilena_image.i 1740 1039630292 o/12_swilena_im 1.1)
(olena/oln/core/internal/real_image1d.hh 3942 1047072898 d/5_real_image 1.5)
(NEWS 6870 1049920315 0_NEWS 1.14)
(olena/oln/core/generate.hh 2410 1047049040 f/12_generate.h 1.12)
(olena/oln/core/point2d.hxx 2922 1042737226 c/29_point2d.hx 1.3)
(metalic/mlc/array/3d.hxx 7812 1047049040 f/18_array3d.hx 1.9)
(tools/swilena/src/lena2.pgm 262189 1039630292 o/14_lena2.pgm 1.1)
(metalic/tests/check/check.hh 160 1046524058 e/40_check.hh 1.4)
(doc/ref/oln-ref.tex 2570 1045040094 f/14_oln-ref.te 1.3.1.1)
(integre/ntg/optraits_scalar_defs.hh 6414 1047049040 g/11_optraits_s 1.8)
......@@ -390,8 +391,10 @@
(olena/img/se.pbm 56 1039630292 n/6_se.pbm 1.1)
(olena/oln/convol/fast_gaussian.hh 3052 1046453201 26_fast_gauss 1.6.1.1)
(olena/oln/io/pnm_write3d.hxx 7540 1047049040 b/9_pnm_write3 1.1.1.8)
(tools/swilena/meta/swilena_ntg_cplx.i 325 1052196974 s/32_swilena_nt 1.1)
(olena/oln/core/image2d_size.hh 2041 1047072898 c/44_image2d_si 1.6)
(olena/oln/core/fwd_iter1d.hh 2516 1047072898 d/21_fwd_iter1d 1.7)
(tools/swilena/expand.sh 3405 1052196974 s/25_expand.sh 1.1)
(olena/oln/core/point1d.hxx 2659 1042737226 c/31_point1d.hx 1.3)
(olena/tests/topo/test.sh 174 1049118738 r/37_test.sh 1.2)
(tools/utilities/Makefile.am 1018 1047485594 g/2_Makefile.a 1.12.1.4)
......@@ -402,26 +405,23 @@
(metalic/tests/check/Makefile.check 106 1046524058 e/37_Makefile.c 1.8)
(integre/ntg/xyz.hh 1902 1047049040 i/24_xyz.hh 1.3.1.2)
(olena/oln/core/internal/image1d_data.hh 4451 1046730339 d/15_image1d_da 1.7)
(tools/swilena/src/swilena3d_convert.i 143 1039630292 n/46_swilena3d_ 1.1)
(olena/oln/core/border2d.hh 4590 1042737226 d/33_border2d.h 1.4)
(olena/oln/basics3d.hh 1774 1042737226 28_basics3d.h 1.2)
(metalic/mlc/array/objs.hh 2212 1047049040 q/45_objs.hh 1.2)
(olena/tests/io/Makefile.am 729 1049739456 e/49_Makefile.a 1.13)
(olena/oln/core/macros.hh 1885 1042737226 c/39_macros.hh 1.3)
(olena/oln/morpho/laplacian.inc 2756 1042737226 41_laplacian. 1.5)
(tools/swilena/src/lena3.pgm 262189 1039630292 o/5_lena3.pgm 1.1)
(metalic/tests/check/Makefile.am 690 1047485594 e/44_Makefile.a 1.10)
(olena/oln/config/pconf-hh.in 421 1043010878 p/17_pconf-hh.i 1.1)
(tools/swilena/TODO 153 1039630292 n/36_TODO 1.1)
(tools/swilena/TODO 115 1052196974 n/36_TODO 1.2)
(olena/oln/morpho/hit_or_miss.hh 1795 1046369269 b/2_hit_or_mis 1.7)
(doc/demo/tour.cc 14666 1047049040 d/45_tour.cc 1.10)
(tools/swilena/meta/swilena_core.i 45 1052196974 s/40_swilena_co 1.1)
(integre/tests/types/tests/int4b 37 1031668960 h/35_int4b 1.1)
(olena/img/se9.pbm 59 1039630292 n/5_se9.pbm 1.1)
(metalic/mlc/bool.hh 3788 1047049040 c/4_basics.hh 1.11)
(olena/oln/io/pnm_read3d.hxx 7046 1047049040 b/11_pnm_read3d 1.8)
(tools/swilena/src/swilena1d.i 108 1039630292 o/17_swilena1d. 1.1)
(olena/oln/topo/inter-pixel/inter-pixel.hh 3870 1049118738 r/34_inter-pixe 1.4)
(tools/swilena/src/swilena3d.i 109 1039630292 o/1_swilena3d. 1.1)
(olena/oln/topo/inter-pixel/inter-pixel.hh 3930 1052042224 r/34_inter-pixe 1.5)
(metalic/mlc/array/3d.hh 7016 1047049040 f/19_array3d.hh 1.9)
(olena/oln/core/border3d.hh 6297 1042737226 d/32_border3d.h 1.4)
(olena/tests/convol/slow_sum_2d_2.cc 1173 1047049040 f/40_slow_sum_2 1.2.1.4)
......@@ -437,15 +437,17 @@
(metalic/tests/check/Makefile.flags 131 1046782660 e/36_Makefile.f 1.12.1.3)
(olena/oln/core/bkd_iter1d.hh 2530 1047072898 d/38_bkd_iter1d 1.8)
(olena/oln/morpho/closing.inc 2046 1047049040 44_closing.in 1.7)
(olena/oln/core/w_window1d.hh 3458 1047072898 c/19_w_window1d 1.7)
(olena/oln/core/w_window1d.hh 3477 1051893844 c/19_w_window1d 1.9)
(doc/dev/design.texi 1525 1044886023 q/5_design.tex 1.2)
(doc/dev/install.texi 1005 1045816900 p/43_install.te 1.3)
(integre/ntg/nrgb.hh 3615 1047049040 i/19_nrgb.hh 1.5.1.2)
(olena/oln/io/se_neighborhood.hxx 5317 1047049040 i/47_se_neighbo 1.4)
(tools/swilena/meta/swilena_w_win.i 978 1052196974 s/27_swilena_w_ 1.1)
(olena/oln/core/neighborhood1d.hh 3411 1047072898 c/37_neighborho 1.10)
(olena/tests/transforms/dwt.cc 2593 1047049040 i/38_dwt.cc 1.8.1.3)
(tools/swilena/ChangeLog 1422 1051185193 n/37_ChangeLog 1.7)
(tools/swilena/ChangeLog 2692 1052196974 n/37_ChangeLog 1.7.1.1)
(olena/oln/core/dpoint2d.hh 2464 1047072898 d/25_dpoint2d.h 1.6)
(tools/swilena/meta/swilena_ntg_int_u.i 547 1052196974 s/30_swilena_nt 1.1)
(integre/ntg/cycle.hh 4167 1047049040 g/28_cycle.hh 1.11.1.3)
(olena/tests/check/data.hh 180 1044806178 f/6_data.hh 1.4)
(integre/tests/types/tests/optrait3 283 1047049040 h/24_optrait3 1.3)
......@@ -460,15 +462,19 @@
(cleanup.sh 348 1046711214 o/29_cleanup.sh 1.5)
(olena/oln/core/image.hh 2558 1047072898 d/18_image.hh 1.7)
(integre/ntg/optraits_cplx.hh 14279 1047049040 i/5_optraits_c 1.7.1.3)
(integre/ntg/global_ops_defs.hh 8974 1047049040 g/26_global_ops 1.7)
(integre/ntg/global_ops_defs.hh 9416 1051701719 g/26_global_ops 1.8)
(olena/tests/Makefile.am 167 1046524058 e/45_Makefile.a 1.20)
(tools/swilena/meta/attic/swilena_window.i 1206 1039630292 o/9_swilena_wi 1.1)
(olena/oln/core/image_size.hh 1992 1047072898 c/41_image_size 1.6)
(tools/swilena/src/Makefile.am 566 1039630292 o/23_Makefile.a 1.1)
(tools/swilena/meta/attic/swilena1d_convert.i 143 1039630292 n/48_swilena1d_ 1.1)
(olena/oln/core/dpoint3d.hh 2529 1047072898 d/23_dpoint3d.h 1.6)
(integre/Makefile.am 110 1047657087 q/34_Makefile.a 1.3)
(tools/swilena/meta/attic/swilena3d_morpho.i 142 1039630292 n/45_swilena3d_ 1.1)
(olena/oln/core/internal/image1d.hh 3956 1047072898 d/16_image1d.hh 1.8)
(olena/oln/level/fill.hh 1714 1043018093 32_fill.hh 1.4)
(tools/lib/getopt1.c 4601 1043138750 p/28_getopt1.c 1.1)
(olena/tests/core/Makefile.am 330 1051893844 s/10_Makefile.a 1.1)
(tools/swilena/meta/attic/swilena_meta_win.i 1185 1039630292 o/7_swilena_me 1.1)
(integre/ntg/cast.hh 5433 1047049040 i/26_cast.hh 1.3.1.2)
(olena/oln/convert/nrgbxyz.hh 3188 1047072898 16_nrgbxyz.hh 1.6)
(metalic/mlc/array/1d.hh 5349 1047049040 f/23_array1d.hh 1.8)
......@@ -477,9 +483,11 @@
(integre/ntg/config/math.hh 2485 1047222639 p/33_math.hh 1.5)
(olena/tests/convol/sum_on_random.pgm 354 1026970680 f/42_sum_on_ran 1.1)
(tools/utilities/morpho/morpho_template.cc 3960 1046782660 i/33_morpho_tem 1.5.1.2.1.3)
(integre/ChangeLog 3166 1047657087 q/35_ChangeLog 1.12)
(integre/ChangeLog 3523 1052196974 q/35_ChangeLog 1.12.1.2.1.1)
(olena/tests/morpho/edoc.cc 1328 1047049040 f/13_edoc.cc 1.4.1.3)
(olena/oln/topo/inter-pixel/internal/dir.hxx 1878 1049118738 r/49_dir.hxx 1.1)
(tools/swilena/meta/attic/swilena_dpoint.i 993 1039630292 o/13_swilena_dp 1.1)
(tools/swilena/meta/attic/swilena2d.i 108 1039630292 o/2_swilena2d. 1.1)
(olena/oln/topo/inter-pixel/internal/dir.hxx 1900 1052042224 r/49_dir.hxx 1.2)
(doc/ref/gen_filelists.sh 652 1044806178 q/4_gen_fileli 1.1)
(olena/oln/level/set_level.hh 3385 1043018093 p/1_set_level. 1.5)
(metalic/tests/check/srcdir.cc 375 1043267165 e/38_srcdir.cc 1.7)
......@@ -498,6 +506,7 @@
(olena/oln/topo/tarjan/union.hh 3946 1048268935 r/33_union.hh 1.2)
(olena/oln/topo/combinatorial-map/internal/cmap-functor.hxx 1922 1049118738 r/30_cmap-funct 1.3)
(integre/tests/types/tests/int1 69 1030375252 h/1_int1 1.1)
(tools/swilena/meta/attic/swilena2d_morpho.i 142 1039630292 n/51_swilena2d_ 1.1)
(olena/oln/level/lut.hh 2787 1042737226 29_lut.hh 1.7)
(integre/tests/types/tests/int2 53 1030375252 h/0_int2 1.1)
(doc/demo/morpholena-hit-miss.cc 499 1047049040 p/10_morpholena 1.3)
......@@ -511,7 +520,7 @@
(integre/ntg/optraits_cycle.hh 2830 1047049040 g/16_optraits_c 1.11.1.4)
(olena/oln/topo/dmap.hh 4554 1047049040 p/2_dmap.hh 1.5)
(olena/oln/core/structelt.hh 1738 1047072898 c/25_structelt. 1.5)
(ChangeLog 11905 1049920315 o/33_ChangeLog 1.37.1.15)
(ChangeLog 12174 1052196974 o/33_ChangeLog 1.37.1.16.1.1)
(integre/tests/types/tests/int6 61 1030375252 g/46_int6 1.1)
(olena/oln/morpho/hit_or_miss.inc 10084 1047049040 42_hit_or_mis 1.9)
(olena/oln/convol/fast_gaussian.hxx 8581 1047049040 25_fast_gauss 1.7.1.2)
......@@ -521,15 +530,15 @@
(olena/oln/morpho/geodesic_dilation.hh 4879 1047049040 37_geodesic_d 1.11.1.2)
(integre/ntg/optraits_int_s.hh 10637 1047049040 g/15_optraits_i 1.9.1.4)
(tools/utilities/morpho/Makefile.am 710 1047485594 i/32_Makefile.a 1.9.1.4)
(tools/swilena/meta/attic/swilena_convoldefs.i 956 1039630292 o/10_swilena_co 1.1)
(olena/oln/io/pnm.hh 1548 1042737226 b/19_pnm.hh 1.3)
(olena/oln/io/readable.hh 2046 1042936718 b/13_readable.h 1.8)
(metalic/tests/check/srcdir.hh 238 1043267165 e/35_srcdir.hh 1.6)
(olena/tests/convert/convcomp.cc 950 1044294362 f/3_convcomp.c 1.6)
(tools/swilena/src/swilena_w_window.i 669 1039630292 o/6_swilena_w_ 1.1)
(bootstrap.sh 272 1047485594 j/16_bootstrap. 1.10)
(tools/swilena/src/swilena_conversions.i 934 1039630292 o/15_swilena_co 1.1)
(bootstrap.sh 313 1052196974 j/16_bootstrap. 1.11)
(tools/swilena/meta/swilena_image.i 3291 1052196974 s/36_swilena_im 1.1)
(olena/oln/arith/ops.hh 2737 1046453201 b/23_ops.hh 1.5.1.2.1.1)
(olena/oln/core/w_window2d.hh 3892 1047072898 c/18_w_window2d 1.6.1.2)
(olena/oln/core/w_window2d.hh 3911 1051893844 c/18_w_window2d 1.6.1.4)
(olena/tests/topo/test-inter-pixel.ref 192 1049118738 r/39_test-inter 1.2)
(olena/tests/morpho/Makefile.am 195 1046524058 e/32_Makefile.a 1.12)
(olena/tests/README 4977 1039648472 f/4_README 1.4)
......@@ -543,5 +552,8 @@
(olena/oln/morpho/extrema.hxx 4667 1047049040 j/4_extrema.hx 1.4)
(metalic/tests/array/gen_test_utils/errors.cc 5028 1026208207 f/33_errors.cc 1.1)
(doc/ChangeLog 8572 1049920315 o/31_ChangeLog 1.31)
(tools/swilena/meta/swilena_imagesize.i 1223 1052196974 s/35_swilena_im 1.1)
(tools/swilena/meta/swilena_exception.i 557 1052196974 s/37_swilena_ex 1.1)
(olena/oln/morpho/thickening.hh 1721 1046369269 e/29_thickening 1.7)
(tools/swilena/meta/swilena_ntg_int_s.i 548 1052196974 s/31_swilena_nt 1.1)
(metalic/mlc/objs.hh 1646 1047049040 c/34_objs.hh 1.6)
2003-05-06 Raphal Poss <raph@lrde.epita.fr>
* configure.ac: Add more Makefile's to the Swilena component.
* bootstrap.sh: Invoke expand.sh in tools/swilena.
2003-05-02 Nicolas Burrus <burrus_n@lrde.epita.fr>
* configure.ac: Add olena/tests/core directory.
2003-04-09 Nicolas Burrus <burrus_n@lrde.epita.fr>
* Makefile.am: Generate UPGRADING.
......
......@@ -2,6 +2,7 @@
sh ./cleanup.sh
( cd tools/utilities/morpho && sh ./generate_morpho.sh . )
( cd tools/swilena && sh ./expand.sh . )
( cd doc/ref && sh ./gen_filelists.sh filelists.make ../../olena/oln )
autoreconf -v -f -i
( cd olena/conf && aclocal -I ../../config && autoconf -f )
......
......@@ -123,6 +123,7 @@ OLN_COLLECTION([OLN_TOP],
OLN_TESTS([arith])
OLN_TESTS([convert])
OLN_TESTS([convol])
OLN_TESTS([core])
OLN_TESTS([io])
OLN_TESTS([morpho])
OLN_TESTS([sanity])
......@@ -323,7 +324,10 @@ OLN_COLLECTION([OLN_TOP],
[oln_cv_build_swilena],
[the SWIG interface to Olena],
[OLN_TOOLS],
[tools/swilena/Makefile tools/swilena/src/Makefile tools/swilena/doc/Makefile],
[tools/swilena/Makefile
tools/swilena/meta/Makefile
tools/swilena/src/Makefile
tools/swilena/doc/Makefile],
[OLN_COLLECTION([OLN_SWILENA], dnl ... and a collection.
[dnl
......
2003-05-06 Raphal Poss <raph@lrde.epita.fr>
* ntg/predecls.hh (ntg): Help SWIG parse the file.
2003-05-02 Nicolas Burrus <burrus_n@lrde.epita.fr>
* tests/types/tests/int_u5c: New test.
2003-04-30 Nicolas Burrus <burrus_n@lrde.epita.fr>
* ntg/global_ops_defs.hh: Add missing builtin specializations.
* tests/types/tests/builtin1: New test.
2003-03-14 Nicolas Burrus <burrus_n@lrde.epita.fr>
* Makefile.am: Adjust.
......
// Copyright (C) 2001, 2002 EPITA Research and Development Laboratory
// Copyright (C) 2001, 2002, 2003 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
......@@ -58,6 +58,8 @@ template <class T1, class T2> \
inline T1& Op(rec_value<T1>& lhs, const T2& rhs) \
{ return optraits<T1>::Name(lhs.self(), rhs); } \
\
GLOBAL_ASSIGN_OP_BUILTIN(Op, Name, signed long); \
GLOBAL_ASSIGN_OP_BUILTIN(Op, Name, unsigned long); \
GLOBAL_ASSIGN_OP_BUILTIN(Op, Name, signed int); \
GLOBAL_ASSIGN_OP_BUILTIN(Op, Name, unsigned int); \
GLOBAL_ASSIGN_OP_BUILTIN(Op, Name, signed short); \
......@@ -119,6 +121,8 @@ Op(const rec_value<T1>& lhs, const T2& rhs) \
static_cast<rhs_type>(rhs)); \
} \
\
GLOBAL_ARITH_OP_BUILTIN(Op, Name, signed long); \
GLOBAL_ARITH_OP_BUILTIN(Op, Name, unsigned long); \
GLOBAL_ARITH_OP_BUILTIN(Op, Name, signed int); \
GLOBAL_ARITH_OP_BUILTIN(Op, Name, unsigned int); \
GLOBAL_ARITH_OP_BUILTIN(Op, Name, signed short); \
......@@ -181,6 +185,8 @@ Op(const rec_value<T1>& lhs, const T2& rhs) \
static_cast<rhs_type>(rhs)); \
} \
\
GLOBAL_LOGICAL_OP_BUILTIN(Op, Name, signed long); \
GLOBAL_LOGICAL_OP_BUILTIN(Op, Name, unsigned long); \
GLOBAL_LOGICAL_OP_BUILTIN(Op, Name, signed int); \
GLOBAL_LOGICAL_OP_BUILTIN(Op, Name, unsigned int); \
GLOBAL_LOGICAL_OP_BUILTIN(Op, Name, signed short); \
......@@ -227,6 +233,8 @@ inline bool Op(const rec_value<T1>& lhs, const T2& rhs) \
static_cast<rhs_type>(rhs)); \
} \
\
GLOBAL_CMP_OP_BUILTIN(Op, Name, signed long); \
GLOBAL_CMP_OP_BUILTIN(Op, Name, unsigned long); \
GLOBAL_CMP_OP_BUILTIN(Op, Name, signed int); \
GLOBAL_CMP_OP_BUILTIN(Op, Name, unsigned int); \
GLOBAL_CMP_OP_BUILTIN(Op, Name, signed short); \
......
......@@ -106,9 +106,12 @@ namespace ntg
namespace type_definitions
{
template <unsigned ncomps, unsigned qbits, template <unsigned>
class color_system>
#ifndef SWIG
template <unsigned ncomps, unsigned qbits, template <unsigned> class color_system>
struct color;
#else
struct color;
#endif
template<int lval, int uval>
struct interval;
......
int_u8 i = 11;
unsigned long l = 12;
return l < i;
int_u32s i(4294967295U);
i = i + int_u32s(1);
return i != 4294967295U;
2003-05-06 Raphal Poss <raph@lrde.epita.fr>
* oln/core/internal/real_image2d.hh (operator<<): Remove reference
to optraits<T>::max so that images of floats can print.
* oln/core/internal/real_image3d.hh (operator<<): Likewise.
2003-05-04 Nicolas Burrus <burrus_n@lrde.epita.fr>
* oln/topo/inter-pixel/inter-pixel.hh: Minor fixes.
2003-05-02 Nicolas Burrus <burrus_n@lrde.epita.fr>
* oln/core/w_window1d.hh, oln/core/w_window2d.hh,
oln/core/w_window3d.hh: Restore a corrected version of set
methods.
* tests/core/Makefile.am, tests/core/runtests: New files.
* tests/core/tests/w_window: New test.
2003-04-30 Nicolas Burrus <burrus_n@lrde.epita.fr>
* oln/core/w_window1d.hh, oln/core/w_window2d.hh,
oln/core/w_window3d.hh: Remove useless and broken set methods.
2003-04-07 Nicolas Burrus <burrus_n@lrde.epita.fr>
* tests/io/Makefile.am: Add lena16b.pgm and lena16b.ppgm to
......
......@@ -159,7 +159,8 @@ operator<<(std::ostream& o, const oln::internal::_real_image2d<T,I>& ima)
{
for (oln::coord col = 0; col < ima.ncols(); ++col)
{
o.width(unsigned(log10(double(ntg::optraits<T>::max()))+2));
// FIXME: this does not work when optraits::max is not defined (eg floats)
// o.width(unsigned(log10(double(ntg::optraits<T>::max()))+2));
o << ima(row,col) << ' ';
}
o << std::endl;
......
......@@ -160,7 +160,8 @@ operator<<(std::ostream& o, const oln::internal::_real_image3d<T,I>& ima)
for (oln::coord row = 0; row < ima.nrows(); ++row) {
for (oln::coord col = 0; col < ima.ncols(); ++col)
{
o.width(unsigned(log10(double(ntg::optraits<T>::max()))+2));
// FIXME: this does not work when optraits<T>::max is not defined
// o.width(unsigned(log10(double(ntg::optraits<T>::max()))+2));
o << ima(slice, row, col) << ' ';
}
o << std::endl;
......
......@@ -67,16 +67,18 @@ namespace oln {