Olena-patches March 2011

olena-patches@lrde.epita.fr

7 participants
277 discussions

last-svn-commit-818-g42ed2b1 Regen generated files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 2 ++ milena/tests/unit_test/unit-tests.mk | 30 +++++++++++++++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9afea6f..8e3a24d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/labeling/colorize.hh: Add a missing inline. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/headers.mk b/milena/headers.mk index 3d897e3..bb64c9d 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -42,6 +42,7 @@ mln/accu/shape/all.hh \ mln/accu/shape/bbox.hh \ mln/accu/shape/essential.hh \ mln/accu/shape/height.hh \ +mln/accu/shape/site_list.hh \ mln/accu/shape/volume.hh \ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ @@ -560,6 +561,7 @@ mln/fun/v2v/projection.hh \ mln/fun/v2v/qt_rgb_to_int_u.hh \ mln/fun/v2v/rgb8_to_rgbn.hh \ mln/fun/v2v/rgb_to_int_u.hh \ +mln/fun/v2v/rgb_to_luma.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ mln/fun/v2w2v/all.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index f4cfae7..2a44d75 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -7,7 +7,7 @@ if HAVE_BOOST_TUPLE check_PROGRAMS += \ mln_accu_tuple -mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${AM_CPPFLAGS} +mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} -DHAVE_BOOST_TUPLE ${AM_CPPFLAGS} mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${AM_LDFLAGS} mln_accu_tuple_SOURCES = mln_accu_tuple.cc endif HAVE_BOOST_TUPLE @@ -18,10 +18,10 @@ check_PROGRAMS += \ mln_io_fits_all \ mln_io_fits_load -mln_io_fits_all_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_fits_all_CPPFLAGS= ${CFITSIO_CPPFLAGS} -DHAVE_CFITSIO ${AM_CPPFLAGS} mln_io_fits_all_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} mln_io_fits_all_SOURCES = mln_io_fits_all.cc -mln_io_fits_load_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_fits_load_CPPFLAGS= ${CFITSIO_CPPFLAGS} -DHAVE_CFITSIO ${AM_CPPFLAGS} mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} mln_io_fits_load_SOURCES = mln_io_fits_load.cc endif HAVE_CFITSIO @@ -33,13 +33,13 @@ mln_io_dicom_all \ mln_io_dicom_load \ mln_io_dicom_get_header -mln_io_dicom_all_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_all_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} mln_io_dicom_all_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} mln_io_dicom_all_SOURCES = mln_io_dicom_all.cc -mln_io_dicom_load_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_load_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} mln_io_dicom_load_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} mln_io_dicom_load_SOURCES = mln_io_dicom_load.cc -mln_io_dicom_get_header_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_get_header_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} mln_io_dicom_get_header_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc endif HAVE_GDCM @@ -51,13 +51,13 @@ mln_io_magick_all \ mln_io_magick_load \ mln_io_magick_save -mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_all_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} mln_io_magick_all_SOURCES = mln_io_magick_all.cc -mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_load_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} mln_io_magick_load_SOURCES = mln_io_magick_load.cc -mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} mln_io_magick_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} mln_io_magick_save_SOURCES = mln_io_magick_save.cc endif HAVE_MAGICKXX @@ -68,10 +68,10 @@ check_PROGRAMS += \ mln_convert_to_qimage \ mln_convert_to_qimage_nocopy -mln_convert_to_qimage_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +mln_convert_to_qimage_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} mln_convert_to_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} mln_convert_to_qimage_SOURCES = mln_convert_to_qimage.cc -mln_convert_to_qimage_nocopy_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +mln_convert_to_qimage_nocopy_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} mln_convert_to_qimage_nocopy_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc endif HAVE_QT @@ -82,10 +82,10 @@ check_PROGRAMS += \ mln_io_tiff_all \ mln_io_tiff_load -mln_io_tiff_all_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_tiff_all_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${AM_CPPFLAGS} mln_io_tiff_all_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} mln_io_tiff_all_SOURCES = mln_io_tiff_all.cc -mln_io_tiff_load_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_tiff_load_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${AM_CPPFLAGS} mln_io_tiff_load_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} mln_io_tiff_load_SOURCES = mln_io_tiff_load.cc endif HAVE_TIFF @@ -135,6 +135,7 @@ mln_accu_shape_all \ mln_accu_shape_bbox \ mln_accu_shape_essential \ mln_accu_shape_height \ +mln_accu_shape_site_list \ mln_accu_shape_volume \ mln_accu_site_set_all \ mln_accu_site_set_essential \ @@ -674,6 +675,7 @@ mln_fun_v2v_rgb8_to_rgbn \ mln_fun_v2v_rgb_to_hsi \ mln_fun_v2v_rgb_to_hsl \ mln_fun_v2v_rgb_to_int_u \ +mln_fun_v2v_rgb_to_luma \ mln_fun_v2v_saturate \ mln_fun_v2v_wrap \ mln_fun_v2w2v_all \ @@ -1459,6 +1461,7 @@ mln_accu_shape_all_SOURCES = mln_accu_shape_all.cc mln_accu_shape_bbox_SOURCES = mln_accu_shape_bbox.cc mln_accu_shape_essential_SOURCES = mln_accu_shape_essential.cc mln_accu_shape_height_SOURCES = mln_accu_shape_height.cc +mln_accu_shape_site_list_SOURCES = mln_accu_shape_site_list.cc mln_accu_shape_volume_SOURCES = mln_accu_shape_volume.cc mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc @@ -1998,6 +2001,7 @@ mln_fun_v2v_rgb8_to_rgbn_SOURCES = mln_fun_v2v_rgb8_to_rgbn.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc mln_fun_v2v_rgb_to_int_u_SOURCES = mln_fun_v2v_rgb_to_int_u.cc +mln_fun_v2v_rgb_to_luma_SOURCES = mln_fun_v2v_rgb_to_luma.cc mln_fun_v2v_saturate_SOURCES = mln_fun_v2v_saturate.cc mln_fun_v2v_wrap_SOURCES = mln_fun_v2v_wrap.cc mln_fun_v2w2v_all_SOURCES = mln_fun_v2w2v_all.cc -- 1.5.6.5

13 years, 9 months

last-svn-commit-817-g485bbf8 Regen generated files.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-817-gdb74571 Regen generated files.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-817-g1464e55 mln/labeling/colorize.hh: Add a missing inline.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/labeling/colorize.hh | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0a3aea..9afea6f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/labeling/colorize.hh: Add a missing inline. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Add more from_to overloards. * mln/convert/impl/from_unsigned_to_value.hh, diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index af9585c..ddfbb15 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -173,6 +173,7 @@ namespace mln # ifdef MLN_VALUE_QT_RGB32_HH + inline mln::value::qt::rgb32 random_color(const mln::value::qt::rgb32& v) { -- 1.5.6.5

13 years, 9 months

last-svn-commit-816-g20b750a mln/labeling/colorize.hh: Add a missing inline.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-816-g4e7a87b mln/labeling/colorize.hh: Add a missing inline.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-816-ge69979d Add more from_to overloards.

by Guillaume Lazzara

* mln/convert/impl/from_unsigned_to_value.hh, * mln/value/label.hh: Here. --- milena/ChangeLog | 7 +++++ milena/mln/convert/impl/from_unsigned_to_value.hh | 26 ++++++++++++++++----- milena/mln/value/label.hh | 20 ++++++++++++++- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2eed916..f0a3aea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more from_to overloards. + + * mln/convert/impl/from_unsigned_to_value.hh, + * mln/value/label.hh: Here. + 2011-03-01 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/labeling/fill_holes.hh: Improve speed. diff --git a/milena/mln/convert/impl/from_unsigned_to_value.hh b/milena/mln/convert/impl/from_unsigned_to_value.hh index 4d4fc3a..783b5e9 100644 --- a/milena/mln/convert/impl/from_unsigned_to_value.hh +++ b/milena/mln/convert/impl/from_unsigned_to_value.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -48,11 +48,15 @@ namespace mln namespace convert { - /// Conversion of an unsigned \p from towards a value \p to. - template <typename V> - void - from_to(const unsigned& from, Value<V>& to); + /// Conversion of an unsigned \p from towards a value \p to. + template <typename V> + void + from_to(const unsigned& from, Value<V>& to); + /// Conversion of an unsigned \p from towards a bool \p to. + inline + void + from_to_(const unsigned& from, bool& to); # ifndef MLN_INCLUDE_ONLY @@ -120,6 +124,16 @@ namespace mln } + // Facades. + // unsigned-> bool + inline + void + from_to_(const unsigned& from, bool& to) + { + to = (from != 0u); + } + + } // end of namespace mln::convert::over_load diff --git a/milena/mln/value/label.hh b/milena/mln/value/label.hh index 7491ae5..5c983e5 100644 --- a/milena/mln/value/label.hh +++ b/milena/mln/value/label.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -119,6 +119,11 @@ namespace mln void from_to_(const value::label<n>& from, bool& to_); + // label -> unsigned. + template <unsigned n> + void + from_to_(const value::label<n>& from, unsigned& to_); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert @@ -233,6 +238,7 @@ namespace mln to_ = from; } + // int_u<n> -> bool template <unsigned n> inline void @@ -241,6 +247,16 @@ namespace mln to_ = (from != 0u); } + // int_u<n> -> unsigned + template <unsigned n> + inline + void + from_to_(const value::label<n>& from, unsigned& to_) + { + to_ = from; + } + + } // end of namespace mln::convert::over_load } // end of namespace mln::convert -- 1.5.6.5

13 years, 9 months

last-svn-commit-815-g3de602a Add more from_to overloards.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-815-g76d5814 Add more from_to overloards.

by Guillaume Lazzara

13 years, 9 months

last-svn-commit-815-gbed2715 build-aux/build_unit_test.sh: Define HAVE_* for unit-tests.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30f8b74..f634518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Define HAVE_* for unit-tests. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: scribo/src/primitive/remove. 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 8492d64..8f7bd97 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -115,7 +115,7 @@ EOF cppflags="${NAME}_CPPFLAGS=" ldflags="${NAME}_LDFLAGS=" for i in $IFDEF; do - cppflags="${cppflags} \${${i}_CPPFLAGS} " + cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}" ldflags="${ldflags} \${${i}_LDFLAGS} " done echo "$cppflags \${AM_CPPFLAGS}" >>"$output" -- 1.5.6.5

13 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2011