- Olena-patches

last-svn-commit-499-ge9a515c Changelog: Cleanup.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

--- scribo/ChangeLog | 117 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 61 insertions(+), 56 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8ff203a..22ba01c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,7 +2,8 @@ Add arrows shortcuts. - * demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. + * demo/viewer/browser_widget.cc: prev/next binded to + Ctrl+Left/Right. 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> @@ -17,92 +18,96 @@ 2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> - Fix bug in Qt interface. + Fix bugs in Qt interface. - * scribo/demo/viewer/key_widget.cc - * scribo/demo/viewer/viewer.cc + * demo/viewer/key_widget.cc, + * demo/viewer/viewer.cc: Here. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> - Fix Segfault bug in Qt interface. + Fix a segfault in Qt interface. - * demo/viewer/viewer.cc: Clean vectors when load new picture. + * demo/viewer/viewer.cc: Clean vectors when loading a new picture. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Small changes in xml_transform. - * scribo/sandbox/arthur/xml_transform/README + * sandbox/arthur/xml_transform/README + + * sandbox/arthur/xml_transform/image_crop.cc: Delete + verbose mode. - * scribo/sandbox/arthur/xml_transform/image_crop.cc: Delete verbose mode. - * scribo/sandbox/arthur/xml_transform/main.cc: Small fix. + * sandbox/arthur/xml_transform/main.cc: Small fix. 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Files headers change + base64 data hide in xml tree. - * scribo/demo/viewer/README, - * scribo/demo/viewer/browser_widget.cc, - * scribo/demo/viewer/browser_widget.hh, - * scribo/demo/viewer/common.hh, - * scribo/demo/viewer/help_dialog.cc, - * scribo/demo/viewer/help_dialog.hh, - * scribo/demo/viewer/image_region.cc, - * scribo/demo/viewer/image_region.hh, - * scribo/demo/viewer/image_scene.cc, - * scribo/demo/viewer/image_scene.hh, - * scribo/demo/viewer/image_view.cc, - * scribo/demo/viewer/image_view.hh, - * scribo/demo/viewer/image_widget.cc, - * scribo/demo/viewer/image_widget.hh, - * scribo/demo/viewer/key_widget.cc, - * scribo/demo/viewer/key_widget.hh, - * scribo/demo/viewer/main.cc, - * scribo/demo/viewer/viewer.cc, - * scribo/demo/viewer/viewer.hh, - * scribo/demo/viewer/viewer.hxx, - * scribo/demo/viewer/xml_widget.cc: Change header (add LRDE copyright) - - * scribo/demo/viewer/xml_widget.hh: Hide data in base 64 to improve loading speed. + * demo/viewer/README, + * demo/viewer/browser_widget.cc, + * demo/viewer/browser_widget.hh, + * demo/viewer/common.hh, + * demo/viewer/help_dialog.cc, + * demo/viewer/help_dialog.hh, + * demo/viewer/image_region.cc, + * demo/viewer/image_region.hh, + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh, + * demo/viewer/image_view.cc, + * demo/viewer/image_view.hh, + * demo/viewer/image_widget.cc, + * demo/viewer/image_widget.hh, + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh, + * demo/viewer/main.cc, + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh, + * demo/viewer/viewer.hxx, + * demo/viewer/xml_widget.cc: Change header (add LRDE copyright) + + * demo/viewer/xml_widget.hh: Hide data in base 64 to improve + loading speed. 2010-07-20 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Text selectable in Qt interface. - * scribo/demo/viewer/viewer.cc + * demo/viewer/viewer.cc 2010-07-20 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Some changes in XML interface. - * scribo/demo/viewer/property_widget.cc, - * scribo/demo/viewer/property_widget.hh, - * scribo/demo/viewer/domitem.cc, - * scribo/demo/viewer/domitem.hh, - * scribo/demo/viewer/dommodel.cc, - * scribo/demo/viewer/dommodel.hh: Delete. + * demo/viewer/property_widget.cc, + * demo/viewer/property_widget.hh, + * demo/viewer/domitem.cc, + * demo/viewer/domitem.hh, + * demo/viewer/dommodel.cc, + * demo/viewer/dommodel.hh: Delete. - * scribo/demo/viewer/Makefile.am - - * scribo/demo/viewer/browser_widget.cc: Fix, xmlc extension instead of xmle. + * demo/viewer/Makefile.am: Remove dependencies. - * scribo/demo/viewer/key_widget.cc, - * scribo/demo/viewer/step_widget.cc, - * scribo/demo/viewer/step_widget.hh, - * scribo/demo/viewer/image_scene.cc, - * scribo/demo/viewer/image_scene.hh, - * scribo/demo/viewer/help_dialog.cc, - * scribo/demo/viewer/image_region.cc, - * scribo/demo/viewer/image_region.hh, - * scribo/demo/viewer/image_region.hxx: Small changes. + * demo/viewer/browser_widget.cc: Fix, xmlc extension instead of + xmle. - * scribo/demo/viewer/viewer.cc, - * scribo/demo/viewer/viewer.hh: Add base 64 cropped pictures support, text viewer - and change XML parsing. + * demo/viewer/key_widget.cc, + * demo/viewer/step_widget.cc, + * demo/viewer/step_widget.hh, + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh, + * demo/viewer/help_dialog.cc, + * demo/viewer/image_region.cc, + * demo/viewer/image_region.hh, + * demo/viewer/image_region.hxx: Small changes. - * scribo/demo/viewer/xml_widget.cc, - * scribo/demo/viewer/xml_widget.hh: Change widget, tree and attributes are together. + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add base 64 cropped pictures support, + text viewer and change XML parsing. + * demo/viewer/xml_widget.cc, + * demo/viewer/xml_widget.hh: Change widget, tree and attributes + are together. 2010-07-16 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-477-g53a57b1
by lazzara＠lrde.epita.fr 13 Aug '10

13 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next has been updated via 53a57b1d3275c5b9fb41db4b706342d6a7df992d (commit) via cd5ea6ecd0a75ad2dbabd704490682aeceac68bd (commit) from 2925b324b1b9c0427600a0160cdc214a03d5e8ae (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 53a57b1 Fix compilation with g++-3.3 in Milena. cd5ea6e scribo/debug/text_areas_image.hh: Add a typedef to help g++-3.3. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/mln/value/qt/rgb32.hh | 3 ++- scribo/ChangeLog | 4 ++++ scribo/scribo/debug/text_areas_image.hh | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-477-g53a57b1 Fix compilation with g++-3.3 in Milena.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

* mln/value/qt/rgb32.hh: Here. (name()): Change the returned string value. --- milena/ChangeLog | 7 +++++++ milena/mln/value/qt/rgb32.hh | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cc20d9e..7cbebec 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation with g++-3.3. + + * mln/value/qt/rgb32.hh: Here. + (name()): Change the returned string value. + 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/Makefile.am (DIST_FILES): Add missing files. diff --git a/milena/mln/value/qt/rgb32.hh b/milena/mln/value/qt/rgb32.hh index 2595bf8..e35c667 100644 --- a/milena/mln/value/qt/rgb32.hh +++ b/milena/mln/value/qt/rgb32.hh @@ -26,6 +26,7 @@ #ifndef MLN_VALUE_QT_RGB32_HH # define MLN_VALUE_QT_RGB32_HH +# include <cstring> # include <mln/value/ops.hh> @@ -174,7 +175,7 @@ namespace mln static const char* name() { - static std::string s = std::string("rgb32").append(1, 8 + '0'); + static std::string s = "qt_rgb32"; return s.c_str(); } -- 1.5.6.5

1 0

last-svn-commit-476-gcd5ea6e scribo/debug/text_areas_image.hh: Add a typedef to help g++-3.3.
by Guillaume Lazzara 13 Aug '10

13 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/scribo/debug/text_areas_image.hh | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1142f99..2dd5cb4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/debug/text_areas_image.hh: Add a typedef to help g++-3.3. + 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/preprocessing/rotate_90.hh: Add a typedef to help diff --git a/scribo/scribo/debug/text_areas_image.hh b/scribo/scribo/debug/text_areas_image.hh index eab208d..5b9f086 100644 --- a/scribo/scribo/debug/text_areas_image.hh +++ b/scribo/scribo/debug/text_areas_image.hh @@ -110,7 +110,8 @@ namespace scribo tr_box(comps(i).bbox().pmin().to_vec() + trans.t(), comps(i).bbox().pmax().to_vec() + trans.t()); - tr_image<mln_domain(I), tmp_t, trans_t> tr_ima(tr_box, tmp, trans); + typedef mln_domain(I) domain_t; + tr_image<domain_t, tmp_t, trans_t> tr_ima(tr_box, tmp, trans); data::paste(tr_ima, output); dv[0] += comps(i).bbox().nrows() + shift; -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-475-g2925b32
by lazzara＠lrde.epita.fr 12 Aug '10

12 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next has been updated via 2925b324b1b9c0427600a0160cdc214a03d5e8ae (commit) via 04569a2bb109e39ae8d09530aaa526ad9ae2df49 (commit) via ebad60a1e78715afe0359a2837c5de517fa7a42b (commit) from 5bd441f8f01071c7c228837ceb8d9e401bc8f974 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 2925b32 tests/unit_test/Makefile.am (DIST_FILES): Add missing files. 04569a2 Make Boost dependent tests conditional. ebad60a * build-aux/build_unit_test.sh: Handle composed dependency names in cond_tests_* files. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ build-aux/build_unit_test.sh | 10 +++++++--- milena/ChangeLog | 14 ++++++++++++++ milena/tests/accu/Makefile.am | 15 ++++++++++++--- milena/tests/unit_test/Makefile.am | 8 +++++--- .../cond_tests_boost-preprocessor_boost-tuple | 1 + milena/tests/unit_test/unit-tests.mk | 14 ++++++++++++-- 7 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-475-g2925b32 tests/unit_test/Makefile.am (DIST_FILES): Add missing files.
by Guillaume Lazzara 12 Aug '10

12 Aug '10

--- milena/ChangeLog | 4 ++++ milena/tests/unit_test/Makefile.am | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1342922..cc20d9e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/Makefile.am (DIST_FILES): Add missing files. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Make Boost dependent tests conditional. * tests/accu/Makefile.am (tuple): Add conditions. diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 9a6d644..d53d578 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -17,9 +17,11 @@ include $(top_srcdir)/milena/tests/tests.mk -COND_TESTS = cond_tests_cfitsio \ - cond_tests_gdcm \ - cond_tests_magickxx \ +COND_TESTS = cond_tests_boost-preprocessor_boost-tuple \ + cond_tests_cfitsio \ + cond_tests_gdcm \ + cond_tests_magickxx \ + cond_tests_qt \ cond_tests_tiff EXTRA_DIST = disabled_tests \ -- 1.5.6.5

1 0

last-svn-commit-474-g04569a2 Make Boost dependent tests conditional.
by Guillaume Lazzara 12 Aug '10

12 Aug '10

* tests/accu/Makefile.am (tuple): Add conditions. * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 10 ++++++++++ milena/tests/accu/Makefile.am | 15 ++++++++++++--- .../cond_tests_boost-preprocessor_boost-tuple | 1 + milena/tests/unit_test/unit-tests.mk | 14 ++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple diff --git a/milena/ChangeLog b/milena/ChangeLog index f655e6b..1342922 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Make Boost dependent tests conditional. + + * tests/accu/Makefile.am (tuple): Add conditions. + + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Milena. * mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 60beb52..cefa42c 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -36,8 +36,7 @@ check_PROGRAMS = \ transform_diagonal \ transform_directional \ transform_line \ - transform_snake \ - tuple + transform_snake all_accus_SOURCES = all_accus.cc compute_SOURCES = compute.cc @@ -51,6 +50,16 @@ transform_diagonal_SOURCES = transform_diagonal.cc transform_directional_SOURCES = transform_directional.cc transform_line_SOURCES = transform_line.cc transform_snake_SOURCES = transform_snake.cc + + +if HAVE_BOOST_PREPROCESSOR +if HAVE_BOOST_TUPLE + +check_PROGRAMS += tuple tuple_SOURCES = tuple.cc +endif HAVE_BOOST_TUPLE +endif HAVE_BOOST_PREPROCESSOR + + TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple b/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple new file mode 100644 index 0000000..ce2b5cc --- /dev/null +++ b/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple @@ -0,0 +1 @@ +mln/accu/tuple.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 31dddae..5751682 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -3,6 +3,18 @@ check_PROGRAMS = # Starting a conditional unit test list. +if HAVE_BOOST_PREPROCESSOR +if HAVE_BOOST_TUPLE +check_PROGRAMS += \ +mln_accu_tuple + +mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${BOOST_PREPROCESSOR_CPPFLAGS} ${AM_CPPFLAGS} +mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${BOOST_PREPROCESSOR_LDFLAGS} ${AM_LDFLAGS} +mln_accu_tuple_SOURCES = mln_accu_tuple.cc +endif HAVE_BOOST_TUPLE +endif HAVE_BOOST_PREPROCESSOR + +# Starting a conditional unit test list. if HAVE_CFITSIO check_PROGRAMS += \ mln_io_fits_all \ @@ -152,7 +164,6 @@ mln_accu_transform_directional \ mln_accu_transform_line \ mln_accu_transform_snake \ mln_accu_transform_stop \ -mln_accu_tuple \ mln_accu_v \ mln_algebra_all \ mln_algebra_essential \ @@ -1472,7 +1483,6 @@ mln_accu_transform_directional_SOURCES = mln_accu_transform_directional.cc mln_accu_transform_line_SOURCES = mln_accu_transform_line.cc mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_transform_stop_SOURCES = mln_accu_transform_stop.cc -mln_accu_tuple_SOURCES = mln_accu_tuple.cc mln_accu_v_SOURCES = mln_accu_v.cc mln_algebra_all_SOURCES = mln_algebra_all.cc mln_algebra_essential_SOURCES = mln_algebra_essential.cc -- 1.5.6.5

1 0

last-svn-commit-473-gebad60a * build-aux/build_unit_test.sh: Handle composed dependency names in cond_tests_* files.
by Guillaume Lazzara 12 Aug '10

12 Aug '10

--- ChangeLog | 5 +++++ build-aux/build_unit_test.sh | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a79da84..301ed5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Handle composed dependency names + in cond_tests_* files. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve configure output. * configure.ac: Improve configure output. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 65ba103..8492d64 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -33,13 +33,16 @@ ## "cond_tests_*" files must be created in the directory where ## unit-test.mk is generated (usually the unit-tests directory). ## -## WARNINGS: -## --------- +## NOTES +## ----- ## * Don't forget to add "cond_tests_*" files in the COND_TESTS ## variable in the right Makefile.am. ## ## * ALWAYS end "cond_tests_*" files with a new line! ## +## * If the dependency has a composed name use '-' to concatenate the words. +## (e.g., boost_tuple -> cond_tests_boost-tuple) +## ## FIXME: Don't use `echo -n', as echo's options are not portable. ## @@ -183,7 +186,8 @@ for f in $COND_TESTS; do COND_LIST="" while true; do name=`echo $fpostfix | cut -s -d '_' -f $i \ - | tr "[:lower:]" "[:upper:]"` + | tr "[:lower:]" "[:upper:]" \ + | sed -e 's/-/_/g'` i=$(($i+1)) if (test -z "$name"); then break; -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-472-g5bd441f
by lazzara＠lrde.epita.fr 12 Aug '10

12 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next has been updated via 5bd441f8f01071c7c228837ceb8d9e401bc8f974 (commit) via d6e4a923e32eb749a66490fba62885a69b2fb4dd (commit) via a4a49108929edc4cd8c2d108da7ca821f6684b45 (commit) from ed4e74a2f51a69d580a46b155c9d319d7e7f603c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5bd441f Small fixes in Milena. d6e4a92 Improve configure output. a4a4910 Handle Boost dependency. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 16 + configure.ac | 222 +++++++---- {dynamic-use-of-static-c++/config => m4}/boost.m4 | 437 ++++++++++++++++----- m4/oln-with-lib.m4 | 5 +- milena/ChangeLog | 10 + milena/mln/accu/tuple.hh | 13 +- milena/mln/fun/v2v/saturate.hh | 2 +- milena/mln/value/rgb.hh | 2 + 8 files changed, 515 insertions(+), 192 deletions(-) copy {dynamic-use-of-static-c++/config => m4}/boost.m4 (68%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-472-g5bd441f Small fixes in Milena.
by Guillaume Lazzara 12 Aug '10

12 Aug '10

* mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. * mln/value/rgb.hh: Add a missing include. * mln/accu/tuple.hh: Update include directive syntax. --- milena/ChangeLog | 10 ++++++++++ milena/mln/accu/tuple.hh | 13 +++++++------ milena/mln/fun/v2v/saturate.hh | 2 +- milena/mln/value/rgb.hh | 2 ++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 489ca03..f655e6b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Milena. + + * mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. + + * mln/value/rgb.hh: Add a missing include. + + * mln/accu/tuple.hh: Update include directive syntax. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix more warnings in Milena. * mln/convert/impl/from_float_to_value.hh: Add an overload for diff --git a/milena/mln/accu/tuple.hh b/milena/mln/accu/tuple.hh index 19ebdea..52e2ffa 100644 --- a/milena/mln/accu/tuple.hh +++ b/milena/mln/accu/tuple.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -39,11 +40,11 @@ # include <mln/metal/is_a.hh> # include <mln/metal/unqualif.hh> -# include "boost/tuple/tuple.hpp" -# include "boost/preprocessor/iteration/local.hpp" -# include "boost/preprocessor/repetition/repeat.hpp" -# include "boost/preprocessor/repetition/enum_params.hpp" -# include "boost/preprocessor/repetition/enum_params_with_a_default.hpp" +# include <boost/tuple/tuple.hpp> +# include <boost/preprocessor/iteration/local.hpp> +# include <boost/preprocessor/repetition/repeat.hpp> +# include <boost/preprocessor/repetition/enum_params.hpp> +# include <boost/preprocessor/repetition/enum_params_with_a_default.hpp> # define RESULT_ACCU(z, n, data) BOOST_PP_COMMA_IF(n) typename internal::tuplehelper_<T ## n>::result # define ARG(z, n, data) BOOST_PP_COMMA_IF(n) const T ## n& p ## n = T ## n() diff --git a/milena/mln/fun/v2v/saturate.hh b/milena/mln/fun/v2v/saturate.hh index 3c38062..9a354c6 100644 --- a/milena/mln/fun/v2v/saturate.hh +++ b/milena/mln/fun/v2v/saturate.hh @@ -116,7 +116,7 @@ namespace mln return max_; V output; - convert::from_to(w, output); + mln::convert::from_to(w, output); return output; } diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 89ffce6..c9d2f53 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -37,6 +37,8 @@ # include <mln/value/internal/make_generic_name.hh> +# include <mln/convert/from_to.hh> + // FIXME: should we consider that mln_min may be negative? => wrong // color formulae. -- 1.5.6.5

1 0