Olena-patches August 2010

olena-patches@lrde.epita.fr

6 participants
204 discussions

branch exp/next updated: last-svn-commit-468-g63c77cd

by lazzara＠lrde.epita.fr

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 63c77cdaa94cdbfd1ee3591675f729b74cc0371e (commit) via 621ebe718756448951c4362aa8dc5be8b84025da (commit) via c3d187edce3a706763c8e2bed355517e22037cf0 (commit) via a903e8dadd0bc8f76a36c846a6167903aac6c963 (commit) from 696503dfbe53631c3d16db408d7137a0d5b9c536 (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 ----------------------------------------------------------------- 63c77cd scribo/preprocessing/rotate_90.hh: Add a typedef to help g++-3.3. 621ebe7 Fix invalid pointer offset types. c3d187e Fix more warnings in Milena. a903e8d Fix more tests in Milena. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 23 +++++++++++++++++ milena/mln/convert/impl/from_float_to_value.hh | 10 +++++++ milena/mln/fun/v2v/saturate.hh | 1 + milena/mln/io/fld/load.hh | 13 ++++++--- milena/mln/io/fld/max_components.hh | 32 ++++++++++++++--------- milena/mln/subsampling/antialiased.hh | 3 +- milena/tests/subsampling/antialiased.cc | 10 +++--- scribo/ChangeLog | 14 ++++++++++ scribo/scribo/preprocessing/rotate_90.hh | 7 +++- 9 files changed, 87 insertions(+), 26 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 4 months

last-svn-commit-468-g63c77cd scribo/preprocessing/rotate_90.hh: Add a typedef to help g++-3.3.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ scribo/scribo/preprocessing/rotate_90.hh | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c35644d..1142f99 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/preprocessing/rotate_90.hh: Add a typedef to help + g++-3.3. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix invalid pointer offset types. * scribo/preprocessing/rotate_90.hh diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index 6373a4a..96c0469 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -88,9 +88,10 @@ namespace scribo // Initialize output domain and make sure the border size is the // same as input's. + typedef mln_domain(I) domain_t; mln_site(I) pmax(input.domain().pmax().col(), input.domain().pmax().row()); - mln_concrete(I) output(mln_domain(I)(input.domain().pmin(), pmax), + mln_concrete(I) output(domain_t(input.domain().pmin(), pmax), input.border()); mln_assertion(output.is_valid()); -- 1.5.6.5

14 years, 4 months

last-svn-commit-467-g621ebe7 Fix invalid pointer offset types.

by Guillaume Lazzara

* scribo/preprocessing/rotate_90.hh (out_next_offset, out_next_p_offset): Fix a wrong type leading to overflows. (output): Add an assertion checking its validity. --- scribo/ChangeLog | 9 +++++++++ scribo/scribo/preprocessing/rotate_90.hh | 4 +++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 26f8445..c35644d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid pointer offset types. + + * scribo/preprocessing/rotate_90.hh + (out_next_offset, out_next_p_offset): Fix a wrong type leading to + overflows. + (output): Add an assertion checking its validity. + 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> Fix warnings with g++-4.1 in Scribo. diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index bf93062..6373a4a 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -93,6 +93,8 @@ namespace scribo mln_concrete(I) output(mln_domain(I)(input.domain().pmin(), pmax), input.border()); + mln_assertion(output.is_valid()); + const mln_value(I)* in_ptr = input.buffer(); unsigned in_ncols = geom::ncols(input) + 2 * input.border(); @@ -101,7 +103,7 @@ namespace scribo unsigned out_ncols = geom::ncols(output); unsigned out_nrows = geom::nrows(output); - unsigned + int out_next_offset, out_next_p_offset; -- 1.5.6.5

14 years, 4 months

last-svn-commit-466-gc3d187e Fix more warnings in Milena.

by Guillaume Lazzara

* mln/convert/impl/from_float_to_value.hh: Add an overload for short int. * mln/io/fld/load.hh: Use convert::from_to. * mln/io/fld/max_components.hh: Explicitly cast values to unsigned. --- milena/ChangeLog | 11 ++++++++ milena/mln/convert/impl/from_float_to_value.hh | 10 +++++++ milena/mln/io/fld/load.hh | 13 ++++++--- milena/mln/io/fld/max_components.hh | 32 ++++++++++++++--------- 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ae192f..489ca03 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +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 + short int. + + * mln/io/fld/load.hh: Use convert::from_to. + + * mln/io/fld/max_components.hh: Explicitly cast values to unsigned. + 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> Fix more tests in Milena. diff --git a/milena/mln/convert/impl/from_float_to_value.hh b/milena/mln/convert/impl/from_float_to_value.hh index 9b5e3f0..f516419 100644 --- a/milena/mln/convert/impl/from_float_to_value.hh +++ b/milena/mln/convert/impl/from_float_to_value.hh @@ -143,6 +143,16 @@ namespace mln to = math::round<int>()(from); } + // float-> short + inline + void + from_to_(const float& from, + short& to) + { + to = math::round<short>()(from); + } + + } // end of namespace mln::convert::over_load # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/io/fld/load.hh b/milena/mln/io/fld/load.hh index 048630f..33768df 100644 --- a/milena/mln/io/fld/load.hh +++ b/milena/mln/io/fld/load.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. // @@ -43,6 +44,9 @@ /// /// FIXME: pnm::load uses special implementation if sizeof(int_u8) != 1 ?? what ?? +# include <fstream> +# include <iostream> + # include <mln/core/concept/image.hh> # include <mln/io/fld/header.hh> # include <mln/io/fld/load_header.hh> @@ -54,8 +58,7 @@ # include <mln/geom/nsites.hh> -# include <fstream> -# include <iostream> +# include <mln/convert/from_to.hh> namespace mln { @@ -220,8 +223,8 @@ namespace mln box<mln_site(I)> bbox; for (int i = 0; i < hder.ndim; ++i) { - bbox.pmin()[i] = hder.min_ext[i]; - bbox.pmax()[i] = hder.max_ext[i]; + convert::from_to(hder.min_ext[i], bbox.pmin()[i]); + convert::from_to(hder.max_ext[i], bbox.pmax()[i]); } ima.init_(bbox); diff --git a/milena/mln/io/fld/max_components.hh b/milena/mln/io/fld/max_components.hh index 70931b6..d57310a 100644 --- a/milena/mln/io/fld/max_components.hh +++ b/milena/mln/io/fld/max_components.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. // @@ -26,6 +27,11 @@ #ifndef MLN_IO_FLD_MAX_COMPONENTS_HH # define MLN_IO_FLD_MAX_COMPONENTS_HH +/// \file +/// +/// \fixme Don't we want to change the return type 'unsigned' to a +/// larger type or make it templated? + # include <mln/algebra/vec.hh> # include <mln/value/rgb.hh> # include <mln/io/fld/header.hh> @@ -41,53 +47,53 @@ namespace mln template <typename V> inline - unsigned int max_component(const V&); + unsigned max_component(const V&); template <unsigned n, typename V> inline - unsigned int max_component(const algebra::vec<n, V>& v); + unsigned max_component(const algebra::vec<n, V>& v); template <unsigned n> inline - unsigned int max_component(const value::rgb<n>&); + unsigned max_component(const value::rgb<n>&); inline - unsigned int max_component(const fld::data_type::E& t); + unsigned max_component(const fld::data_type::E& t); # ifndef MLN_INCLUDE_ONLY template <typename V> inline - unsigned int max_component(const V&) + unsigned max_component(const V&) { - return mln_max(V); + return unsigned(mln_max(V)); } template <unsigned n, typename V> inline - unsigned int max_component(const algebra::vec<n, V>& v) + unsigned max_component(const algebra::vec<n, V>& v) { - return mln_max(V); + return unsigned(mln_max(V)); } template <unsigned n> inline - unsigned int max_component(const value::rgb<n>&) + unsigned max_component(const value::rgb<n>&) { return mln_max(mln::value::int_u<n>); } inline - unsigned int max_component(const fld::data_type::E& t) + unsigned max_component(const fld::data_type::E& t) { switch (t) { case data_type::BYTE: return mln_max(unsigned char); case data_type::SHORT: return mln_max(unsigned short); case data_type::INTEGER: return mln_max(unsigned); - case data_type::FLOAT: return mln_max(float); - case data_type::DOUBLE: return mln_max(double); + case data_type::FLOAT: return unsigned(mln_max(float)); + case data_type::DOUBLE: return unsigned(mln_max(double)); default: return 0; } } -- 1.5.6.5

14 years, 4 months

last-svn-commit-465-ga903e8d Fix more tests in Milena.

by Guillaume Lazzara

* mln/fun/v2v/saturate.hh: Add a missing include. * mln/subsampling/antialiased.hh: Increment pointer after the call to convert::from_to. * tests/subsampling/antialiased.cc: Fix references according to last changes on 'round factor'. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/fun/v2v/saturate.hh | 1 + milena/mln/subsampling/antialiased.hh | 3 ++- milena/tests/subsampling/antialiased.cc | 10 +++++----- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2aec6aa..5ae192f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix more tests in Milena. + + * mln/fun/v2v/saturate.hh: Add a missing include. + + * mln/subsampling/antialiased.hh: Increment pointer after the call + to convert::from_to. + + * tests/subsampling/antialiased.cc: Fix references according to + last changes on 'round factor'. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix warnings with g++-4.1 in Milena. * mln/fun/v2v/saturate.hh, diff --git a/milena/mln/fun/v2v/saturate.hh b/milena/mln/fun/v2v/saturate.hh index 0b73269..3c38062 100644 --- a/milena/mln/fun/v2v/saturate.hh +++ b/milena/mln/fun/v2v/saturate.hh @@ -36,6 +36,7 @@ # include <mln/metal/converts_to.hh> # include <mln/trait/value_.hh> # include <mln/value/cast.hh> +# include <mln/convert/from_to.hh> namespace mln diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index f6f2c1d..cb6bbca 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -194,7 +194,8 @@ namespace mln for (unsigned k = 0; k < factor; ++k) s += *ptrs[j]++; - convert::from_to((s + factor_round) / factor_2, *po++); + convert::from_to((s + factor_round) / factor_2, *po); + ++po; } for (unsigned j = 0; j < factor; ++j) diff --git a/milena/tests/subsampling/antialiased.cc b/milena/tests/subsampling/antialiased.cc index 871a063..769f03f 100644 --- a/milena/tests/subsampling/antialiased.cc +++ b/milena/tests/subsampling/antialiased.cc @@ -40,13 +40,13 @@ int main() using namespace mln; using namespace mln::value; - int_u8 refgl[3][3] = { { 123, 152, 115 }, + int_u8 refgl[3][3] = { { 124, 153, 116 }, { 105, 116, 158 }, - { 92, 136, 106 } }; + { 93, 136, 106 } }; - rgb8 refrgb[3][3] = { { rgb8(197, 93, 91), rgb8(206, 131, 127), rgb8(170, 94, 101) }, - { rgb8(163, 78, 95), rgb8(173, 90, 105), rgb8(203, 143, 127) }, - { rgb8(135, 70, 96), rgb8(201, 111, 109), rgb8(158, 80, 90) } }; + rgb8 refrgb[3][3] = { { rgb8(197, 93, 92), rgb8(206, 131, 128), rgb8(171, 94, 101) }, + { rgb8(164, 78, 96), rgb8(174, 91, 105), rgb8(204, 143, 128) }, + { rgb8(135, 70, 96), rgb8(201, 112, 109), rgb8(159, 80, 90) } }; image2d<int_u8> refgl_ima = make::image(refgl); image2d<rgb8> refrgb_ima = make::image(refrgb); -- 1.5.6.5

14 years, 4 months

branch exp/next updated: last-svn-commit-464-g696503d

by lazzara＠lrde.epita.fr

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 696503dfbe53631c3d16db408d7137a0d5b9c536 (commit) via b265090ab82ff960a5cd770b863eebb8eeee71be (commit) from c0c3a98d00d261f0b32c16083030be5dc05e79ff (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 ----------------------------------------------------------------- 696503d Fix warnings with g++-4.1 in Milena. b265090 Fix warnings with g++-4.1 in Scribo. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 +++ milena/mln/fun/v2v/saturate.hh | 8 ++- milena/mln/subsampling/antialiased.hh | 2 +- milena/mln/value/rgb.hh | 54 ++++++++++---------- scribo/ChangeLog | 25 +++++++++ .../binarization/internal/first_pass_functor.hh | 25 +++++---- scribo/scribo/binarization/sauvola_ms.hh | 6 +- .../scribo/binarization/sauvola_threshold_image.hh | 12 ++-- .../binarization/sauvola_threshold_image_debug.hh | 13 +++-- scribo/scribo/postprocessing/fill_object_holes.hh | 9 ++-- scribo/scribo/preprocessing/deskew.hh | 8 ++-- scribo/scribo/primitive/extract/lines_pattern.hh | 4 +- scribo/scribo/subsampling/bilinear.hh | 4 +- scribo/scribo/subsampling/integral_single_image.hh | 11 ++-- scribo/scribo/text/clean_inplace.hh | 2 +- .../src/debug/show_links_several_right_overlap.cc | 4 +- scribo/src/debug/show_links_single_down.cc | 4 +- .../debug/show_links_single_down_left_aligned.cc | 2 +- .../debug/show_links_single_down_right_aligned.cc | 2 +- scribo/src/debug/show_links_single_left.cc | 5 +- scribo/src/debug/show_links_single_right.cc | 4 +- scribo/src/debug/show_links_single_up.cc | 4 +- .../src/debug/show_links_single_up_left_aligned.cc | 2 +- .../debug/show_links_single_up_right_aligned.cc | 2 +- 24 files changed, 131 insertions(+), 89 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 4 months

last-svn-commit-464-g696503d Fix warnings with g++-4.1 in Milena.

by Guillaume Lazzara

* mln/fun/v2v/saturate.hh, * mln/subsampling/antialiased.hh, * mln/value/rgb.hh: Use convert::from_to for type conversions. --- milena/ChangeLog | 8 +++++ milena/mln/fun/v2v/saturate.hh | 8 ++++- milena/mln/subsampling/antialiased.hh | 2 +- milena/mln/value/rgb.hh | 54 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e853813..2aec6aa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix warnings with g++-4.1 in Milena. + + * mln/fun/v2v/saturate.hh, + * mln/subsampling/antialiased.hh, + * mln/value/rgb.hh: Use convert::from_to for type conversions. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/point.hh: Fix a warning. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/fun/v2v/saturate.hh b/milena/mln/fun/v2v/saturate.hh index b26eb09..0b73269 100644 --- a/milena/mln/fun/v2v/saturate.hh +++ b/milena/mln/fun/v2v/saturate.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -112,7 +113,10 @@ namespace mln return min_; if (w > max_W) return max_; - return mln::value::cast<W>(w); + + V output; + convert::from_to(w, output); + return output; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index 80975bd..f6f2c1d 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -194,7 +194,7 @@ namespace mln for (unsigned k = 0; k < factor; ++k) s += *ptrs[j]++; - *po++ = (s + factor_round) / factor_2; + convert::from_to((s + factor_round) / factor_2, *po++); } for (unsigned j = 0; j < factor; ++j) diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 82e98d6..89ffce6 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -446,9 +446,9 @@ namespace mln inline rgb<n>::rgb(const algebra::vec<3, float>& v) { - this->v_[0] = v[0]; - this->v_[1] = v[1]; - this->v_[2] = v[2]; + convert::from_to(v[0], this->v_[0]); + convert::from_to(v[1], this->v_[1]); + convert::from_to(v[2], this->v_[2]); } template <unsigned n> @@ -488,27 +488,27 @@ namespace mln inline rgb<n>::rgb(const mln::literal::light_gray_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.75; - this->v_[1] = mln_max(int_u<n>) * 0.75; - this->v_[2] = mln_max(int_u<n>) * 0.75; + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[0]); + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[2]); } template <unsigned n> inline rgb<n>::rgb(const mln::literal::medium_gray_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.50; - this->v_[1] = mln_max(int_u<n>) * 0.50; - this->v_[2] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[0]); + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[2]); } template <unsigned n> inline rgb<n>::rgb(const mln::literal::dark_gray_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.25; - this->v_[1] = mln_max(int_u<n>) * 0.25; - this->v_[2] = mln_max(int_u<n>) * 0.25; + convert::from_to(mln_max(int_u<n>) * 0.25, this->v_[0]); + convert::from_to(mln_max(int_u<n>) * 0.25, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.25, this->v_[2]); } template <unsigned n> @@ -542,16 +542,16 @@ namespace mln inline rgb<n>::rgb(const mln::literal::brown_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.75; - this->v_[1] = mln_max(int_u<n>) * 0.50; - this->v_[2] = mln_max(int_u<n>) * 0.25; + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[0]); + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.25, this->v_[2]); } template <unsigned n> inline rgb<n>::rgb(const mln::literal::lime_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.75; + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[0]); this->v_[1] = mln_max(int_u<n>); this->v_[2] = 0; } @@ -561,7 +561,7 @@ namespace mln rgb<n>::rgb(const mln::literal::orange_t&) { this->v_[0] = mln_max(int_u<n>); - this->v_[1] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[1]); this->v_[2] = 0; } @@ -570,17 +570,17 @@ namespace mln rgb<n>::rgb(const mln::literal::pink_t&) { this->v_[0] = mln_max(int_u<n>); - this->v_[1] = mln_max(int_u<n>) * 0.75; - this->v_[2] = mln_max(int_u<n>) * 0.75; + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[2]); } template <unsigned n> inline rgb<n>::rgb(const mln::literal::purple_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.75; + convert::from_to(mln_max(int_u<n>) * 0.75, this->v_[0]); this->v_[1] = 0; - this->v_[2] = mln_max(int_u<n>) * 0.25; + convert::from_to(mln_max(int_u<n>) * 0.25, this->v_[2]); } template <unsigned n> @@ -588,17 +588,17 @@ namespace mln rgb<n>::rgb(const mln::literal::teal_t&) { this->v_[0] = 0; - this->v_[1] = mln_max(int_u<n>) * 0.50; - this->v_[2] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[1]); + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[2]); } template <unsigned n> inline rgb<n>::rgb(const mln::literal::violet_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[0]); this->v_[1] = 0; - this->v_[2] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[2]); } template <unsigned n> @@ -632,8 +632,8 @@ namespace mln inline rgb<n>::rgb(const mln::literal::olive_t&) { - this->v_[0] = mln_max(int_u<n>) * 0.50; - this->v_[1] = mln_max(int_u<n>) * 0.50; + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[0]); + convert::from_to(mln_max(int_u<n>) * 0.50, this->v_[1]); this->v_[2] = 0; } -- 1.5.6.5

14 years, 4 months

last-svn-commit-463-gb265090 Fix warnings with g++-4.1 in Scribo.

by Guillaume Lazzara

* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_ms.hh, * scribo/binarization/sauvola_threshold_image.hh, * scribo/binarization/sauvola_threshold_image_debug.hh, * scribo/postprocessing/fill_object_holes.hh, * scribo/preprocessing/deskew.hh, * scribo/primitive/extract/lines_pattern.hh, * scribo/subsampling/bilinear.hh, * scribo/subsampling/integral_single_image.hh, * scribo/text/clean_inplace.hh, * src/debug/show_links_several_right_overlap.cc, * src/debug/show_links_single_down.cc, * src/debug/show_links_single_down_left_aligned.cc, * src/debug/show_links_single_down_right_aligned.cc, * src/debug/show_links_single_left.cc, * src/debug/show_links_single_right.cc, * src/debug/show_links_single_up.cc, * src/debug/show_links_single_up_left_aligned.cc, * src/debug/show_links_single_up_right_aligned.cc: explicitly convert to a specific type when necessary. --- scribo/ChangeLog | 25 ++++++++++++++++++++ .../binarization/internal/first_pass_functor.hh | 25 +++++++++++-------- scribo/scribo/binarization/sauvola_ms.hh | 6 ++-- .../scribo/binarization/sauvola_threshold_image.hh | 12 ++++---- .../binarization/sauvola_threshold_image_debug.hh | 13 +++++---- scribo/scribo/postprocessing/fill_object_holes.hh | 9 +++---- scribo/scribo/preprocessing/deskew.hh | 8 +++--- scribo/scribo/primitive/extract/lines_pattern.hh | 4 +- scribo/scribo/subsampling/bilinear.hh | 4 +- scribo/scribo/subsampling/integral_single_image.hh | 11 ++++---- scribo/scribo/text/clean_inplace.hh | 2 +- .../src/debug/show_links_several_right_overlap.cc | 4 +- scribo/src/debug/show_links_single_down.cc | 4 +- .../debug/show_links_single_down_left_aligned.cc | 2 +- .../debug/show_links_single_down_right_aligned.cc | 2 +- scribo/src/debug/show_links_single_left.cc | 5 ++- scribo/src/debug/show_links_single_right.cc | 4 +- scribo/src/debug/show_links_single_up.cc | 4 +- .../src/debug/show_links_single_up_left_aligned.cc | 2 +- .../debug/show_links_single_up_right_aligned.cc | 2 +- 20 files changed, 89 insertions(+), 59 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f1f4f72..26f8445 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,30 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix warnings with g++-4.1 in Scribo. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_threshold_image.hh, + * scribo/binarization/sauvola_threshold_image_debug.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/preprocessing/deskew.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/subsampling/bilinear.hh, + * scribo/subsampling/integral_single_image.hh, + * scribo/text/clean_inplace.hh, + * src/debug/show_links_several_right_overlap.cc, + * src/debug/show_links_single_down.cc, + * src/debug/show_links_single_down_left_aligned.cc, + * src/debug/show_links_single_down_right_aligned.cc, + * src/debug/show_links_single_left.cc, + * src/debug/show_links_single_right.cc, + * src/debug/show_links_single_up.cc, + * src/debug/show_links_single_up_left_aligned.cc, + * src/debug/show_links_single_up_right_aligned.cc: explicitly + convert to a specific type when necessary. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen headers.mk and unit-tests.mk in Scribo. * headers.mk, diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 96c7cfb..92ccc55 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -115,18 +115,21 @@ namespace scribo unsigned p = pxl.offset(); # ifdef SCRIBO_SAUVOLA_DEBUG - value::int_u8 - t_p = sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R, - debug_k.element(p), - debug_s_n.element(p), - debug_k_l.element(p)); + value::int_u8 t_p; + convert::from_to( + sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R, + debug_k.element(p), + debug_s_n.element(p), + debug_k_l.element(p)), + t_p); # else - value::int_u8 - t_p = sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R); + value::int_u8 t_p; + convert::from_to(sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R), + t_p); # endif // SCRIBO_SAUVOLA_DEBUG diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 8964324..e767b86 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -150,7 +150,7 @@ namespace scribo typedef point2d P; // Cast to float is needed on MacOS X. - unsigned ratio = std::pow(float(q), float(i - 2u)); // Ratio in comparison to e_2 + unsigned ratio = unsigned(std::pow(float(q), float(i - 2u))); // Ratio in comparison to e_2 unsigned w_local = w * ratio, @@ -875,7 +875,7 @@ namespace scribo { int i = sub_ima.size() - 1; // Cast to float is needed on MacOS X. - unsigned ratio = std::pow(float(q), float(i - 2)); // Ratio compared to e_2 + unsigned ratio = unsigned(std::pow(float(q), float(i - 2))); // Ratio compared to e_2 t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, lambda_min_2 / ratio, mln_max(unsigned), @@ -890,7 +890,7 @@ namespace scribo for (int i = sub_ima.size() - 2; i > 2; --i) { // Cast to float is needed on MacOS X. - unsigned ratio = std::pow(float(q), float(i - 2)); // Ratio compared to e_2 + unsigned ratio = unsigned(std::pow(float(q), float(i - 2))); // Ratio compared to e_2 t_ima[i] = internal::compute_t_n_and_e_2(sub_ima[i], e_2, lambda_min_2 / ratio, lambda_max_2 / ratio, diff --git a/scribo/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh index 5382650..0225d37 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image.hh @@ -245,7 +245,6 @@ namespace scribo sauvola_threshold_formula(double m_x_y, double s_x_y) { # ifdef SCRIBO_SAUVOLA_DEBUG -# warning "This overload of sauvola_threshold_formula is disabled in debug mode!" std::cout << "This overload of sauvola_threshold_formula is disabled in debug mode!" << std::endl; return 0; # else @@ -438,11 +437,12 @@ namespace scribo for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) - output.at_(row, col) - = internal::compute_sauvola_threshold(P(row, col), simple, - squared, window_size, - K, - SCRIBO_DEFAULT_SAUVOLA_R); + convert::from_to( + internal::compute_sauvola_threshold(P(row, col), simple, + squared, window_size, + K, + SCRIBO_DEFAULT_SAUVOLA_R), + output.at_(row, col)); trace::exiting("scribo::binarization::impl::generic::sauvola_threshold"); return output; diff --git a/scribo/scribo/binarization/sauvola_threshold_image_debug.hh b/scribo/scribo/binarization/sauvola_threshold_image_debug.hh index a507920..fd317bc 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image_debug.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image_debug.hh @@ -237,12 +237,13 @@ namespace scribo for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) - output.at_(row, col) - = internal::compute_sauvola_threshold(P(row, col), - mean, stddev, thres, - simple, squared, - window_size, K, - SCRIBO_DEFAULT_SAUVOLA_R); + convert::from_to( + internal::compute_sauvola_threshold(P(row, col), + mean, stddev, thres, + simple, squared, + window_size, K, + SCRIBO_DEFAULT_SAUVOLA_R), + output.at_(row, col)); trace::exiting("scribo::binarization::impl::generic::sauvola_threshold"); return output; diff --git a/scribo/scribo/postprocessing/fill_object_holes.hh b/scribo/scribo/postprocessing/fill_object_holes.hh index 43c02ab..14416be 100644 --- a/scribo/scribo/postprocessing/fill_object_holes.hh +++ b/scribo/scribo/postprocessing/fill_object_holes.hh @@ -174,13 +174,12 @@ namespace scribo L bboxes_ima; util::array<unsigned> bg_comps( - static_cast<unsigned>(components.nelements()) + 1, 0); + unsigned(components.nelements()) + 1, 0); util::array<bool> bg_comps_done( - static_cast<unsigned>(components.nelements()) + 1, false); + unsigned(components.nelements()) + 1, false); mln::fun::i2v::array<bool> - to_keep(static_cast<unsigned>(components.nelements()) + 1, - false); + to_keep(unsigned(components.nelements()) + 1, false); const L& lbl = components.labeled_image(); @@ -366,7 +365,7 @@ namespace scribo util::array<unsigned>& card = res.second().first(); for (unsigned i = 1; i < card.size(); ++i) - card(i) = card(i) * ratio; + card(i) = unsigned(round(card(i) * ratio)); mln_ch_value(I, unsigned) thres = data::transform(res.first(), card); diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index 81331a7..9b86ff7 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -127,7 +127,7 @@ namespace scribo height_(height / 2), max_rho_(sqrt((width * width) + (height * height))), max_theta_(math::pi), - max_rho_index_(this->max_rho_ + 1), + max_rho_index_(int(this->max_rho_) + 1), max_theta_index_(500), acc_(this->max_rho_index_, this->max_theta_index_) { @@ -227,7 +227,7 @@ namespace scribo double rho_index = (0.5 + (rho / hough.mrho() + 0.5) * hough.mrhoi()); - ++(opt::at(hough.acc(), rho_index, i)); + ++(opt::at(hough.acc(), static_cast<def::coord>(rho_index), i)); } } @@ -379,8 +379,8 @@ namespace scribo if (tanv <= 25.0 || tanv >= 155.0) { ++nb_elm; - vote(j, i, hough, (tanv <= 25.0 ? 250.0 - tanv * 10.0 : - (180.0 - tanv) * 10.0 + 250.0)); + vote(j, i, hough, int((tanv <= 25.0 ? 250.0 - tanv * 10.0 : + (180.0 - tanv) * 10.0 + 250.0))); } } } diff --git a/scribo/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh index c68b577..f96c7b3 100644 --- a/scribo/scribo/primitive/extract/lines_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_pattern.hh @@ -171,8 +171,8 @@ namespace scribo bool is_foreground; unsigned ncols = geom::ncols(output); - unsigned hit_ratio = 0.2f * length + 1; - unsigned miss_ratio = 0.95f * length + 1; + unsigned hit_ratio = unsigned(0.2f * length + 1); + unsigned miss_ratio = unsigned(0.95f * length + 1); mln_box_runstart_piter(I) p(output.domain()); for_all(p) diff --git a/scribo/scribo/subsampling/bilinear.hh b/scribo/scribo/subsampling/bilinear.hh index b3d77ee..1717145 100644 --- a/scribo/scribo/subsampling/bilinear.hh +++ b/scribo/scribo/subsampling/bilinear.hh @@ -78,8 +78,8 @@ namespace scribo for_all(p) { - int x = round(-0.5 + p.col() * sub_ratio); - int y = round(-0.5 + p.row() * sub_ratio); + int x = int(round(-0.5 + p.col() * sub_ratio)); + int y = int(round(-0.5 + p.row() * sub_ratio)); if (x < 0) x = 0; diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index cd25fc1..077172a 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -154,7 +155,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - *p_sub++ = local_sum / 9; + convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -192,7 +193,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - *p_sub++ = local_sum / 9; + convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -283,7 +284,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - *p_sub++ = local_sum / 4; + convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -318,7 +319,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - *p_sub++ = local_sum / 4; + convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; diff --git a/scribo/scribo/text/clean_inplace.hh b/scribo/scribo/text/clean_inplace.hh index 4be4c29..fe96ff7 100644 --- a/scribo/scribo/text/clean_inplace.hh +++ b/scribo/scribo/text/clean_inplace.hh @@ -129,7 +129,7 @@ namespace scribo { // std::cout << "subsampling::bilinear" << " - " // << std::ceil(fact) << std::endl; - input = subsampling::bilinear(input, std::ceil(fact - 0.5)); // math::floor instead? + input = subsampling::bilinear(input, int(std::ceil(fact - 0.5))); // math::floor instead? } // else diff --git a/scribo/src/debug/show_links_several_right_overlap.cc b/scribo/src/debug/show_links_several_right_overlap.cc index 05eb72e..ae27e55 100644 --- a/scribo/src/debug/show_links_several_right_overlap.cc +++ b/scribo/src/debug/show_links_several_right_overlap.cc @@ -69,7 +69,7 @@ namespace scribo several_right_overlap_debug_functor(const I& input, const component_set<L>& comps, - float dmax) + unsigned dmax) : super_(comps, dmax) { this->anchors_.append(anchor::Top); @@ -155,7 +155,7 @@ int main(int argc, char* argv[]) // Write debug image. several_right_overlap_debug_functor<I, L> functor(input, - comps, atof(argv[2])); + comps, atoi(argv[2])); primitive::link::compute_several(functor); io::ppm::save(functor.output_, argv[3]); diff --git a/scribo/src/debug/show_links_single_down.cc b/scribo/src/debug/show_links_single_down.cc index 342a08f..f1ed130 100644 --- a/scribo/src/debug/show_links_single_down.cc +++ b/scribo/src/debug/show_links_single_down.cc @@ -67,7 +67,7 @@ namespace scribo single_down_link_debug_functor(const I& input, const component_set<L>& comps, - float dmax) + unsigned dmax) : super_(comps, dmax, anchor::Vertical) { output_ = data::convert(value::rgb8(), input); @@ -151,7 +151,7 @@ int main(int argc, char* argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); // Write debug image. - single_down_link_debug_functor<I, L> functor(input, comps, atof(argv[2])); + single_down_link_debug_functor<I, L> functor(input, comps, atoi(argv[2])); primitive::link::compute(functor); io::ppm::save(functor.output_, argv[3]); diff --git a/scribo/src/debug/show_links_single_down_left_aligned.cc b/scribo/src/debug/show_links_single_down_left_aligned.cc index 18eb04e..ea31db7 100644 --- a/scribo/src/debug/show_links_single_down_left_aligned.cc +++ b/scribo/src/debug/show_links_single_down_left_aligned.cc @@ -87,7 +87,7 @@ int main(int argc, char* argv[]) object_links<L> down_links = primitive::link::with_single_down_link(comps, - atof(argv[2]), + atoi(argv[2]), anchor::Left); // Filtering. diff --git a/scribo/src/debug/show_links_single_down_right_aligned.cc b/scribo/src/debug/show_links_single_down_right_aligned.cc index 6c53711..d261e5c 100644 --- a/scribo/src/debug/show_links_single_down_right_aligned.cc +++ b/scribo/src/debug/show_links_single_down_right_aligned.cc @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) object_links<L> down_links = primitive::link::with_single_down_link(comps, - atof(argv[2]), + atoi(argv[2]), anchor::Right); // Filtering. diff --git a/scribo/src/debug/show_links_single_left.cc b/scribo/src/debug/show_links_single_left.cc index bd79bbb..2211ce1 100644 --- a/scribo/src/debug/show_links_single_left.cc +++ b/scribo/src/debug/show_links_single_left.cc @@ -68,7 +68,7 @@ namespace scribo single_left_link_debug_functor(const I& input, const component_set<L>& components, - float dmax) + unsigned dmax) : super_(components, dmax, anchor::Horizontal) { output_ = data::convert(value::rgb8(), input); @@ -152,7 +152,8 @@ int main(int argc, char* argv[]) = scribo::primitive::extract::components(input, c8(), nbboxes); // Write debug image. - single_left_link_debug_functor<I, L> functor(input, components, atof(argv[2])); + single_left_link_debug_functor<I, L> functor(input, components, + atoi(argv[2])); primitive::link::compute(functor, anchor::MassCenter); io::ppm::save(functor.output_, argv[3]); diff --git a/scribo/src/debug/show_links_single_right.cc b/scribo/src/debug/show_links_single_right.cc index 0dd2ea3..632d082 100644 --- a/scribo/src/debug/show_links_single_right.cc +++ b/scribo/src/debug/show_links_single_right.cc @@ -68,7 +68,7 @@ namespace scribo single_right_link_debug_functor(const I& input, const component_set<L>& components, - float dmax) + unsigned dmax) : super_(components, dmax, anchor::Horizontal) { output_ = data::convert(value::rgb8(), input); @@ -154,7 +154,7 @@ int main(int argc, char* argv[]) // Write debug image. single_right_link_debug_functor<I, L> - functor(input, components, atof(argv[2])); + functor(input, components, atoi(argv[2])); primitive::link::compute(functor, anchor::MassCenter); io::ppm::save(functor.output_, argv[3]); diff --git a/scribo/src/debug/show_links_single_up.cc b/scribo/src/debug/show_links_single_up.cc index d71b1fe..db9d3e7 100644 --- a/scribo/src/debug/show_links_single_up.cc +++ b/scribo/src/debug/show_links_single_up.cc @@ -67,7 +67,7 @@ namespace scribo single_up_link_debug_functor(const I& input, const component_set<L>& components, - float dmax) + unsigned dmax) : super_(components, dmax, anchor::Vertical) { output_ = data::convert(value::rgb8(), input); @@ -153,7 +153,7 @@ int main(int argc, char* argv[]) // Write debug image. single_up_link_debug_functor<I, L> - functor(input, components, atof(argv[2])); + functor(input, components, atoi(argv[2])); primitive::link::compute(functor, anchor::MassCenter); io::ppm::save(functor.output_, argv[3]); diff --git a/scribo/src/debug/show_links_single_up_left_aligned.cc b/scribo/src/debug/show_links_single_up_left_aligned.cc index 2bb865f..d0df1e4 100644 --- a/scribo/src/debug/show_links_single_up_left_aligned.cc +++ b/scribo/src/debug/show_links_single_up_left_aligned.cc @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) object_links<L> up_links = primitive::link::with_single_up_link(comps, - atof(argv[2]), + atoi(argv[2]), anchor::Left); diff --git a/scribo/src/debug/show_links_single_up_right_aligned.cc b/scribo/src/debug/show_links_single_up_right_aligned.cc index 5cba3b4..3f40daf 100644 --- a/scribo/src/debug/show_links_single_up_right_aligned.cc +++ b/scribo/src/debug/show_links_single_up_right_aligned.cc @@ -87,7 +87,7 @@ int main(int argc, char* argv[]) object_links<L> up_links = primitive::link::with_single_up_link(comps, - atof(argv[2]), + atoi(argv[2]), anchor::Right); // Filtering. -- 1.5.6.5

14 years, 4 months

branch exp/next updated: last-svn-commit-462-gc0c3a98

by lazzara＠lrde.epita.fr

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 c0c3a98d00d261f0b32c16083030be5dc05e79ff (commit) via bd5519ba780434acb1a52552f55c5c91806d5931 (commit) via 4d1677cf6f3b63d78da59159550988f17e61b93a (commit) via 951bfdd9cb60516e53abc0c961c046851174d37d (commit) via ca408292a71afa85aa76b568642f91729ebaae05 (commit) from 00d8fa3b631df334782cc755a0a1bbc3af1e8d35 (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 ----------------------------------------------------------------- c0c3a98 mln/core/point.hh: Fix a warning. bd5519b Fix tests in Milena. 4d1677c Add missing traces. 951bfdd build-aux/build_unit_test.sh: Add more comments. ca40829 Handle libgdcmCommon's dependencies. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 11 +++++++++++ build-aux/build_unit_test.sh | 7 ++++++- configure.ac | 2 +- milena/ChangeLog | 28 ++++++++++++++++++++++++++++ milena/mln/convert/to_qimage.hh | 3 +++ milena/mln/convert/to_qimage_nocopy.hh | 4 +++- milena/mln/core/point.hh | 2 +- milena/mln/draw/dashed_line.hh | 2 +- milena/mln/fun/n2v/white_gaussian.hh | 4 ++-- milena/mln/fun/v2v/rgb_to_int_u.hh | 7 ++++++- milena/mln/io/dump/get_header.hh | 1 + milena/mln/io/raw/get_header.hh | 1 + milena/tests/topo/skeleton/crest.cc | 10 +++++----- milena/tests/unit_test/cond_tests_qt | 2 ++ milena/tests/unit_test/unit-tests.mk | 18 ++++++++++++++---- 15 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_qt hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 4 months

last-svn-commit-462-gc0c3a98 mln/core/point.hh: Fix a warning.

by Guillaume Lazzara

--- milena/ChangeLog | 9 +++++++-- milena/mln/core/point.hh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f960f53..e853813 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/point.hh: Fix a warning. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix tests in Milena. * mln/draw/dashed_line.hh, @@ -11,8 +15,9 @@ * tests/topo/skeleton/crest.cc: Fix reference results since a bug have been fixed. - * tests/unit_test/cond_tests_qt - * tests/unit_test/unit-tests.mk + * tests/unit_test/cond_tests_qt: Add conditional tests. + + * tests/unit_test/unit-tests.mk: Regen. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index 4dc7c5e..df1fc2c 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -276,7 +276,7 @@ namespace mln C convert_data_(metal::bool_<true>, const C2& v) { - return round(v); + return static_cast<C>(round(v)); } template <typename C, typename C2> -- 1.5.6.5

14 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
21
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 August 2010