- Olena-patches

last-svn-commit-676-gf09fec4 Fix QImage conversions.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* mln/convert/to_qimage.hh: Fix a duplicate declaration. * mln/convert/to_qimage_nocopy.hh: Fix the minimum version required. --- milena/ChangeLog | 8 ++++++++ milena/mln/convert/to_qimage.hh | 1 - milena/mln/convert/to_qimage_nocopy.hh | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 milena/mln/convert/to_qimage.hh mode change 100644 => 100755 milena/mln/convert/to_qimage_nocopy.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 19cb4e5..9a5aa9b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix QImage conversions. + + * mln/convert/to_qimage.hh: Fix a duplicate declaration. + + * mln/convert/to_qimage_nocopy.hh: Fix the minimum version required. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh old mode 100644 new mode 100755 index b5b22ae..cd00cdc --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -86,7 +86,6 @@ namespace mln # if QT_VERSION >= 0x040000 && QT_VERSION < 0x040400 QImage qima(ncols, nrows, QImage::Format_RGB32); uchar * ptr_qima = qima.bits(); - unsigned offset = ima.delta_index(dpoint2d(+1, - ncols)); unsigned padding = 0; # if Q_BYTE_ORDER == Q_LITTLE_ENDIAN ++ptr_qima; diff --git a/milena/mln/convert/to_qimage_nocopy.hh b/milena/mln/convert/to_qimage_nocopy.hh old mode 100644 new mode 100755 index 91a96ad..93e0ebb --- a/milena/mln/convert/to_qimage_nocopy.hh +++ b/milena/mln/convert/to_qimage_nocopy.hh @@ -77,7 +77,7 @@ namespace mln } -# if QT_VERSION > 0x040300 +# if QT_VERSION >= 0x040400 template <typename I> inline @@ -120,7 +120,7 @@ namespace mln } -# if QT_VERSION > 0x040300 +# if QT_VERSION >= 0x040400 template <typename I> inline -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-677-gccbaf9e
by lazzara＠lrde.epita.fr 18 Nov '10

18 Nov '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 next-build-test has been updated via ccbaf9ec3ce9dd056c23da445652b06e119f60d3 (commit) from cf721d5f7cb5e77df5f8a65cc0d249ce1e4e5bb9 (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 ----------------------------------------------------------------- ccbaf9e mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 6 ++++++ milena/mln/convert/from_to.hh | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-677-gccbaf9e mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- milena/ChangeLog | 6 ++++++ milena/mln/convert/from_to.hh | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1a2ea7a..83dd467 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/convert/from_to.hh: Use value::cast for default builtin + conversions and use specific from_to_ overloads for float/double + conversions + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix disabled unit tests in Milena. * tests/unit_test/disabled_tests: Add a missing new line at end of diff --git a/milena/mln/convert/from_to.hh b/milena/mln/convert/from_to.hh index fa57ac3..1b04847 100644 --- a/milena/mln/convert/from_to.hh +++ b/milena/mln/convert/from_to.hh @@ -158,12 +158,7 @@ namespace mln from_to_dispatch(metal::false_, const F& from, metal::false_, T& to) { - to = mln::value::cast<T>(from); - - // We prefer using value::cast instead of a from_to_ overload. - // We don't want to write explicitly every from_to_ overload - // for all built-in types. - // over_load::from_to_(from, to); + over_load::from_to_(from, to); } @@ -229,6 +224,8 @@ namespace mln exact(to) = exact(from); } + + // Exact same type. template <typename T> inline void @@ -238,6 +235,16 @@ namespace mln } + // Default conversion. + template <typename F, typename T> + inline + void + from_to_(const F& from, T& to) + { + to = mln::value::cast<T>(from); + } + + } // end of namespace mln::convert::over_load -- 1.5.6.5

1 0

last-svn-commit-675-g75486e1 mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- milena/ChangeLog | 6 ++++++ milena/mln/convert/from_to.hh | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e71221f..19cb4e5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/convert/from_to.hh: Use value::cast for default builtin + conversions and use specific from_to_ overloads for float/double + conversions + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix disabled unit tests in Milena. * tests/unit_test/disabled_tests: Add a missing new line at end of diff --git a/milena/mln/convert/from_to.hh b/milena/mln/convert/from_to.hh index fa57ac3..1b04847 100644 --- a/milena/mln/convert/from_to.hh +++ b/milena/mln/convert/from_to.hh @@ -158,12 +158,7 @@ namespace mln from_to_dispatch(metal::false_, const F& from, metal::false_, T& to) { - to = mln::value::cast<T>(from); - - // We prefer using value::cast instead of a from_to_ overload. - // We don't want to write explicitly every from_to_ overload - // for all built-in types. - // over_load::from_to_(from, to); + over_load::from_to_(from, to); } @@ -229,6 +224,8 @@ namespace mln exact(to) = exact(from); } + + // Exact same type. template <typename T> inline void @@ -238,6 +235,16 @@ namespace mln } + // Default conversion. + template <typename F, typename T> + inline + void + from_to_(const F& from, T& to) + { + to = mln::value::cast<T>(from); + } + + } // end of namespace mln::convert::over_load -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-676-gcf721d5
by lazzara＠lrde.epita.fr 18 Nov '10

18 Nov '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 next-build-test has been updated via cf721d5f7cb5e77df5f8a65cc0d249ce1e4e5bb9 (commit) from 5fc9c32351bd3eef4749095a1948eeb2735c379c (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 ----------------------------------------------------------------- cf721d5 Fix disabled unit tests in Milena. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 9 +++++++++ milena/tests/unit_test/disabled_tests | 2 +- milena/tests/unit_test/unit-tests.mk | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-676-gcf721d5 Fix disabled unit tests in Milena.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* tests/unit_test/disabled_tests: Add a missing new line at end of file. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/tests/unit_test/disabled_tests | 2 +- milena/tests/unit_test/unit-tests.mk | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7491b8a..1a2ea7a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix disabled unit tests in Milena. + + * tests/unit_test/disabled_tests: Add a missing new line at end of + file. + + * tests/unit_test/unit-tests.mk: Regen. + 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index b86f257..8a189a5 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,4 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh -mln/world/rgb/invert.spe.hh \ No newline at end of file +mln/world/rgb/invert.spe.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5baced7..f4cfae7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -142,6 +142,7 @@ mln_accu_site_set_rectangularity \ mln_accu_stat_all \ mln_accu_stat_deviation \ mln_accu_stat_essential \ +mln_accu_stat_histo3d_rgb \ mln_accu_stat_max \ mln_accu_stat_max_h \ mln_accu_stat_mean \ @@ -1413,8 +1414,7 @@ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels \ -mln_world_rgb_invert \ -mln_world_rgb_invert_spe +mln_world_rgb_invert mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1466,6 +1466,7 @@ mln_accu_site_set_rectangularity_SOURCES = mln_accu_site_set_rectangularity.cc mln_accu_stat_all_SOURCES = mln_accu_stat_all.cc mln_accu_stat_deviation_SOURCES = mln_accu_stat_deviation.cc mln_accu_stat_essential_SOURCES = mln_accu_stat_essential.cc +mln_accu_stat_histo3d_rgb_SOURCES = mln_accu_stat_histo3d_rgb.cc mln_accu_stat_max_SOURCES = mln_accu_stat_max.cc mln_accu_stat_max_h_SOURCES = mln_accu_stat_max_h.cc mln_accu_stat_mean_SOURCES = mln_accu_stat_mean.cc @@ -2738,5 +2739,4 @@ mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator. mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc -mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

1 0

last-svn-commit-674-g99f6f2a Fix disabled unit tests in Milena.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* tests/unit_test/disabled_tests: Add a missing new line at end of file. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/tests/unit_test/disabled_tests | 2 +- milena/tests/unit_test/unit-tests.mk | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 55aabce..e71221f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix disabled unit tests in Milena. + + * tests/unit_test/disabled_tests: Add a missing new line at end of + file. + + * tests/unit_test/unit-tests.mk: Regen. + 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index b86f257..8a189a5 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,4 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh -mln/world/rgb/invert.spe.hh \ No newline at end of file +mln/world/rgb/invert.spe.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5baced7..f4cfae7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -142,6 +142,7 @@ mln_accu_site_set_rectangularity \ mln_accu_stat_all \ mln_accu_stat_deviation \ mln_accu_stat_essential \ +mln_accu_stat_histo3d_rgb \ mln_accu_stat_max \ mln_accu_stat_max_h \ mln_accu_stat_mean \ @@ -1413,8 +1414,7 @@ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels \ -mln_world_rgb_invert \ -mln_world_rgb_invert_spe +mln_world_rgb_invert mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1466,6 +1466,7 @@ mln_accu_site_set_rectangularity_SOURCES = mln_accu_site_set_rectangularity.cc mln_accu_stat_all_SOURCES = mln_accu_stat_all.cc mln_accu_stat_deviation_SOURCES = mln_accu_stat_deviation.cc mln_accu_stat_essential_SOURCES = mln_accu_stat_essential.cc +mln_accu_stat_histo3d_rgb_SOURCES = mln_accu_stat_histo3d_rgb.cc mln_accu_stat_max_SOURCES = mln_accu_stat_max.cc mln_accu_stat_max_h_SOURCES = mln_accu_stat_max_h.cc mln_accu_stat_mean_SOURCES = mln_accu_stat_mean.cc @@ -2738,5 +2739,4 @@ mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator. mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc -mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-675-g5fc9c32
by lazzara＠lrde.epita.fr 16 Nov '10

16 Nov '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 next-build-test has been updated via 5fc9c32351bd3eef4749095a1948eeb2735c379c (commit) from 557ac2f43b73eb2fc3a49d1d34975559873fabee (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 ----------------------------------------------------------------- 5fc9c32 tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-675-g5fc9c32 tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index af606bd..7491b8a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe + test. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. * tests/accu/stat/Makefile.am: Add a new target. diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index 5fd991c..b86f257 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,3 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh +mln/world/rgb/invert.spe.hh \ No newline at end of file -- 1.5.6.5

1 0

last-svn-commit-673-g270711a tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b6247e..55aabce 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe + test. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. * tests/accu/stat/Makefile.am: Add a new target. diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index 5fd991c..b86f257 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,3 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh +mln/world/rgb/invert.spe.hh \ No newline at end of file -- 1.5.6.5

1 0