- Olena-patches

oln-0.10 10.242: Complete Rblena test suite
by Roland Levillain 11 Jul '06

11 Jul '06

Rblena is now as usable as Pylena is. I don't know why the watershed transform doesn't work (neither in Pylena nor in Rblena), but this shouldn't be hard to fix. By the way, if you want to take part in the lifting of Olena 0.10, you're welcome! Tell us, and we'll create some tickets on Olena's Trac. 2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Complete Rblena test suite. * ruby/tests/arith.rb, ruby/tests/conversions.rb, * ruby/tests/morpho.rb: New tests * ruby/tests/Makefile.am (dist_noinst_DATA): Add arith.rb, conversions.rb and morpho.rb. * python/tests/conversions.py, python/tests/morpho.py: * python/tests/simple1.py: Reduce the number of imported modules. * python/tests/Makefile.am, python/tests/arith.py, * python/tests/sanity.py, ruby/tests/conversions.rb, * ruby/tests/simple1.rb: Aesthetic changes. --- 10.241/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/15_Makefile.a 1.8 644) +++ 10.242/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/15_Makefile.a 1.9 644) @@ -3,10 +3,10 @@ ## Makefile.am for swilena/python/tests ## -dist_noinst_DATA = sanity.py arith.py conversions.py simple1.py morpho.py - TESTS_ENVIRONMENT = \ PYTHONPATH="..:$(srcdir)/..:$(PYTHONPATH):" \ IMGDIR="$(top_srcdir)/olena/img" +dist_noinst_DATA = sanity.py arith.py conversions.py morpho.py simple1.py + TESTS = $(dist_noinst_DATA) --- 10.241/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/16_simple1.py 1.5 744) +++ 10.242/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/16_simple1.py 1.6 744) @@ -1,10 +1,9 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks from swilena_image2d import * -from swilena_ntg import * imgdir = os.environ['IMGDIR'] --- 10.241/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/18_Makefile.a 1.7 644) +++ 10.242/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/18_Makefile.a 1.8 644) @@ -7,6 +7,6 @@ SWILENA_PATH="$(srcdir)/..:..:../.libs" \ IMGDIR="$(top_srcdir)/olena/img" -dist_noinst_DATA = sanity.rb simple1.rb +dist_noinst_DATA = sanity.rb arith.rb conversions.rb morpho.rb simple1.rb TESTS = $(dist_noinst_DATA) --- 10.241/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/19_simple1.rb 1.5 755) +++ 10.242/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/19_simple1.rb 1.6 755) @@ -1,6 +1,6 @@ -#!/usr/bin/env ruby +#! /usr/bin/env ruby -# Set swilena_path to the location where swilena ruby modules are +# Set swilena_path to the location where swilena ruby modules are. if ENV.has_key? "SWILENA_PATH" $:.concat ENV["SWILENA_PATH"].split(":") end --- 10.241/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/47_morpho.py 1.3 744) +++ 10.242/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/v/47_morpho.py 1.4 744) @@ -1,13 +1,28 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks -from swilena_all2d import * + +from swilena_image2d import * +from swilena_conversions2d import * + +from swilena_structelt2d import * +import swilena_morpho2d_ntg_int_s32 as morpho_s32 +import swilena_morpho2d_ntg_int_u8 as morpho_u8 imgdir = os.environ['IMGDIR'] lena = image2d_u8(load(imgdir + "/lena.pgm")) -lenas32 = cast_to_int_s32(lena) -closing(lenas32, win_c4p()) -#watershed_seg(lena, neighb_c4()) +lena_s32 = cast_to_int_s32(lena) +morpho_s32.closing(lena_s32, win_c4p()) + +# FIXME: The watershed transform fails with this error: +# +# Traceback (most recent call last): +# File "../../../../../tools/swilena/python/tests/morpho.py", line 21, in ? +# morpho_u8.watershed_seg(lena, neighb_c4()) +# RuntimeError: ../../../../integre/ntg/real/behavior.hh:238: +# Assertion `ntg::to_ntg(p) <= ntg::type_traits< T >::max()' failed. + +#morpho_u8.watershed_seg(lena, neighb_c4()) --- 10.241/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/0_arith.py 1.3 744) +++ 10.242/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/0_arith.py 1.4 744) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys --- 10.241/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/1_conversion 1.2 744) +++ 10.242/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/1_conversion 1.3 744) @@ -1,9 +1,10 @@ -#!/usr/bin/env python +#! /usr/bin/env python import os import sys import ltihooks -from swilena_all2d import * +from swilena_image2d import * +from swilena_conversions2d import * imgdir = os.environ['IMGDIR'] --- 10.241/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/38_sanity.rb 1.2 755) +++ 10.242/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/38_sanity.rb 1.3 755) @@ -2,7 +2,6 @@ # Sanity check: include all Ruby modules, but do nothing. - # Set swilena_path to the location where swilena ruby modules are. if ENV.has_key? "SWILENA_PATH" $:.concat ENV["SWILENA_PATH"].split(":") --- 10.241/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/39_sanity.py 1.2 744) +++ 10.242/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 17:56:38 +0200 levill_r (oln/w/39_sanity.py 1.3 744) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env python # Sanity check: include all Python modules, but do nothing.

1 0

oln-0.10 10.241: Adjust Swilena to Libtool.
by Roland Levillain 11 Jul '06

11 Jul '06

2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Adjust Swilena to Libtool. * expand.sh (INCLUDES): Merge with... (AM_CPPFLAGS): ...this. Add -I\$(srcdir)/../meta. (AM_LDFLAGS): Remove $(SHARED_LDFLAGS). Add -avoid-version -module -shared (for Libtool). (AM_SWIG_FLAGS): New. Adjust the generation of the SWIG wrapper. Create wrappers with extension `.cc' instead of `.cxx'. Build `.la' modules instead of `.so'. (pyexec_PROGRAMS): Rename as... (pyexec_LTLIBRARIES): ...this. (python_PYTHON): Rename as... (nodist_python_PYTHON): ...this. (CLEANFILES): Clean `.pyc' files and Rblena wrappers. (ruby_PROGRAMS): Rename as... (ruby_LTLIBRARIES): ...this. (ruby_DATA): New. * python/ltihooks.py: New file. * python/Makefile.am (EXTRA_DIST): Add ltihooks.py. ($(srcdir)/makefile.swig): New target. * python/tests/arith.py, python/tests/conversions.py, * python/tests/morpho.py, python/tests/sanity.py, * python/tests/simple1.py: Import ltihooks. * python/tests/Makefile.am (TESTS_ENVIRONMENT): Adjust PYTHONPATH. * ruby/ltrequire.rb: New file. * ruby/Makefile.am (EXTRA_DIST): Add ltrequire.rb. ($(srcdir)/makefile.swig): New target. * ruby/tests/sanity.rb, ruby/tests/simple1.rb: Adjust `$:' Require ltrequire. * ruby/tests/Makefile.am (TESTS_ENVIRONMENT): Adjust SWILENA_PATH. --- 10.240/tools/swilena/expand.sh Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/s/25_expand.sh 1.19 700) +++ 10.241/tools/swilena/expand.sh Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/s/25_expand.sh 1.20 700) @@ -85,26 +85,28 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src -AM_CPPFLAGS = -DOLN_EXCEPTIONS +AM_CPPFLAGS = -DOLN_EXCEPTIONS \$(PYTHON_CPPFLAGS) \\ + -I\$(srcdir)/../src -I\$(srcdir)/../meta AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) +## We build modules, not plain libs. +AM_LDFLAGS = -avoid-version -module -shared \$(ZLIB_LDFLAGS) +AM_SWIG_FLAGS = -c++ -python \$(AM_CPPFLAGS) EOF } dump_python() { - echo -n "pyexec_PROGRAMS =" + echo -n "pyexec_LTLIBRARIES =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then echo " \\"; echo -ne "\t" fi - echo -n " _swilena_$mod.so" + echo -n " _swilena_$mod.la" ilist=`expr $ilist + 1` done echo; echo - echo -n "python_PYTHON +=" + echo -n "nodist_python_PYTHON =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then @@ -115,19 +117,21 @@ done echo; echo for mod in $MODULES; do - echo "_swilena_${mod}_so_SOURCES = swilena_${mod}_wrap.cxx" + echo "nodist__swilena_${mod}_la_SOURCES = swilena_${mod}_wrap.cc" 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" + echo -e " swilena_all1d_wrap.cc \\" + echo -e " swilena_all2d_wrap.cc \\" + echo -e " swilena_all3d_wrap.cc \\" + echo -ne " swilena_display_wrap.cc" for mod in $MODULES; do echo -e "\\" echo -ne "\t swilena_$mod.py" echo -e "\\" - echo -ne "\t swilena_${mod}_wrap.cxx" + echo -ne "\t swilena_$mod.pyc" + echo -e "\\" + echo -ne "\t swilena_${mod}_wrap.cc" done echo; echo @@ -147,10 +151,10 @@ # here. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" - dest="${base}_wrap.cxx" + dest="${base}_wrap.cc" cat <<EOF $dest: $src - if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -python -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + if \$(SWIG) \$(AM_SWIG_FLAGS) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc \$(CPPFLAGS) -o \$@ \$<; \\ then \\ mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ else \\ @@ -177,30 +181,45 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src -AM_CPPFLAGS = -DOLN_EXCEPTIONS +AM_CPPFLAGS = -DOLN_EXCEPTIONS \$(RUBY_CPPFLAGS) \\ + -I\$(srcdir)/../src -I\$(srcdir)/../meta AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) - +## We build modules, not plain libs. +AM_LDFLAGS = -avoid-version -module -shared \$(ZLIB_LDFLAGS) +AM_SWIG_FLAGS = -c++ -ruby \$(AM_CPPFLAGS) EOF } dump_ruby() { - echo -n "ruby_PROGRAMS =" + echo -n "ruby_LTLIBRARIES =" ilist=0 for mod in $MODULES; do if [ `expr $ilist % 4` = 0 ]; then echo " \\"; echo -ne "\t" fi - echo -n " swilena_$mod.so" + echo -n " swilena_$mod.la" ilist=`expr $ilist + 1` done echo; echo for mod in $MODULES; do - echo "swilena_${mod}_so_SOURCES = swilena_${mod}_wrap.cxx" + echo "nodist_swilena_${mod}_la_SOURCES = swilena_${mod}_wrap.cc" done echo + echo -ne "CLEANFILES= " + echo -e " swilena_all1d_wrap.cc \\" + echo -e " swilena_all2d_wrap.cc \\" + echo -e " swilena_all3d_wrap.cc \\" + echo -ne " swilena_display_wrap.cc" + for mod in $MODULES; do + echo -e "\\" + echo -ne "\t swilena_${mod}_wrap.cc" + done + echo; echo + + echo "ruby_DATA =" + echo + ilist=0 for mod in $MODULES; do if [ -r "$SWILENA/src/swilena_${mod}.i" ]; then @@ -212,10 +231,10 @@ # interface. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" - dest="${base}_wrap.cxx" + dest="${base}_wrap.cc" cat <<EOF $dest: $src - if \$(SWIG) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o $dest $src; \\ + if \$(SWIG) \$(AM_SWIG_FLAGS) \$(SWIG_FLAGS) -MD -MF \$(DEPDIR)/${base}_wrap.Tcc \$(CPPFLAGS) -o \$@ \$<; \\ then \\ mv -f "\$(DEPDIR)/${base}_wrap.Tcc" "\$(DEPDIR)/${base}_wrap.Pcc"; \\ else \\ @@ -225,7 +244,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ EOF + +# Work around an issue between Libtool and Ruby on Mac OS X. +# Libtool generates dynamic modules ending in `.so', but the Ruby +# interpreter accepts only files ending in `.bundle' (and obviously +# `.rb') as arguments of the `require' method. Hence we create +# aliases for the .so files to make them appear as .bundle's +# to ruby. + cat <<EOF +ruby_DATA+ = .libs/$base.bundle +.libs/$base.bundle: .libs/$base.so $base.la + cd .libs && \$(LN_S) -f $base.so $base.bundle + +EOF done + + echo -n "CLEANFILES += \$(ruby_DATA)" } ############ Generic stuff ########### --- 10.240/tools/swilena/python/tests/Makefile.am Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/15_Makefile.a 1.7 644) +++ 10.241/tools/swilena/python/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/15_Makefile.a 1.8 644) @@ -6,7 +6,7 @@ dist_noinst_DATA = sanity.py arith.py conversions.py simple1.py morpho.py TESTS_ENVIRONMENT = \ - PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ + PYTHONPATH="..:$(srcdir)/..:$(PYTHONPATH):" \ IMGDIR="$(top_srcdir)/olena/img" TESTS = $(dist_noinst_DATA) --- 10.240/tools/swilena/python/tests/simple1.py Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/v/16_simple1.py 1.4 744) +++ 10.241/tools/swilena/python/tests/simple1.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/16_simple1.py 1.5 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_image2d import * from swilena_ntg import * --- 10.240/tools/swilena/ruby/Makefile.am Wed, 28 Apr 2004 14:20:16 +0200 van-vl_n (oln/v/17_Makefile.a 1.7 600) +++ 10.241/tools/swilena/ruby/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/17_Makefile.a 1.8 600) @@ -7,6 +7,9 @@ rubydir = $(libdir)/ruby -include makefile.swig +# ltrequire.rb: Extension of the `require' understanding Libtool libraries. +EXTRA_DIST = ltrequire.rb -CLEANFILES = *.cxx +$(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh + top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ +include $(srcdir)/makefile.swig --- 10.240/tools/swilena/ruby/tests/Makefile.am Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/18_Makefile.a 1.6 644) +++ 10.241/tools/swilena/ruby/tests/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/18_Makefile.a 1.7 644) @@ -4,7 +4,7 @@ ## TESTS_ENVIRONMENT = \ - SWILENA_PATH=".." \ + SWILENA_PATH="$(srcdir)/..:..:../.libs" \ IMGDIR="$(top_srcdir)/olena/img" dist_noinst_DATA = sanity.rb simple1.rb --- 10.240/tools/swilena/ruby/tests/simple1.rb Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/v/19_simple1.rb 1.4 755) +++ 10.241/tools/swilena/ruby/tests/simple1.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/19_simple1.rb 1.5 755) @@ -1,8 +1,11 @@ #!/usr/bin/env ruby # Set swilena_path to the location where swilena ruby modules are -$: << ENV["SWILENA_PATH"] if ENV.has_key? "SWILENA_PATH" +if ENV.has_key? "SWILENA_PATH" + $:.concat ENV["SWILENA_PATH"].split(":") +end +require "ltrequire" require "swilena_image2d" require "swilena_ntg" --- 10.240/tools/swilena/python/tests/morpho.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/47_morpho.py 1.2 744) +++ 10.241/tools/swilena/python/tests/morpho.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/v/47_morpho.py 1.3 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_all2d import * imgdir = os.environ['IMGDIR'] --- 10.240/tools/swilena/python/tests/arith.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/w/0_arith.py 1.2 744) +++ 10.241/tools/swilena/python/tests/arith.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/0_arith.py 1.3 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_image2d import * from swilena_arith2d import * --- 10.240/tools/swilena/python/tests/conversions.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/w/1_conversion 1.1 744) +++ 10.241/tools/swilena/python/tests/conversions.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/1_conversion 1.2 744) @@ -2,6 +2,7 @@ import os import sys +import ltihooks from swilena_all2d import * imgdir = os.environ['IMGDIR'] --- 10.240/tools/swilena/python/Makefile.am Tue, 20 Apr 2004 18:09:05 +0200 van-vl_n (oln/w/2_Makefile.a 1.7 600) +++ 10.241/tools/swilena/python/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/2_Makefile.a 1.8 600) @@ -5,7 +5,13 @@ SUBDIRS = . tests -python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py +# ltihooks.py: Python import hooks understanding Libtool libraries. +EXTRA_DIST = ltihooks.py -include makefile.swig +python_PYTHON = \ + swilena_display.py \ + swilena_all1d.py swilena_all2d.py swilena_all3d.py +$(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh + top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ +include $(srcdir)/makefile.swig --- 10.240/tools/swilena/ruby/tests/sanity.rb Fri, 30 Jun 2006 17:48:53 +0200 levill_r (oln/w/38_sanity.rb 1.1 755) +++ 10.241/tools/swilena/ruby/tests/sanity.rb Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/38_sanity.rb 1.2 755) @@ -4,8 +4,11 @@ # Set swilena_path to the location where swilena ruby modules are. -$: << ENV["SWILENA_PATH"] if ENV.has_key? "SWILENA_PATH" +if ENV.has_key? "SWILENA_PATH" + $:.concat ENV["SWILENA_PATH"].split(":") +end +require "ltrequire" # Integre types. require "swilena_ntg" --- 10.240/tools/swilena/python/tests/sanity.py Fri, 30 Jun 2006 17:48:53 +0200 levill_r (oln/w/39_sanity.py 1.1 744) +++ 10.241/tools/swilena/python/tests/sanity.py Tue, 11 Jul 2006 15:29:25 +0200 levill_r (oln/w/39_sanity.py 1.2 744) @@ -2,6 +2,7 @@ # Sanity check: include all Python modules, but do nothing. +import ltihooks # Integre types. import swilena_ntg

1 0

oln-0.10 10.240: Use Libtool
by Roland Levillain 11 Jul '06

11 Jul '06

2006-07-11 Roland Levillain <roland(a)lrde.epita.fr> Use Libtool. * config/oln.m4 (AC_SHARED_LDFLAGS): Remove. * configure.ac: No longer use AC_SHARED_LDFLAGS. Use AC_PROG_LIBTOOL. Index: 10.239/configure.ac --- 10.239/configure.ac Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.8 600) +++ 10.240/configure.ac Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.9 600) @@ -23,6 +23,9 @@ AC_PROG_RANLIB AC_PROG_CC +# Use Libtool to build Swilena's dynamic modules. +AC_PROG_LIBTOOL + # If available, use these. AC_WITH_CXX_ZLIB AC_WITH_CXX_FFTW @@ -388,8 +391,6 @@ AC_CHECK_SWIG_FLAGS - AC_SHARED_LDFLAGS - AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) Index: 10.239/config/oln.m4 --- 10.239/config/oln.m4 Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/j/15_oln.m4 1.38.1.14 600) +++ 10.240/config/oln.m4 Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/j/15_oln.m4 1.38.1.15 600) @@ -650,54 +650,6 @@ AC_LANG_POP([C++]) ]) -# AC_SHARED_LDFLAGS - -# Queries the linker and set the required LDFLAGS for creating a -# shared library. - -# FIXME: This is a simple hack to have Swilena compile on our main -# targets (GNU/Linux/IA-32, Mac OS X/PowerPC). We should obviously -# use Libtool instead, as it handle a whole lot more -# linkers and parameters. - -AC_DEFUN([AC_SHARED_LDFLAGS], -[dnl - AC_CACHE_CHECK([for linker flags to create a shared library], - [ac_cv_ld_style], - [ac_cv_ld_style=unknown - # FIXME: We should not use a hard-coded name for the - # linker, but I can't find a means to get the (C++) linker - # from Autoconf. - if ld -v 2>&1 | grep -i "Apple Computer" >/dev/null 2>&1; - then - ac_cv_ld_style=Apple - elif ld -v 2>&1 | grep -i "GNU" >/dev/null 2>&1; then - ac_cv_ld_style=GNU - else - ac_cv_ld_style=other - fi]) - - case "$ac_cv_ld_style" in - GNU) - _SHARED_LDFLAGS="-shared" - ;; - Apple) - # Seen on http://www.penzilla.net/tutorials/python/swig/. - _SHARED_LDFLAGS="-bundle -flat_namespace -undefined suppress" - ;; - other) - # Default: assume we're using GNU ld. - _SHARED_LDFLAGS="-shared" - ;; - esac - - if test ! ${SHARED_LDFLAGS+set}; then - SHARED_LDFLAGS=$_SHARED_LDFLAGS - fi - - AC_SUBST([SHARED_LDFLAGS]) -]) - ### ### Internal stuff for Olena ###

1 0

oln-0.10 10.239: Add missing files to the distribution
by Roland Levillain 07 Jul '06

07 Jul '06

2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> Add missing files to the distribution. * Makefile.am (EXTRA_DIST): Add bootstrap.sh. Index: 10.238/tools/swilena/ChangeLog --- 10.238/tools/swilena/ChangeLog Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.42 600) +++ 10.239/tools/swilena/ChangeLog Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.43 600) @@ -1,3 +1,12 @@ +2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing files to the distribution. + + * Makefile.am (EXTRA_DIST): New. + Add expand.sh, generate_arith_instantiations.py, + generate_conversions_instantiations.py and + generate_morpho_instantiations.py. + 2006-07-06 Roland Levillain <roland(a)lrde.epita.fr> Use SHARED_LDFLAGS. Index: 10.238/Makefile.am --- 10.238/Makefile.am Fri, 22 Aug 2003 10:44:47 +0200 astrid (oln/n/32_Makefile.a 1.17.1.2.1.7 600) +++ 10.239/Makefile.am Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/n/32_Makefile.a 1.17.1.2.1.8 600) @@ -19,7 +19,7 @@ ### Development files . ### -EXTRA_DIST = config/oln-local.m4 contrib/runtests +EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests ### ### Basic doc files generation. Index: 10.238/tools/swilena/Makefile.am --- 10.238/tools/swilena/Makefile.am Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/o/25_Makefile.a 1.5 600) +++ 10.239/tools/swilena/Makefile.am Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/o/25_Makefile.a 1.6 600) @@ -1,3 +1,9 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- SUBDIRS = meta src doc $(OLN_SWILENA_SUBDIRS) + +EXTRA_DIST = \ + expand.sh \ + generate_arith_instantiations.py \ + generate_conversions_instantiations.py \ + generate_morpho_instantiations.py

1 0

oln-0.10 10.238: Use SHARED_LDFLAGS in Swilena
by Roland Levillain 07 Jul '06

07 Jul '06

2006-07-06 Roland Levillain <roland(a)lrde.epita.fr> Use SHARED_LDFLAGS. * expand.sh (AM_LDFLAGS): Replace -shared with $(SHARED_LDFLAGS). ($base.rb): Remove this (useless) rule. Index: 10.237/tools/swilena/expand.sh --- 10.237/tools/swilena/expand.sh Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/s/25_expand.sh 1.18 700) +++ 10.238/tools/swilena/expand.sh Fri, 07 Jul 2006 18:29:56 +0200 levill_r (oln/s/25_expand.sh 1.19 700) @@ -88,7 +88,7 @@ INCLUDES = \$(PYTHON_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -180,9 +180,7 @@ INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) \$(DOC_CPPFLAGS) -# FIXME: Modern versions of swig don't use libswigpy. -#AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) -AM_LDFLAGS = -shared \$(ZLIB_LDFLAGS) +AM_LDFLAGS = \$(SHARED_LDFLAGS) \$(ZLIB_LDFLAGS) EOF } @@ -210,13 +208,8 @@ else sdir=meta fi - # Rule generating a C++ (*_wrap.cc) and a Ruby (*.rb) wrappers from a - # SWIG interface. - # - # FIXME: The generation of the Ruby wrapper is separated from - # the one of the C++ wrapper in this version, and that's not good. - # We should use Make's trick for multiple outputs (with timestamps) - # here. + # Rule generating a C++ (*_wrap.cc) wrapper for Ruby from a SWIG + # interface. base="swilena_${mod}" src="\$(srcdir)/../$sdir/$base.i" dest="${base}_wrap.cxx" @@ -231,9 +224,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./\$(DEPDIR)/${base}_wrap.Pcc@am__quote@ -$base.rb: $src - \$(MAKE) \$(AM_MAKEFLAGS) $dest - EOF done }

1 0

oln-0.10 10.237: Compute LDFLAGS required to create shared libraries
by Roland Levillain 07 Jul '06

07 Jul '06

I'll try to use Libtool in Olena 0.10a (soon) to replace this hack. 2006-07-07 Roland Levillain <roland(a)lrde.epita.fr> Add an Autoconf macro to figure out what are the linker flags for creating a shared library. This is actually a hack, hopefully replaced by Libtool in a future update. * config/oln.m4 (AC_SHARED_LDFLAGS): New macro. * configure.ac: Use it. Save CPPFLAGS before altering them. Index: 10.236/configure.ac --- 10.236/configure.ac Thu, 24 Jun 2004 18:10:23 +0200 odou_s (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.7 600) +++ 10.237/configure.ac Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.8 600) @@ -388,6 +388,8 @@ AC_CHECK_SWIG_FLAGS + AC_SHARED_LDFLAGS + AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) @@ -438,6 +440,7 @@ echo $line fi done`"]) + save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, AC_MSG_ERROR( Index: 10.236/config/oln.m4 --- 10.236/config/oln.m4 Tue, 04 Jul 2006 13:33:04 +0200 levill_r (oln/j/15_oln.m4 1.38.1.13 600) +++ 10.237/config/oln.m4 Fri, 07 Jul 2006 18:18:48 +0200 levill_r (oln/j/15_oln.m4 1.38.1.14 600) @@ -650,6 +650,54 @@ AC_LANG_POP([C++]) ]) +# AC_SHARED_LDFLAGS + +# Queries the linker and set the required LDFLAGS for creating a +# shared library. + +# FIXME: This is a simple hack to have Swilena compile on our main +# targets (GNU/Linux/IA-32, Mac OS X/PowerPC). We should obviously +# use Libtool instead, as it handle a whole lot more +# linkers and parameters. + +AC_DEFUN([AC_SHARED_LDFLAGS], +[dnl + AC_CACHE_CHECK([for linker flags to create a shared library], + [ac_cv_ld_style], + [ac_cv_ld_style=unknown + # FIXME: We should not use a hard-coded name for the + # linker, but I can't find a means to get the (C++) linker + # from Autoconf. + if ld -v 2>&1 | grep -i "Apple Computer" >/dev/null 2>&1; + then + ac_cv_ld_style=Apple + elif ld -v 2>&1 | grep -i "GNU" >/dev/null 2>&1; then + ac_cv_ld_style=GNU + else + ac_cv_ld_style=other + fi]) + + case "$ac_cv_ld_style" in + GNU) + _SHARED_LDFLAGS="-shared" + ;; + Apple) + # Seen on http://www.penzilla.net/tutorials/python/swig/. + _SHARED_LDFLAGS="-bundle -flat_namespace -undefined suppress" + ;; + other) + # Default: assume we're using GNU ld. + _SHARED_LDFLAGS="-shared" + ;; + esac + + if test ! ${SHARED_LDFLAGS+set}; then + SHARED_LDFLAGS=$_SHARED_LDFLAGS + fi + + AC_SUBST([SHARED_LDFLAGS]) +]) + ### ### Internal stuff for Olena ###

1 0

oln-0.10 10.236: Fix sanity tests
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix sanity tests. * oln/io/se_fwd.hh: New file. * oln/io/base.hh: Include it, and move the inclusions of oln/io/se_window.hh and oln/io/se_neighborhood.hh at the end of the file to prevent cycles in header inclusions from leading to ill-formed calls to template functions. * oln/makefile.src (OLN_DEP): Add io/se_fwd.hh. Index: 10.235/oln.prj --- 10.235/oln.prj +++ 10.235(w)/oln.prj @@ -1496,6 +1496,11 @@ ;; to version 10.232(w), by levill_r: (olena/oln/convert/float_cmp.hh (oln/w/40_float_cmp. 1.1 644)) + +;; Files added by populate at Wed, 05 Jul 2006 18:20:54 +0200, +;; to version 10.235(w), by levill_r: + + (olena/oln/io/se_fwd.hh ()) ) (Merge-Parents) (New-Merge-Parents) Index: 10.235/olena/oln/io/base.hh --- 10.235/olena/oln/io/base.hh Fri, 19 Mar 2004 18:50:43 +0100 odou_s (oln/b/20_base.hh 1.10 600) +++ 10.235(w)/olena/oln/io/base.hh Wed, 05 Jul 2006 16:46:11 +0200 levill_r (oln/b/20_base.hh 1.10 600) @@ -30,9 +30,8 @@ # include <oln/io/image_read.hh> # include <oln/io/image_write.hh> - -# include <oln/io/se_window.hh> -# include <oln/io/se_neighborhood.hh> +/// Forward declarations. +# include <oln/io/se_fwd.hh> namespace oln { @@ -134,4 +133,8 @@ } // end of namespace oln +// Implementations. +# include <oln/io/se_window.hh> +# include <oln/io/se_neighborhood.hh> + #endif // OLENA_IO_BASE_HH Index: 10.235/olena/oln/makefile.src --- 10.235/olena/oln/makefile.src Wed, 05 Jul 2006 18:12:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) +++ 10.235(w)/olena/oln/makefile.src Wed, 05 Jul 2006 18:20:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) @@ -138,6 +138,7 @@ io/pnm_write_data.hh \ io/readable.hh \ io/se.hh \ + io/se_fwd.hh \ io/se_neighborhood.hh \ io/se_window.hh \ io/stream_wrapper.hh \ Only in 10.235(w): olena/oln/io/se_fwd.hh

1 0

oln-0.10 10.235: Fix tests using the FFTW
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix tests using the FFTW. * oln/convol/fast_convolution.hh: s/HAVE_LIBfft/HAVE_FFTW/. * tests/convol/tests/fast_convol [HAVE_FFTW]: Invoke convol::fast::convolv and compare its result with convol::slow::convolve only if the FFTW is available. Index: 10.234/olena/oln/convol/fast_convolution.hh --- 10.234/olena/oln/convol/fast_convolution.hh Tue, 13 Jul 2004 11:48:20 +0200 palma_g (oln/r/12_fast_convo 1.4 600) +++ 10.234(w)/olena/oln/convol/fast_convolution.hh Wed, 05 Jul 2006 14:25:27 +0200 levill_r (oln/r/12_fast_convo 1.4 600) @@ -98,7 +98,7 @@ ** using namespace ntg; ** ** int main() { - ** #ifdef HAVE_LIBfft + ** #ifdef HAVE_FFTW ** image2d<int_u8> src(IMG_IN "lena.pgm"); ** float_d sigma = 2.5; ** float_d radius = 3; @@ -126,7 +126,7 @@ convolve(const abstract::image< I >& input, const abstract::image< J >& k) { -# ifdef HAVE_LIBfft +# ifdef HAVE_FFTW mlc::eq<I::dim, J::dim>::ensure(); mlc::eq<I::dim, 2>::ensure(); @@ -191,7 +191,7 @@ return output; # else assert(0); -# endif // !HAVE_LIBfft +# endif // !HAVE_FFTW } /*! Index: 10.234/olena/tests/convol/tests/fast_convol --- 10.234/olena/tests/convol/tests/fast_convol Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/13_fast_convo 1.2 600) +++ 10.234(w)/olena/tests/convol/tests/fast_convol Wed, 05 Jul 2006 14:27:05 +0200 levill_r (oln/r/13_fast_convo 1.2 600) @@ -19,10 +19,15 @@ for_all(i) f_src[i] = cast::bound<float_d>(src[i]); - image2d<float_d> tmp = convol::fast::convolve<float_d>(f_src, k); - image2d<float_d> tmp2 = convol::slow::convolve<float_d>(f_src, k); + image2d<float_d> tmp = convol::slow::convolve<float_d>(f_src, k); + +// Compare the slow convolution with the fast one if it is available +// (i.e., if the FFTW is available). +#ifdef HAVE_FFTW + image2d<float_d> tmp2 = convol::fast::convolve<float_d>(f_src, k); for_all(i) if (tmp[i] != tmp2[i]) return false; +#endif }

1 0

oln-0.10 10.234: Fix geodesic dilation and erosion
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Catch up with new naming conventions w.r.t. operators in geodesic dilation and erosion. * oln/morpho/geodesic_dilation.hh (oln::morpho::geodesic_dilation) * oln/morpho/geodesic_erosion.hh (oln::morpho::geodesic_erosion): Catch up with the new naming convention w.r.t. operators. Index: 10.233/olena/oln/morpho/geodesic_dilation.hh --- 10.233/olena/oln/morpho/geodesic_dilation.hh Wed, 14 Apr 2004 00:08:50 +0200 thivol_d (oln/37_geodesic_d 1.11.1.13 600) +++ 10.233(w)/olena/oln/morpho/geodesic_dilation.hh Wed, 05 Jul 2006 14:58:21 +0200 levill_r (oln/37_geodesic_d 1.11.1.13 600) @@ -94,9 +94,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(mask, marker)); - return arith::min<oln_concrete_type(I1)>(dilation(marker, - convert::ng_to_cse(Ng)), - mask); + return arith::min_with_ret<oln_concrete_type(I1)> + (dilation(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure { Index: 10.233/olena/oln/morpho/geodesic_erosion.hh --- 10.233/olena/oln/morpho/geodesic_erosion.hh Fri, 30 Jun 2006 17:17:34 +0200 levill_r (oln/36_geodesic_e 1.21 600) +++ 10.233(w)/olena/oln/morpho/geodesic_erosion.hh Wed, 05 Jul 2006 14:58:35 +0200 levill_r (oln/36_geodesic_e 1.21 600) @@ -92,7 +92,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(marker, mask)); - return arith::max<oln_concrete_type(I1)>(erosion(marker, convert::ng_to_cse(Ng)), mask); + return arith::max_with_ret<oln_concrete_type(I1)> + (erosion(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure {

1 0

oln-0.10 10.233: Fix color conversions
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix color conversions. * oln/convert/float_cmp.hh: New file. * oln/convert/rgbhsv.hh: Include it. (f_rgb_to_hsv::doit, f_hsv_to_rgb::doit): Use approx_eq and (resp. approx_neq) to compare float values instead of plain == (resp. !=). * oln/convert/rgbhsl.hh (f_rgb_to_hsl::doit, f_hsl_to_rgb::doit): Likewise. * tests/convert/conv.cc: Typo. * oln/makefile.src (OLN_DEP): Add convert/float_cmp.hh. Index: 10.232/olena/tests/convert/conv.cc --- 10.232/olena/tests/convert/conv.cc Thu, 31 Jul 2003 15:42:27 +0200 reda (oln/u/12_conv.cc 1.2 600) +++ 10.232(w)/olena/tests/convert/conv.cc Wed, 05 Jul 2006 17:43:16 +0200 levill_r (oln/u/12_conv.cc 1.2 600) @@ -2,8 +2,7 @@ /* The extra indirection to the _STR and _CONC macros is required so that if the arguments to STR() (or CONC()) are themselves macros, they will - ls - be expanded before being quoted. */ + be expanded before being quoted. */ #ifndef STR # define _STR(arg) #arg # define STR(arg) _STR(arg) Index: 10.232/olena/oln/convert/rgbhsv.hh --- 10.232/olena/oln/convert/rgbhsv.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/35_rgbhsv.hh 1.4 600) +++ 10.232(w)/olena/oln/convert/rgbhsv.hh Tue, 04 Jul 2006 19:25:50 +0200 levill_r (oln/j/35_rgbhsv.hh 1.4 600) @@ -31,6 +31,7 @@ # include <oln/basics.hh> # include <oln/convert/abstract/colorconv.hh> +# include <oln/convert/float_cmp.hh> # include <ntg/basics.hh> # include <ntg/color/rgb.hh> @@ -71,17 +72,17 @@ out[hsv_V] = max_in; - if (max_in != 0) + if (approx_neq(max_in, 0)) out[hsv_S] = delta / max_in; else out[hsv_S] = 0; - if (out[hsv_S] == 0) + if (approx_eq(out[hsv_S], 0)) out[hsv_H] = -1; // undefined else { - if (in[rgb_R] == max_in) + if (approx_eq(in[rgb_R], max_in)) out[hsv_H] = (in[rgb_G] - in[rgb_B]) / delta; - else if (in[rgb_G] == max_in) + else if (approx_eq(in[rgb_G], max_in)) out[hsv_H] = 2 + (in[rgb_B] - in[rgb_R]) / delta; else out[hsv_H] = 4 + (in[rgb_R] - in[rgb_G]) / delta; @@ -129,7 +130,7 @@ vec<3, float> in = v.to_float(); vec<3, float> out; - if(in[hsv_S] == 0) + if(approx_eq(in[hsv_S], 0)) out[rgb_G] = out[rgb_B] = out[rgb_R] = in[hsv_V]; else { Index: 10.232/olena/oln/convert/rgbhsl.hh --- 10.232/olena/oln/convert/rgbhsl.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/36_rgbhsl.hh 1.6 600) +++ 10.232(w)/olena/oln/convert/rgbhsl.hh Wed, 05 Jul 2006 17:50:01 +0200 levill_r (oln/j/36_rgbhsl.hh 1.6 600) @@ -31,6 +31,7 @@ # include <oln/basics.hh> # include <oln/convert/abstract/colorconv.hh> +# include <oln/convert/float_cmp.hh> # include <ntg/basics.hh> # include <ntg/color/rgb.hh> @@ -95,10 +96,11 @@ float diff = max_in-min_in; out[hsl_L] = (max_in + min_in) / 2; - if (std::abs(diff) <= FLT_EPSILON){ - out[hsl_S] = 0; - out[hsl_H] = 0; // undefined - } + if (approx_eq (diff, 0)) + { + out[hsl_S] = 0; + out[hsl_H] = 0; // undefined + } else { if (out[hsl_L] <= 0.5) out[hsl_S] = diff / (max_in + min_in); @@ -110,11 +112,11 @@ float g_dist = (max_in - in[rgb_G]) / diff; float b_dist = (max_in - in[rgb_B]) / diff; - if (in[rgb_R] == max_in) + if (approx_eq(in[rgb_R], max_in)) out[hsl_H] = b_dist - g_dist; - else if(in[rgb_G] == max_in) + else if(approx_eq(in[rgb_G], max_in)) out[hsl_H] = 2 + r_dist - b_dist; - else if(in[rgb_B] == max_in) + else if(approx_eq(in[rgb_B], max_in)) out[hsl_H] = 4 + g_dist - r_dist; out[hsl_H] *= 60; @@ -187,7 +189,7 @@ float p1 = 2 * in[hsl_L] - p2; - if(in[hsl_S] == 0) + if(approx_eq (in[hsl_S], 0)) out[rgb_R] = out[rgb_G] = out[rgb_B] = in[hsl_L]; else { Index: 10.232/olena/oln/makefile.src --- 10.232/olena/oln/makefile.src Thu, 09 Sep 2004 11:24:20 +0200 palma_g (oln/rOnly in 10.232(w): olena/oln/convert/float_cmp.hh /4_makefile.s 1.7 600) +++ 10.232(w)/olena/oln/makefile.src Wed, 05 Jul 2006 18:11:16 +0200 levill_r (oln/r/4_makefile.s 1.7 600) @@ -20,6 +20,7 @@ convert/abstract/conversion.hh \ convert/conversion.hh \ convert/conversion_ng_se.hh \ + convert/float_cmp.hh \ convert/force.hh \ convert/nrgbxyz.hh \ convert/rgbyiq.hh \

1 0