- Olena-patches

last-svn-commit-464-g696503d Fix warnings with g++-4.1 in Milena.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* 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

1 0

last-svn-commit-463-gb265090 Fix warnings with g++-4.1 in Scribo.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* 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

1 0

branch exp/next updated: last-svn-commit-462-gc0c3a98
by lazzara＠lrde.epita.fr 11 Aug '10

11 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 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

1 0

last-svn-commit-462-gc0c3a98 mln/core/point.hh: Fix a warning.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- 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

1 0

last-svn-commit-461-gbd5519b Fix tests in Milena.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* mln/draw/dashed_line.hh, * mln/fun/n2v/white_gaussian.hh, * mln/fun/v2v/rgb_to_int_u.hh, * mln/io/dump/get_header.hh, * mln/io/raw/get_header.hh: Add missing includes. * tests/topo/skeleton/crest.cc: Fix reference results since a bug have been fixed. * tests/unit_test/cond_tests_qt: Add conditional tests. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 16 ++++++++++++++++ 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 ++++++++++++++---- 9 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_qt diff --git a/milena/ChangeLog b/milena/ChangeLog index b149b2b..f960f53 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix tests in Milena. + + * mln/draw/dashed_line.hh, + * mln/fun/n2v/white_gaussian.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/io/dump/get_header.hh, + * mln/io/raw/get_header.hh: Add missing includes. + + * 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 + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing traces. * mln/convert/to_qimage.hh, diff --git a/milena/mln/draw/dashed_line.hh b/milena/mln/draw/dashed_line.hh index 6b0d244..4a31ae9 100644 --- a/milena/mln/draw/dashed_line.hh +++ b/milena/mln/draw/dashed_line.hh @@ -35,7 +35,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/site_set/p_line2d.hh> # include <mln/core/image/imorph/safe.hh> -# include <mln/data/paste.hh> +# include <mln/data/fill.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> diff --git a/milena/mln/fun/n2v/white_gaussian.hh b/milena/mln/fun/n2v/white_gaussian.hh index 53afbf6..55d6cc1 100644 --- a/milena/mln/fun/n2v/white_gaussian.hh +++ b/milena/mln/fun/n2v/white_gaussian.hh @@ -34,7 +34,7 @@ # include <ctime> # include <mln/core/concept/function.hh> - +# include <mln/math/sqrt.hh> namespace mln @@ -86,7 +86,7 @@ namespace mln } X = X - 25.f; /* set mean to 0 */ - X = X * sqrt(12 / 50.f); /* adjust variance to 1 */ + X = X * math::sqrt(12 / 50.f); /* adjust variance to 1 */ return sigma * X; }; diff --git a/milena/mln/fun/v2v/rgb_to_int_u.hh b/milena/mln/fun/v2v/rgb_to_int_u.hh index d04dbf0..1be1ae2 100644 --- a/milena/mln/fun/v2v/rgb_to_int_u.hh +++ b/milena/mln/fun/v2v/rgb_to_int_u.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. // @@ -27,6 +28,10 @@ #ifndef MLN_FUN_V2V_RGB_TO_INT_U_HH # define MLN_FUN_V2V_RGB_TO_INT_U_HH +# include <mln/core/concept/function.hh> +# include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> + namespace mln { diff --git a/milena/mln/io/dump/get_header.hh b/milena/mln/io/dump/get_header.hh index 2cfb4cb..2eaffdd 100644 --- a/milena/mln/io/dump/get_header.hh +++ b/milena/mln/io/dump/get_header.hh @@ -38,6 +38,7 @@ # include <mln/core/box_runstart_piter.hh> # include <mln/core/pixel.hh> # include <mln/data/memcpy_.hh> +# include <mln/util/array.hh> namespace mln { diff --git a/milena/mln/io/raw/get_header.hh b/milena/mln/io/raw/get_header.hh index c263cff..b969b2c 100644 --- a/milena/mln/io/raw/get_header.hh +++ b/milena/mln/io/raw/get_header.hh @@ -38,6 +38,7 @@ # include <mln/core/box_runstart_piter.hh> # include <mln/core/pixel.hh> # include <mln/data/memcpy_.hh> +# include <mln/util/array.hh> namespace mln { diff --git a/milena/tests/topo/skeleton/crest.cc b/milena/tests/topo/skeleton/crest.cc index 894894f..993854e 100644 --- a/milena/tests/topo/skeleton/crest.cc +++ b/milena/tests/topo/skeleton/crest.cc @@ -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. // @@ -33,17 +34,16 @@ # include <mln/transform/distance_front.hh> # include <mln/value/int_u8.hh> - int main() { using namespace mln; bool ref_dat[][9] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 1, 0, 0, 0 }, - { 0, 0, 0, 0, 1, 1, 0, 1, 0 }, - { 0, 1, 1, 1, 1, 1, 0, 1, 0 }, + { 0, 0, 0, 0, 1, 1, 0, 0, 0 }, + { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, { 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 1, 0, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; bool in_dat[][9] = { { 0, 0, 0, 0, 1, 1, 1, 0, 0 }, diff --git a/milena/tests/unit_test/cond_tests_qt b/milena/tests/unit_test/cond_tests_qt new file mode 100644 index 0000000..8783d35 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_qt @@ -0,0 +1,2 @@ +mln/convert/to_qimage.hh +mln/convert/to_qimage_nocopy.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index bc0b6df..31dddae 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -53,6 +53,20 @@ mln_io_magick_save_SOURCES = mln_io_magick_save.cc endif HAVE_MAGICKXX # Starting a conditional unit test list. +if HAVE_QT +check_PROGRAMS += \ +mln_convert_to_qimage \ +mln_convert_to_qimage_nocopy + +mln_convert_to_qimage_CPPFLAGS= ${QT_CPPFLAGS} ${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_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc +endif HAVE_QT + +# Starting a conditional unit test list. if HAVE_TIFF check_PROGRAMS += \ mln_io_tiff_all \ @@ -223,8 +237,6 @@ mln_convert_to_fun \ mln_convert_to_image \ mln_convert_to_p_array \ mln_convert_to_p_set \ -mln_convert_to_qimage \ -mln_convert_to_qimage_nocopy \ mln_convert_to_upper_window \ mln_convert_to_window \ mln_core_a_point_of \ @@ -1545,8 +1557,6 @@ mln_convert_to_fun_SOURCES = mln_convert_to_fun.cc mln_convert_to_image_SOURCES = mln_convert_to_image.cc mln_convert_to_p_array_SOURCES = mln_convert_to_p_array.cc mln_convert_to_p_set_SOURCES = mln_convert_to_p_set.cc -mln_convert_to_qimage_SOURCES = mln_convert_to_qimage.cc -mln_convert_to_qimage_nocopy_SOURCES = mln_convert_to_qimage_nocopy.cc mln_convert_to_upper_window_SOURCES = mln_convert_to_upper_window.cc mln_convert_to_window_SOURCES = mln_convert_to_window.cc mln_core_a_point_of_SOURCES = mln_core_a_point_of.cc -- 1.5.6.5

1 0

last-svn-commit-460-g4d1677c Add missing traces.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* mln/convert/to_qimage.hh, * mln/convert/to_qimage_nocopy.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/convert/to_qimage.hh | 3 +++ milena/mln/convert/to_qimage_nocopy.hh | 4 +++- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4b07835..b149b2b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing traces. + + * mln/convert/to_qimage.hh, + * mln/convert/to_qimage_nocopy.hh: Here. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh index c87771e..b5b22ae 100644 --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -279,11 +279,14 @@ namespace mln inline QImage to_qimage(const Image<I>& ima_) { + trace::entering("convert::to_qimage"); + const I& ima = exact(ima_); mln_precondition(ima.is_valid()); QImage output = internal::to_qimage_dispatch(ima); + trace::exiting("convert::to_qimage"); return output; } diff --git a/milena/mln/convert/to_qimage_nocopy.hh b/milena/mln/convert/to_qimage_nocopy.hh index fbae2f6..91a96ad 100644 --- a/milena/mln/convert/to_qimage_nocopy.hh +++ b/milena/mln/convert/to_qimage_nocopy.hh @@ -27,7 +27,6 @@ /// /// Convert a Milena image to a Qimage. - #ifndef MLN_CONVERT_TO_QIMAGE_NOCOPY_HH # define MLN_CONVERT_TO_QIMAGE_NOCOPY_HH @@ -162,11 +161,14 @@ namespace mln inline QImage to_qimage_nocopy(const Image<I>& ima_) { + trace::entering("convert::to_qimage_nocopy"); + const I& ima = exact(ima_); mln_precondition(ima.is_valid()); QImage output = internal::to_qimage_nocopy_dispatch(ima); + trace::exiting("convert::to_qimage_nocopy"); return output; } -- 1.5.6.5

1 0

last-svn-commit-459-g951bfdd build-aux/build_unit_test.sh: Add more comments.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aaf78d..b985ffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * build-aux/build_unit_test.sh: Add more comments. + 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> Handle libgdcmCommon's dependencies. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 15310ff..65ba103 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -33,8 +33,13 @@ ## "cond_tests_*" files must be created in the directory where ## unit-test.mk is generated (usually the unit-tests directory). ## -## WARNING: don't forget to add "cond_tests_*" files in the COND_TESTS +## WARNINGS: +## --------- +## * 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! +## ## FIXME: Don't use `echo -n', as echo's options are not portable. ## -- 1.5.6.5

1 0

last-svn-commit-458-gca40829 Handle libgdcmCommon's dependencies.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* configure.ac: Pass more libraries to OLN_WITH_LIB when searching for libgdcmCommon. --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca2698f..8aaf78d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle libgdcmCommon's dependencies. + + * configure.ac: Pass more libraries to OLN_WITH_LIB when searching + for libgdcmCommon. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Display a summary of the configuration when the build directory is ready. diff --git a/configure.ac b/configure.ac index 594856f..916221b 100644 --- a/configure.ac +++ b/configure.ac @@ -273,7 +273,7 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([* libgdcm]) AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], - [-lgdcmzlib]) + [-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]) ## ---------- ## ## Tesseract. ## -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-457-g00d8fa3
by lazzara＠lrde.epita.fr 11 Aug '10

11 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 00d8fa3b631df334782cc755a0a1bbc3af1e8d35 (commit) via 6ca68abdb08224a001fbdd838a6bbffb58b902ba (commit) via a9958fa777ee5686c5a923311aab1caa793ab89a (commit) via be773a94ff966b4008cb3ce086bdaa3a679cf8a5 (commit) from 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (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 ----------------------------------------------------------------- 00d8fa3 configure.ac: Display a summary of the configuration when the build directory is ready. 6ca68ab configure.ac: Set oln_with_* variables correctly a9958fa headers.mk: Regen. be773a9 Regen headers.mk and unit-tests.mk in Scribo. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++ configure.ac | 95 ++++++++++++++++++++++++++++++++-- milena/ChangeLog | 4 ++ milena/headers.mk | 25 +++++++++ scribo/ChangeLog | 7 +++ scribo/headers.mk | 4 -- scribo/tests/unit_test/unit-tests.mk | 2 +- 7 files changed, 136 insertions(+), 10 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-457-g00d8fa3 configure.ac: Display a summary of the configuration when the build directory is ready.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 5 +++ configure.ac | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8a1e37..ca2698f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Display a summary of the configuration when the + build directory is ready. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Set oln_with_* variables correctly. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 9c9e263..594856f 100644 --- a/configure.ac +++ b/configure.ac @@ -655,5 +655,87 @@ if test -z "$TOOLS_CXXFLAGS"; then fi fi - +AC_MSG_RESULT([-------------------------------------------------------------]) +AC_MSG_RESULT([Update Olena configuration]) AC_OUTPUT + + + +AC_MSG_RESULT([ +Olena is configured as follows. Please verify that this configuration +matches your expectations. + +Host system type: $host +Build system type: $build + +================ +| Dependencies | +================ + + + Option Value +------------------------------------------------------------------------------- +CFITSIO --with-cfitsio[=DIR] $oln_have_cfitsio +GDCM --with-gdcm[=DIR] $oln_have_gdcm +Magick++ --with-magickxx $oln_have_magickxx +Qt --with-qt $oln_have_qt +Tesseract --with-tesseract[=DIR] $oln_have_tesseract +TIFF --with-tiff[=DIR] $oln_have_tiff +Trimesh --enable-trimesh $enable_trimesh +------------------------------------------------------------------------------- + + + + +=========== +| Modules | +=========== + + + Option Value +------------------------------------------------------------------------------- +Scribo --enable-scribo $enable_scribo +Swilena --enable-swilena $enable_swilena +------------------------------------------------------------------------------- + + + + +============= +| Utilities | +============= + + + Option Value +------------------------------------------------------------------------------- +Apps --enable-apps $enable_apps +Tools --enable-tools $enable_tools +------------------------------------------------------------------------------- + + + +Options used to compile and link: + PREFIX = $PREFIX_DIR + EXEC-PREFIX = $EXEC_PREFIX_DIR + VERSION = $PACKAGE_VERSION + CC = $CC + CFLAGS = $CFLAGS + CPPFLAGS = $MAGICK_CPPFLAGS + DEFS = $DEFS + LDFLAGS = $LDFLAGS + LIBS = $MAGICK_LIBS + CXX = $CXX + CXXFLAGS = $CXXFLAGS + PKG_CONFIG = $PKG_CONFIG + QT_PATH = $QT_PATH + QMAKE = $QMAKE + MOC = $MOC + UIC = $UIC + RCC = $RCC + MAGICKXX_CFLAGS = $MAGICKXX_CFLAGS + MAGICKXX_LIBS = $MAGICKXX_LIBS + SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS + APPS_CXXFLAGS = $APPS_CXXFLAGS + TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS + +]) -- 1.5.6.5

1 0