October 2010 - Olena-patches

branch exp/next-build-ok updated: last-svn-commit-497-ge102484
by lazzara＠lrde.epita.fr 21 Oct '10

21 Oct '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-build-ok has been updated via e102484ec1067be75dd6589397b5582a103f38e4 (commit) via 9c95965d51707c380726c4e04e7f5d583298a412 (commit) via 87288fed8c7c58240b9da5a6b6838b97fbc40f8e (commit) via b44674d0134c582ab347d94f0cdf0489eca2c00b (commit) via b63755a60df439aecf78e36d4a8d702ef620abc3 (commit) via a913e1f860971df1a7b804daca3d190bfcefc729 (commit) from 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (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 ----------------------------------------------------------------- e102484 Make use of value::next in Milena. 9c95965 Small fixes in Scribo 87288fe Fix issues with object_links and ignored components. b44674d scribo/core/component_set.hh: Fix component_set id type. b63755a Make use of value::next routine in Scribo. a913e1f Add value::next routine. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++++ milena/mln/accu/label_used.hh | 3 +- milena/mln/core/internal/labeled_image_base.hh | 6 +- milena/mln/labeling/colorize.hh | 7 +- milena/mln/labeling/compute.hh | 23 +++--- milena/mln/labeling/relabel.hh | 6 +- milena/mln/labeling/superpose.hh | 14 ++- milena/mln/make/relabelfun.hh | 9 +- milena/mln/set/compute_with_weights.hh | 6 +- milena/mln/value/{cast.hh => next.hh} | 92 +++++++++++++------- scribo/ChangeLog | 44 +++++++++ scribo/scribo/core/component_set.hh | 18 +++-- scribo/scribo/core/line_set.hh | 2 +- scribo/scribo/core/object_links.hh | 4 +- scribo/scribo/debug/highlight_text_area.hh | 2 +- scribo/scribo/filter/object_groups_with_holes.hh | 5 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 2 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 7 +- .../filter/object_links_non_aligned_simple.hh | 9 +- scribo/scribo/filter/objects_with_holes.hh | 11 +-- scribo/scribo/postprocessing/fill_object_holes.hh | 6 +- scribo/scribo/primitive/link/compute.hh | 5 +- .../link/internal/link_single_dmax_base.hh | 14 --- scribo/scribo/primitive/link/merge_double_link.hh | 5 +- .../link/with_single_left_link_dmax_ratio.hh | 2 +- scribo/scribo/table/internal/align_lines.hh | 2 +- scribo/scribo/text/merging.hh | 38 ++++---- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 6 +- 28 files changed, 230 insertions(+), 138 deletions(-) copy milena/mln/value/{cast.hh => next.hh} (59%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-511-g1085d06 Fix 3D rotations.
by Roland Levillain 21 Oct '10

21 Oct '10

* mln/fun/x2x/rotation.hh (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<3,C>&)): Fix the definition of the (2,1) coefficient. --- milena/ChangeLog | 8 ++++++++ milena/mln/fun/x2x/rotation.hh | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0a495d7..64b4f97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix 3D rotations. + + * mln/fun/x2x/rotation.hh + (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<3,C>&)): + Fix the definition of the (2,1) coefficient. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with Boost-related changes in configure.ac. * tests/accu/Makefile.am: Remove uses of the old diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index 2e0ee15..ac30ce3 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -101,7 +102,7 @@ namespace mln m_(1,3) = 0; m_(2,0) = u * w * (1 - cos_a) - v * sin_a; - m_(2,1) = u * w * (1 - cos_a) + u * sin_a; + m_(2,1) = v * w * (1 - cos_a) + u * sin_a; m_(2,2) = w2 + (1 - w2) * cos_a; m_(2,3) = 0; -- 1.5.6.5

1 0

last-svn-commit-497-ge102484 Make use of value::next in Milena.
by Guillaume Lazzara 21 Oct '10

21 Oct '10

* mln/accu/label_used.hh, * mln/core/internal/labeled_image_base.hh, * mln/labeling/colorize.hh, * mln/labeling/compute.hh, * mln/labeling/superpose.hh, * mln/make/relabelfun.hh, * mln/set/compute_with_weights.hh: Make use of value::next. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/accu/label_used.hh | 3 ++- milena/mln/core/internal/labeled_image_base.hh | 6 ++++-- milena/mln/labeling/colorize.hh | 7 ++++--- milena/mln/labeling/compute.hh | 23 ++++++++++++----------- milena/mln/labeling/relabel.hh | 6 ++---- milena/mln/labeling/superpose.hh | 14 +++++++++----- milena/mln/make/relabelfun.hh | 9 +++++---- milena/mln/set/compute_with_weights.hh | 6 ++++-- 9 files changed, 54 insertions(+), 32 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a5da997..5feeb2c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of value::next in Milena. + + * mln/accu/label_used.hh, + * mln/core/internal/labeled_image_base.hh, + * mln/labeling/colorize.hh, + * mln/labeling/compute.hh, + * mln/labeling/superpose.hh, + * mln/make/relabelfun.hh, + * mln/set/compute_with_weights.hh: Make use of value::next. + +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Add value::next routine. * mln/value/label.hh: Include next routine. diff --git a/milena/mln/accu/label_used.hh b/milena/mln/accu/label_used.hh index d6d2b20..69121b1 100644 --- a/milena/mln/accu/label_used.hh +++ b/milena/mln/accu/label_used.hh @@ -34,6 +34,7 @@ # include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> # include <mln/math/max.hh> +# include <mln/value/next.hh> # include <mln/fun/i2v/array.hh> @@ -117,7 +118,7 @@ namespace mln label_used<L>::take(const argument& l) { if (label_used_.size() <= l) - label_used_.resize(unsigned(l) + 1, false); + label_used_.resize(value::next(l), false); label_used_(l) = true; } diff --git a/milena/mln/core/internal/labeled_image_base.hh b/milena/mln/core/internal/labeled_image_base.hh index 86bb077..45f3ed2 100644 --- a/milena/mln/core/internal/labeled_image_base.hh +++ b/milena/mln/core/internal/labeled_image_base.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. // @@ -40,6 +41,7 @@ # include <mln/labeling/relabel.hh> # include <mln/util/array.hh> +# include <mln/value/next.hh> # include <mln/pw/cst.hh> # include <mln/pw/value.hh> @@ -279,7 +281,7 @@ namespace mln labeled_image_base<I,E>::update_data(const fun::i2v::array<mln_value(I)>& relabel_fun) { util::array<accu::shape::bbox<mln_psite(I)> > - new_bboxes(static_cast<unsigned>(this->data_->nlabels_) + 1); + new_bboxes(mln::value::next(this->data_->nlabels_)); exact(this)->init_update_data_(); diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index 78a06f4..673af27 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -1,5 +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. // @@ -40,6 +40,7 @@ # include <mln/accu/stat/max.hh> # include <mln/util/array.hh> # include <mln/util/set.hh> +# include <mln/value/next.hh> namespace mln @@ -192,7 +193,7 @@ namespace mln // mlc_is_a(mln_value(L), mln::value::Symbolic)::check(); (void) value; - unsigned label_count = static_cast<unsigned>(nlabels) + 1; + unsigned label_count = value::next(nlabels); static fun::i2v::array<V> f(0); int diff_size = f.size() - label_count; if (diff_size < 0) diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 56cb92a..5e5c5f0 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -51,6 +51,7 @@ # include <mln/util/array.hh> # include <mln/convert/from_to.hh> # include <mln/geom/ncols.hh> +# include <mln/value/next.hh> namespace mln @@ -210,7 +211,7 @@ namespace mln const A& a = exact(a_); const L& label = exact(label_); - util::array<A> accus(static_cast<unsigned>(nlabels) + 1, a); + util::array<A> accus(value::next(nlabels), a); mln_piter(L) p(label.domain()); for_all(p) @@ -244,12 +245,12 @@ namespace mln trace::entering("labeling::impl::generic::compute"); internal::compute_tests(A(), label_, nlabels); - if (static_cast<unsigned>(nlabels) + 1 != accus.size()) + if (value::next(nlabels) != accus.size()) { accus.resize(0); // Make sure all the accumulators are // re-initialized when resizing on next // line. - accus.resize(static_cast<unsigned>(nlabels) + 1); + accus.resize(value::next(nlabels)); } const L& label = exact(label_); @@ -291,7 +292,7 @@ namespace mln const I& input = exact(input_); const L& label = exact(label_); - util::array<A> accus(static_cast<unsigned>(nlabels) + 1, a); + util::array<A> accus(value::next(nlabels), a); mln_piter(I) p(input.domain()); for_all(p) @@ -330,12 +331,12 @@ namespace mln const L& label = exact(label_); (void) nlabels; - if (static_cast<unsigned>(nlabels) + 1 != accus.size()) + if (value::next(nlabels) != accus.size()) { accus.resize(0); // Make sure all the accumulators are // re-initialized when resizing on next // line. - accus.resize(static_cast<unsigned>(nlabels) + 1); + accus.resize(value::next(nlabels)); } mln_piter(I) p(input.domain()); @@ -383,7 +384,7 @@ namespace mln // FIXME: check image properties + add doc. - util::array<A> accus(static_cast<unsigned>(nlabels) + 1, a); + util::array<A> accus(value::next(nlabels), a); unsigned ncols = geom::ncols(label); @@ -438,12 +439,12 @@ namespace mln const L& label = exact(label_); (void) nlabels; - if (static_cast<unsigned>(nlabels) + 1 != accus.size()) + if (value::next(nlabels) != accus.size()) { accus.resize(0); // Make sure all the accumulators are // re-initialized when resizing on next // line. - accus.resize(static_cast<unsigned>(nlabels) + 1); + accus.resize(value::next(nlabels)); } unsigned ncols = geom::ncols(label); @@ -742,7 +743,7 @@ namespace mln typedef util::array<mln_result(A)> R; R res = internal::compute_dispatch(accus, label, nlabels); - mln_postcondition(res.nelements() == static_cast<unsigned>(nlabels) + 1); + mln_postcondition(res.nelements() == value::next(nlabels)); trace::exiting("labeling::compute"); return res; @@ -764,7 +765,7 @@ namespace mln typedef util::array<mln_result(A)> R; R res = internal::compute_dispatch(a, label, nlabels); - mln_postcondition(res.nelements() == static_cast<unsigned>(nlabels) + 1); + mln_postcondition(res.nelements() == value::next(nlabels)); trace::exiting("labeling::compute"); return res; diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index c3a473f..91db122 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -39,8 +39,6 @@ # include <mln/data/transform.hh> # include <mln/data/transform_inplace.hh> -# include <mln/value/label.hh> - namespace mln diff --git a/milena/mln/labeling/superpose.hh b/milena/mln/labeling/superpose.hh index 7d0b3e3..1df647c 100644 --- a/milena/mln/labeling/superpose.hh +++ b/milena/mln/labeling/superpose.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. // @@ -37,6 +38,9 @@ # include <mln/data/paste.hh> # include <mln/pw/all.hh> +# include <mln/value/next.hh> +# include <mln/value/equiv.hh> + namespace mln { @@ -94,18 +98,18 @@ namespace mln mln_concrete(I) output = duplicate(lhs); util::array<mln_value(J)> - rebase_lbl(static_cast<unsigned>(rhs_nlabels) + 1); + rebase_lbl(value::next(rhs_nlabels)); rebase_lbl(0) = 0; for (unsigned i = 1; i <= rhs_nlabels; ++i) - rebase_lbl(i) = i + static_cast<unsigned>(lhs_nlabels); + rebase_lbl(i) = i + value::equiv(lhs_nlabels); data::paste(labeling::relabel(rhs, rhs_nlabels, rebase_lbl) | (pw::value(rhs) != pw::cst(literal::zero)), output); - new_nlabels = static_cast<unsigned>(lhs_nlabels) - + static_cast<unsigned>(rhs_nlabels) + 1; + new_nlabels = value::equiv(lhs_nlabels) + + value::equiv(rhs_nlabels) + 1; trace::exiting("mln::labeling::superpose"); return output; diff --git a/milena/mln/make/relabelfun.hh b/milena/mln/make/relabelfun.hh index 0a841f2..bc423fb 100644 --- a/milena/mln/make/relabelfun.hh +++ b/milena/mln/make/relabelfun.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. // @@ -32,7 +33,7 @@ # include <mln/core/concept/function.hh> # include <mln/fun/i2v/array.hh> -# include <mln/value/label.hh> +# include <mln/value/next.hh> namespace mln { @@ -87,7 +88,7 @@ namespace mln const F& fv2b = exact(fv2b_); - unsigned nlabels_i = static_cast<unsigned>(nlabels) + 1; + unsigned nlabels_i = value::next(nlabels); V tmp_nlabels = literal::zero; fun::i2v::array<V> fi2v(nlabels_i, literal::zero); for (V i = 1; i < nlabels_i; ++i) @@ -110,7 +111,7 @@ namespace mln const F& fv2v = exact(fv2v_); - unsigned nlabels_i = static_cast<unsigned>(nlabels) + 1; + unsigned nlabels_i = value::next(nlabels); util::array<V> new_labels(nlabels_i, mln_max(V)); new_labels(0) = literal::zero; diff --git a/milena/mln/set/compute_with_weights.hh b/milena/mln/set/compute_with_weights.hh index b2ae04d..24da256 100644 --- a/milena/mln/set/compute_with_weights.hh +++ b/milena/mln/set/compute_with_weights.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. // @@ -37,6 +38,7 @@ # include <mln/core/concept/site_set.hh> # include <mln/util/array.hh> # include <mln/convert/from_to.hh> +# include <mln/value/next.hh> namespace mln @@ -187,7 +189,7 @@ namespace mln internal::compute_with_weights_tests(a, w, label); - util::array<A> accus(static_cast<unsigned>(nlabels) + 1, a); + util::array<A> accus(value::next(nlabels), a); mln_piter(I) p(w.domain()); for_all(p) -- 1.5.6.5

1 0

last-svn-commit-496-g9c95965 Small fixes in Scribo
by Guillaume Lazzara 21 Oct '10

21 Oct '10

* scribo/primitive/link/compute.hh: Update doc. * scribo/primitive/link/internal/link_single_dmax_base.hh (start_point_): Remove useless overload. * scribo/primitive/link/with_single_left_link_dmax_ratio.hh: Remove useless template parameter. * scribo/text/merging.hh: Disable debug. * scribo/toolchain/nepomuk/text_extraction.hh: Enable denoising and reduce Sauvola's window size. --- scribo/ChangeLog | 17 +++++++++ scribo/scribo/primitive/link/compute.hh | 5 ++- .../link/internal/link_single_dmax_base.hh | 14 ------- .../link/with_single_left_link_dmax_ratio.hh | 2 +- scribo/scribo/text/merging.hh | 38 ++++++++++---------- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 6 ++-- 6 files changed, 43 insertions(+), 39 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9493a12..1f9fc04 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in Scribo + + * scribo/primitive/link/compute.hh: Update doc. + + * scribo/primitive/link/internal/link_single_dmax_base.hh + (start_point_): Remove useless overload. + + * scribo/primitive/link/with_single_left_link_dmax_ratio.hh: + Remove useless template parameter. + + * scribo/text/merging.hh: Disable debug. + + * scribo/toolchain/nepomuk/text_extraction.hh: Enable denoising + and reduce Sauvola's window size. + +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix issues with object_links and ignored components. * scribo/filter/object_links_bbox_overlap.hh, diff --git a/scribo/scribo/primitive/link/compute.hh b/scribo/scribo/primitive/link/compute.hh index 3782a50..114971f 100644 --- a/scribo/scribo/primitive/link/compute.hh +++ b/scribo/scribo/primitive/link/compute.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. // @@ -83,7 +84,7 @@ namespace scribo compute(Link_Functor<F>& functor, anchor::Type anchor); /// \overload - /// The default anchor is set to 0, the mass center. + /// The default anchor is set to anchor::MassCenter. template <typename F> object_links<scribo_support(F)> compute(Link_Functor<F>& functor); diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh index 6897bd6..aca3e67 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh @@ -83,9 +83,6 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, const P& start_point, const P& p) const; - mln_site(L) start_point_(unsigned current_object, - anchor::Type anchor); - void start_processing_object_(unsigned current_object); private: @@ -130,17 +127,6 @@ namespace scribo template <typename L, typename E> inline - mln_site(L) - link_single_dmax_base<L, E>::start_point_(unsigned current_object, - anchor::Type anchor) - { - return internal::compute_anchor(this->components_, - current_object, anchor); - } - - - template <typename L, typename E> - inline void link_single_dmax_base<L, E>::start_processing_object_( unsigned current_object) diff --git a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh index dc99728..b9a5217 100644 --- a/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh +++ b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh @@ -174,7 +174,7 @@ namespace scribo } - template <typename L, typename F> + template <typename L> inline object_links<L> with_single_left_link_dmax_ratio(const component_set<L>& components, diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 36d41c2..ed48e57 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -778,14 +778,14 @@ namespace scribo } - std::cout - << " new txtline = " << count_new_txtline << std::endl - << " comp IN txtline = " << count_comp_IN_txtline << std::endl - << " 2 lines merge = " << count_two_lines_merge << std::endl - << " comp HITS txtline = " << count_comp_HITS_txtline << std::endl - << " txtline IN junk = " << count_txtline_IN_junk << std::endl - << " txtline IN txtline = " << count_txtline_IN_txtline << std::endl - << " WTF! = " << count_WTF << std::endl; +// std::cout +// << " new txtline = " << count_new_txtline << std::endl +// << " comp IN txtline = " << count_comp_IN_txtline << std::endl +// << " 2 lines merge = " << count_two_lines_merge << std::endl +// << " comp HITS txtline = " << count_comp_HITS_txtline << std::endl +// << " txtline IN junk = " << count_txtline_IN_junk << std::endl +// << " txtline IN txtline = " << count_txtline_IN_txtline << std::endl +// << " WTF! = " << count_WTF << std::endl; (void) ith_pass; @@ -854,7 +854,7 @@ namespace scribo // Sort lines by bbox.nelements() and ids. std::sort(v.begin(), v.end(), func); - mln::util::timer t; +// mln::util::timer t; // Setting lines as text lines according to specific criterions. @@ -864,10 +864,10 @@ namespace scribo // First pass - t.start(); +// t.start(); one_merge_pass(1, input_domain, v, lines, parent); - float ts = t.stop(); - std::cout << "time " << ts << std::endl; +// float ts = t.stop(); +// std::cout << "time " << ts << std::endl; // lines.force_stats_update(); @@ -878,10 +878,10 @@ namespace scribo // Second pass - t.start(); +// t.start(); one_merge_pass(2, input_domain, v, lines, parent); // <- last pass - ts = t.stop(); - std::cout << "time " << ts << std::endl; +// ts = t.stop(); +// std::cout << "time " << ts << std::endl; lines.force_stats_update(); @@ -901,14 +901,14 @@ namespace scribo { using namespace mln; - mln::util::timer t; - t.start(); +// mln::util::timer t; +// t.start(); scribo::line_set<L> output = internal::draw_boxes(lines.components().labeled_image().domain(), lines); - float ts = t.stop(); - std::cout << ts << std::endl; +// float ts = t.stop(); +// std::cout << ts << std::endl; return output; } diff --git a/scribo/scribo/toolchain/nepomuk/text_extraction.hh b/scribo/scribo/toolchain/nepomuk/text_extraction.hh index b3136be..e16cd56 100644 --- a/scribo/scribo/toolchain/nepomuk/text_extraction.hh +++ b/scribo/scribo/toolchain/nepomuk/text_extraction.hh @@ -104,7 +104,7 @@ namespace scribo input_gl = preprocessing::deskew(input_gl); // Binarize foreground to use it in the processing chain. - input_bin = scribo::binarization::sauvola_ms(input_gl, 101, 3); + input_bin = scribo::binarization::sauvola_ms(input_gl, 51, 3); } @@ -114,13 +114,13 @@ namespace scribo // Process { // Run document toolchain. - lines_bg = scribo::toolchain::text_in_doc(input_bin, false, false); + lines_bg = scribo::toolchain::text_in_doc(input_bin, true, false); // Negate document. logical::not_inplace(input_bin); // Run document toolchain. - lines_fg = scribo::toolchain::text_in_doc(input_bin, false, false); + lines_fg = scribo::toolchain::text_in_doc(input_bin, true, false); } -- 1.5.6.5

1 0

last-svn-commit-495-g87288fe Fix issues with object_links and ignored components.
by Guillaume Lazzara 21 Oct '10

21 Oct '10

* scribo/filter/object_links_bbox_overlap.hh, * scribo/filter/object_links_bbox_ratio.hh, * scribo/filter/object_links_non_aligned_simple.hh, * scribo/primitive/link/merge_double_link.hh: Ignore invalid links. --- scribo/ChangeLog | 9 +++++++++ scribo/scribo/filter/object_links_bbox_overlap.hh | 2 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 7 ++++--- .../filter/object_links_non_aligned_simple.hh | 9 +++++---- scribo/scribo/primitive/link/merge_double_link.hh | 5 +++-- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f6c6a4b..9493a12 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix issues with object_links and ignored components. + + * scribo/filter/object_links_bbox_overlap.hh, + * scribo/filter/object_links_bbox_ratio.hh, + * scribo/filter/object_links_non_aligned_simple.hh, + * scribo/primitive/link/merge_double_link.hh: Ignore invalid links. + +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/component_set.hh: Fix component_set id type. 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/filter/object_links_bbox_overlap.hh b/scribo/scribo/filter/object_links_bbox_overlap.hh index ffcbb6c..995ad68 100644 --- a/scribo/scribo/filter/object_links_bbox_overlap.hh +++ b/scribo/scribo/filter/object_links_bbox_overlap.hh @@ -81,7 +81,7 @@ namespace scribo object_links<L> output(links); for_all_comps(i, components) - if (components(i).is_valid() && links(i) != i) + if (components(i).is_valid() && links(i) && links(i) != i) { bool has_intersection = true; mln_site(L) pmin, pmax; diff --git a/scribo/scribo/filter/object_links_bbox_ratio.hh b/scribo/scribo/filter/object_links_bbox_ratio.hh index e5d41c6..5318b57 100644 --- a/scribo/scribo/filter/object_links_bbox_ratio.hh +++ b/scribo/scribo/filter/object_links_bbox_ratio.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. // @@ -79,8 +80,8 @@ namespace scribo const component_set<L>& components = links.components(); object_links<L> output = links.duplicate(); - for (unsigned i = 1; i < links.nelements(); ++i) - if (links(i) != i) + for_all_links(i, links) + if (links(i) && links(i) != i) { float lmin = components(i).bbox().pmax()[dim] diff --git a/scribo/scribo/filter/object_links_non_aligned_simple.hh b/scribo/scribo/filter/object_links_non_aligned_simple.hh index 1f56d85..2381d88 100644 --- a/scribo/scribo/filter/object_links_non_aligned_simple.hh +++ b/scribo/scribo/filter/object_links_non_aligned_simple.hh @@ -109,10 +109,11 @@ namespace scribo float max_alpha_rad = (max_alpha / 180.0f) * math::pi; for_all_comps(i, comps) - if (!::scribo::filter::internal::component_aligned_rad(comps, i, links(i), - anchor, - max_alpha_rad)) - output(i) = i; + if (comps(i).is_valid() && links(i)) + if (!::scribo::filter::internal::component_aligned_rad(comps, i, links(i), + anchor, + max_alpha_rad)) + output(i) = i; trace::exiting("scribo::filter::object_links_non_aligned_simple"); diff --git a/scribo/scribo/primitive/link/merge_double_link.hh b/scribo/scribo/primitive/link/merge_double_link.hh index 94a44ef..e58c1ab 100644 --- a/scribo/scribo/primitive/link/merge_double_link.hh +++ b/scribo/scribo/primitive/link/merge_double_link.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. // @@ -92,7 +93,7 @@ namespace scribo const component_set<L>& components = left_link.components(); - object_links<L> merge(left_link); + object_links<L> merge = left_link.duplicate(); for_all_ncomponents(i, components.nelements()) { -- 1.5.6.5

1 0

last-svn-commit-510-g891e728 Factor the implementations of OLN_WITH_LIB and OLN_WITH_LIB_PKG_CONFIG.
by Roland Levillain 21 Oct '10

21 Oct '10

* m4/oln-with-lib.m4 (_OLN_WITH_LIB_SHARED_IMPL): New macro. Use it to factor... (_OLN_WITH_LIB, _OLN_WITH_LIB_PKG_CONFIG): ...these. --- ChangeLog | 8 +++++ m4/oln-with-lib.m4 | 78 +++++++++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95a2581..89ba9f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Factor the implementations of OLN_WITH_LIB and OLN_WITH_LIB_PKG_CONFIG. + + * m4/oln-with-lib.m4 (_OLN_WITH_LIB_SHARED_IMPL): New macro. + Use it to factor... + (_OLN_WITH_LIB, _OLN_WITH_LIB_PKG_CONFIG): ...these. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Aesthetic changes. 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 01530b9..b18b773 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -75,27 +75,7 @@ AC_DEFUN([_OLN_WITH_LIB], $5_CPPFLAGS='' $5_LDFLAGS='' if test "x$with_$4" != xno; then - if test -n "$with_$4"; then - $5_CPPFLAGS="-I${with_$4}/include" - $5_LDFLAGS="-L${with_$4}/lib" - fi - oln_save_CPPFLAGS=$CPPFLAGS - oln_save_LDFLAGS=$LDFLAGS - CPPFLAGS="$$5_CPPFLAGS $CPPFLAGS" - LDFLAGS="$$5_LDFLAGS $LDFLAGS" - oln_have_$4=no - AC_CHECK_HEADER([$2], - [AC_CHECK_LIB([$3], - [main], - [oln_have_$4=yes - $5_LDFLAGS="$$5_LDFLAGS -l$3 $6" - AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1])], - [], [$6] - )] - ) - CPPFLAGS=$oln_save_CPPFLAGS - LDFLAGS=$oln_save_LDFLAGS - TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS" + _OLN_WITH_LIB_SHARED_IMPL([$1], [$2], [$3], [$4], [$5], [$6]) fi AC_SUBST([$5_CPPFLAGS]) AC_SUBST([$5_LDFLAGS]) @@ -104,10 +84,6 @@ AC_DEFUN([_OLN_WITH_LIB], ])# _OLN_WITH_LIB - -# FIXME: Factor the following macros with the previous ones. - - # OLN_WITH_LIB_PKG_CONFIG(PACKAGE, HEADER, LIBRARY, [SHELL_NAME], [CPP_NAME], # [OTHER-LIBRARIES], [MODULE]) # --------------------------------------------------------------------------- @@ -165,27 +141,7 @@ AC_DEFUN([_OLN_WITH_LIB_PKG_CONFIG], else # `pkg-config' is absent, unusable or is unable to find the library; # use our fall-back code. - if test -n "$with_$4"; then - $5_CPPFLAGS="-I${with_$4}/include" - $5_LDFLAGS="-L${with_$4}/lib" - fi - oln_save_CPPFLAGS=$CPPFLAGS - oln_save_LDFLAGS=$LDFLAGS - CPPFLAGS="$$5_CPPFLAGS $CPPFLAGS" - LDFLAGS="$$5_LDFLAGS $LDFLAGS" - oln_have_$4=no - AC_CHECK_HEADER([$2], - [AC_CHECK_LIB([$3], - [main], - [oln_have_$4=yes - $5_LDFLAGS="$$5_LDFLAGS -l$3 $6" - AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1])], - [], [$6] - )] - ) - CPPFLAGS=$oln_save_CPPFLAGS - LDFLAGS=$oln_save_LDFLAGS - TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS" + _OLN_WITH_LIB_SHARED_IMPL([$1], [$2], [$3], [$4], [$5], [$6]) fi fi AC_SUBST([$5_CPPFLAGS]) @@ -193,3 +149,33 @@ AC_DEFUN([_OLN_WITH_LIB_PKG_CONFIG], AM_CONDITIONAL([HAVE_$5], [test x$oln_have_$4 = xyes]) AC_LANG_POP([C++]) ])# _OLN_WITH_LIB_PKG_CONFIG + + +# _OLN_WITH_LIB_SHARED_IMPL(PACKAGE, HEADER, LIBRARY, SHELL_NAME, CPP_NAME, +# OTHER-LIBRARIES) +# -------------------------------------------------------------------------- +# Shared implementation of _OLN_WITH_LIB and _OLN_WITH_LIB_PKG_CONFIG. +AC_DEFUN([_OLN_WITH_LIB_SHARED_IMPL], +[dnl + if test -n "$with_$4"; then + $5_CPPFLAGS="-I${with_$4}/include" + $5_LDFLAGS="-L${with_$4}/lib" + fi + oln_save_CPPFLAGS=$CPPFLAGS + oln_save_LDFLAGS=$LDFLAGS + CPPFLAGS="$$5_CPPFLAGS $CPPFLAGS" + LDFLAGS="$$5_LDFLAGS $LDFLAGS" + oln_have_$4=no + AC_CHECK_HEADER([$2], + [AC_CHECK_LIB([$3], + [main], + [oln_have_$4=yes + $5_LDFLAGS="$$5_LDFLAGS -l$3 $6" + AC_DEFINE([HAVE_$5], 1, [Define to 1 if we can use $1])], + [], [$6] + )] + ) + CPPFLAGS=$oln_save_CPPFLAGS + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $$5_LDFLAGS"]dnl +)# _OLN_WITH_LIB_SHARED_IMPL -- 1.5.6.5

1 0

last-svn-commit-500-g6b37fbf Update HACKING.
by Roland Levillain 21 Oct '10

21 Oct '10

* HACKING (Required Software): Update. (Useful Tools): New section. --- ChangeLog | 7 +++++++ HACKING | 16 +++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bccb41..ca5ca4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Update HACKING. + + * HACKING (Required Software): Update. + (Useful Tools): New section. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Update README. * README: Aesthetic changes. diff --git a/HACKING b/HACKING index de4e4a1..24e2dac 100644 --- a/HACKING +++ b/HACKING @@ -66,7 +66,7 @@ the following extra programs if you want to work on the Olena project. * If you plan to make changes within Swilena, you must have: - - SWIG 1.3.36 + - SWIG 1.3.35 - Python 2.5 @@ -79,16 +79,22 @@ the following extra programs if you want to work on the Olena project. - the `listings' LaTeX package - - the `convert' utility from ImageMagick + - the `convert' utility from ImageMagick (6.3.7) - - TeX4ht, to compile the LaTeX documentation into HTML - - - dvipng (required by TeX4ht) + - HeVeA 1.10 Note that `bootstrap' checks for the presence of most of these tools. +------------ +Useful Tools +------------ + +`rebox.el' is a useful companion to Emacs, creating boxes with comment +delimiters. + + .. Local Variables: .. mode: rst -- 1.5.6.5

1 0

last-svn-commit-499-gffdbc84 Update README.
by Roland Levillain 21 Oct '10

21 Oct '10

* README: Aesthetic changes. (Overview): Fix an URL. (Other libraries): New section. (Bibliography): Add publications of 2010. --- ChangeLog | 9 +++++++++ README | 51 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0cac72..0bccb41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Update README. + + * README: Aesthetic changes. + (Overview): Fix an URL. + (Other libraries): New section. + (Bibliography): Add publications of 2010. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Force headers lookup in specified path. diff --git a/README b/README index cf35e0a..8b99acd 100644 --- a/README +++ b/README @@ -19,9 +19,9 @@ The complete GNU General Public License Notice can also be found in the 'COPYING' file in the root directory. -====================== - Introduction to Olena -====================== +===================== +Introduction to Olena +===================== Olena_, a platform dedicated to image processing. @@ -53,14 +53,14 @@ expertise from the library development. Yet, Olena is an ongoing development project. Few algorithms or definitions may change in a near future. A list of potential changes is maintained here : -https://olena.lrde.epita.fr/FeaturesSubjectToChange. +http://olena.lrde.epita.fr/FeaturesSubjectToChange. Likewise, the documentation does not cover the whole project yet. In the `doc/' directory you will find the first draft of a reference manual. It includes a quick reference guide and a tutorial. This is a good start. In `milena/tools' and `milena/doc/examples' few sample programs are available. Most of them are already used to illustrate -the tutorial. For the rest, we're afraid you will have to dig the +the tutorial. For the rest, we're afraid you will have to dig the code or e-mail us. Please direct any question or comments to <olena(a)lrde.epita.fr>, or @@ -147,7 +147,7 @@ tree. % ../configure The build process can be altered by a number of options you can pass -to the `configure' script. The following sections describe them. +to the `configure' script. The following sections describe them. Additionally, if you are an Olena maintainer (a person who runs `make distcheck'), _prefer setting `CXXFLAGS' as an environment @@ -161,7 +161,7 @@ Installation Path ================= By default, Olena is installed in the standard "local" directory of -your system. This is usually `/usr/local' under Unix. +your system. This is usually `/usr/local' under Unix. You can change this path with the following flag: @@ -172,10 +172,10 @@ Compiler Selection and Compilation Flags ======================================== By default, `configure' will try to use the first C++ compiler it -encounters on your system. If `CXX' is not set, it will look, in order, +encounters on your system. If `CXX' is not set, it will look, in order, for: - - the value of the `CCC' environment variable, + - the value of the `CXX' environment variable, - the GNU C++ compiler (`g++'), @@ -198,7 +198,7 @@ compiler name to `configure', as follows: For some compilers (GNU g++ and Intel's icpc to some extent) , -`configure' will use default CXXFLAGS. You can override the default +`configure' will use default CXXFLAGS. You can override the default C++ flags by giving `configure' your selection of flags: % ../configure CXXFLAGS="<your-favorite-flags>" @@ -235,7 +235,7 @@ To enable the installation of this module use:: Tools ----- -Sample tools are shipped with the tarball. To enable the installation of +Sample tools are shipped with the tarball. To enable the installation of these tools use:: ./configure --enable-tools @@ -277,6 +277,15 @@ needed) at configuration time:: ./configure --with-magickxx=/usr/local/ +Other libraries +--------------- + +The Boost Tuple library is used to implement a tuple accumulator +class. This project is a part of the Boost libraries; you can help +configure find these libraries using the `--with-boost flag': + + ./configure --with-boost=/usr/local/ + -------- Building @@ -336,6 +345,7 @@ from the build directory (if you have kept it). We recommend the use of GNU Stow (or any similar program) during the installation of Olena, to make the uninstallation of Olena easier. + ===================== Layout of the Tarball ===================== @@ -470,11 +480,26 @@ papers. About Image Processing Programming: + * `Why and How to Design a Generic and Efficient Image Processing + Framework: The Case of the Milena Library`. Roland Levillain, + Thierry Géraud, Laurent Najman. In the proceedings of the 2010 + International Conference on Image Processing (ICIP) + http://www.icip2010.org/ + Hong Kong, September 26 - 29, 2010. + + * `Writing Reusable Digital Geometry Algorithms in a Generic Image + Processing Framework`. Roland Levillain, Thierry Géraud, Laurent + Najman. In the proceedings of the Workshop on Applications of + Digital Geometry and Mathematical Morphology (WADGMM) + http://mdigest.jrc.ec.europa.eu/wadgmm2010/ + Istanbul, Turkey, August 22, 2010. + * `Milena: Write Generic Morphological Algorithms Once, Run on Many Kinds of Images`. Roland Levillain, Thierry Géraud, Laurent Najman. In the proceedings of the 9th International Symposium on - Mathematical Morphology (ISMM) http://www.cs.rug.nl/~ISMM09/ - Groningen, The Netherlands August 24 - 27, 2009. + Mathematical Morphology (ISMM) + http://www.cs.rug.nl/~ISMM09/ + Groningen, The Netherlands, August 24 - 27, 2009. * `Generic Algorithmic Blocks Dedicated to Image Processing`, Jérôme Darbon, Thierry Géraud, Patrick Bellot. In the proceedings -- 1.5.6.5

1 0

last-svn-commit-509-g829030b configure.ac: Aesthetic changes.
by Roland Levillain 21 Oct '10

21 Oct '10

--- ChangeLog | 4 ++ configure.ac | 134 ++++++++++++++++++++++++++-------------------------------- 2 files changed, 64 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index b65b251..95a2581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Aesthetic changes. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix configure option `--enable-all'. * configure.ac: Check the value of `enable_all' before triggering diff --git a/configure.ac b/configure.ac index 38b3903..9e5a830 100644 --- a/configure.ac +++ b/configure.ac @@ -39,13 +39,13 @@ AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) # Package metadata. AC_CONFIG_FILES([milena/mln/version.hh]) AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"], - [Package Full name.]) + [Package Full name.]) AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], - [Bug report address.]) + [Bug report address.]) AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"], - [Full name and version.]) + [Full name and version.]) AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], - [Package Version.]) + [Package Version.]) ## --------------------- ## ## C++ compiler set up. ## @@ -90,11 +90,11 @@ AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags]) case "$CXX" in # Intel compiler *icpc*) - WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418" - ;; + WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418" + ;; *) - WARNINGS_CXXFLAGS="-Wall -W" - ;; + WARNINGS_CXXFLAGS="-Wall -W" + ;; esac @@ -190,42 +190,31 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## External libraries. ## ## -------------------- ## - -### Support for FreeImagePlus has been disabled for Olena 1.0. -## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) - -## ----- ## -## Boost ## -## ----- ## +# ------- # +# Boost. # +# ------- # BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) - - -## ---------------- ## -## CFITSIO library. ## -## ---------------- ## +# ----------------- # +# CFITSIO library. # +# ----------------- # OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) - -#------------------------------------------------------------ - -## --------- ## -## Magick++. ## -## --------- ## +# ---------- # +# Magick++. # +# ---------- # OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX], [], [ImageMagick++]) AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes) -#------------------------------------------------------------ - -## --- ## -## Qt. ## -## --- ## +# ---- # +# Qt. # +# ---- # AT_WITH_QT([xml], [], [], [], [oln_have_qt=yes]) if test $oln_have_qt = yes; then @@ -235,35 +224,32 @@ if test $oln_have_qt = yes; then fi AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes]) - - -## ---------- ## -## Tesseract. ## -## ---------- ## +# ----------- # +# Tesseract. # +# ----------- # OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], - [tesseract], [TESSERACT]) + [tesseract], [TESSERACT]) - -## ------------- ## -## TIFF library. ## -## ------------- ## +# -------------- # +# TIFF library. # +# -------------- # OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) - -## -------------------------------- ## -## GDCM library (Grassroots DiCom). ## -## -------------------------------- ## +# --------------------------------- # +# GDCM library (Grassroots DiCom). # +# --------------------------------- # OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], - [GDCM], - [-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]) + [GDCM], + m4_do([-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF], + [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8], + [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib])) - -## ---------------------------- ## -## (Bundled) trimesh2 library. ## -## ---------------------------- ## +# ---------------------------- # +# (Bundled) trimesh2 library. # +# ---------------------------- # AC_ARG_ENABLE([trimesh], [AS_HELP_STRING([--enable-trimesh], @@ -271,6 +257,7 @@ AC_ARG_ENABLE([trimesh], AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes]) AC_CONFIG_SUBDIRS([external/trimesh]) + ## --------- ## ## Swilena. ## ## --------- ## @@ -303,18 +290,18 @@ Try adding `-I <Python include path>' to `CPPFLAGS'.])]) AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes]) AC_CONFIG_FILES([swilena/Makefile - swilena/python/Makefile]) + swilena/python/Makefile]) AC_CONFIG_FILES([swilena/run], [chmod +x swilena/run]) AC_CONFIG_FILES(m4_do([swilena/python/sps], - [:swilena/python/sps-common.in], - [:swilena/python/sps.in]), - [chmod +x swilena/python/sps]) + [:swilena/python/sps-common.in], + [:swilena/python/sps.in]), + [chmod +x swilena/python/sps]) AC_CONFIG_FILES(m4_do([swilena/python/sps-local], - [:swilena/python/sps-common.in], - [:swilena/python/sps-local.in]), - [chmod +x swilena/python/sps-local]) + [:swilena/python/sps-common.in], + [:swilena/python/sps-local.in]), + [chmod +x swilena/python/sps-local]) dnl<<lrde ## -------- ## @@ -341,8 +328,8 @@ AC_CONFIG_FILES([ scribo/src/postprocessing/Makefile scribo/src/preprocessing/Makefile scribo/src/primitive/Makefile - scribo/src/primitive/extract/Makefile - scribo/src/primitive/find/Makefile + scribo/src/primitive/extract/Makefile + scribo/src/primitive/find/Makefile scribo/src/primitive/group/Makefile scribo/src/table/Makefile scribo/src/text/Makefile @@ -423,9 +410,9 @@ AC_CONFIG_FILES([ milena/tests/core/Makefile milena/tests/core/alias/Makefile milena/tests/core/image/Makefile - milena/tests/core/image/dmorph/Makefile - milena/tests/core/image/imorph/Makefile - milena/tests/core/image/vmorph/Makefile + milena/tests/core/image/dmorph/Makefile + milena/tests/core/image/imorph/Makefile + milena/tests/core/image/vmorph/Makefile milena/tests/core/other/Makefile milena/tests/core/routine/Makefile milena/tests/core/site_set/Makefile @@ -488,7 +475,7 @@ AC_CONFIG_FILES([ milena/tests/morpho/reconstruction/by_dilation/Makefile milena/tests/morpho/reconstruction/by_erosion/Makefile milena/tests/morpho/tree/Makefile - milena/tests/morpho/tree/filter/Makefile + milena/tests/morpho/tree/filter/Makefile milena/tests/morpho/watershed/Makefile milena/tests/norm/Makefile milena/tests/opt/Makefile @@ -515,7 +502,7 @@ AC_CONFIG_FILES([ milena/tests/world/Makefile milena/tests/world/binary_2d/Makefile milena/tests/world/inter_pixel/Makefile - milena/tests/world/inter_pixel/dim2/Makefile + milena/tests/world/inter_pixel/dim2/Makefile ]) dnl<<lrde @@ -555,20 +542,20 @@ AC_CONFIG_FILES([ # FIXME: Consider using `sed' instead of `configure' to create these # tests for the sake of speed. AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel], - [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel]) + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel]) AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity], - [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity]) + [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity]) # Flags for apps. AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications]) @@ -586,8 +573,7 @@ fi ## ------- ## AC_ARG_ENABLE([tools], - [AS_HELP_STRING([--enable-tools], - [enable tools])]) + [AS_HELP_STRING([--enable-tools], [enable tools])]) AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"]) # Ask for the creation of tools' Makefiles. -- 1.5.6.5

1 0

last-svn-commit-506-g637d70c Catch up with Boost-related changes in configure.ac.
by Roland Levillain 21 Oct '10

21 Oct '10

* tests/accu/Makefile.am: Remove uses of the old HAVE_BOOST_PREPROCESSOR conditional. * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: Rename as... * milena/tests/unit_test/cond_tests_boost-tuple: ...this. * tests/unit_test/Makefile.am (COND_TESTS): s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 13 +++++++++++++ milena/tests/accu/Makefile.am | 10 ++-------- milena/tests/unit_test/Makefile.am | 10 +++++----- ...rocessor_boost-tuple => cond_tests_boost-tuple} | 0 milena/tests/unit_test/unit-tests.mk | 6 ++---- 5 files changed, 22 insertions(+), 17 deletions(-) rename milena/tests/unit_test/{cond_tests_boost-preprocessor_boost-tuple => cond_tests_boost-tuple} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5feeb2c..0a495d7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with Boost-related changes in configure.ac. + + * tests/accu/Makefile.am: Remove uses of the old + HAVE_BOOST_PREPROCESSOR conditional. + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: + Rename as... + * milena/tests/unit_test/cond_tests_boost-tuple: ...this. + * tests/unit_test/Makefile.am (COND_TESTS): + s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/. + * tests/unit_test/unit-tests.mk: Regen. + 2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Make use of value::next in Milena. diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index cefa42c..7c0790a 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -51,15 +51,9 @@ transform_directional_SOURCES = transform_directional.cc transform_line_SOURCES = transform_line.cc transform_snake_SOURCES = transform_snake.cc - -if HAVE_BOOST_PREPROCESSOR if HAVE_BOOST_TUPLE - -check_PROGRAMS += tuple -tuple_SOURCES = tuple.cc - + check_PROGRAMS += tuple + tuple_SOURCES = tuple.cc endif HAVE_BOOST_TUPLE -endif HAVE_BOOST_PREPROCESSOR - TESTS = $(check_PROGRAMS) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index d53d578..b5c8803 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -17,11 +17,11 @@ include $(top_srcdir)/milena/tests/tests.mk -COND_TESTS = cond_tests_boost-preprocessor_boost-tuple \ - cond_tests_cfitsio \ - cond_tests_gdcm \ - cond_tests_magickxx \ - cond_tests_qt \ +COND_TESTS = cond_tests_boost-tuple \ + cond_tests_cfitsio \ + cond_tests_gdcm \ + cond_tests_magickxx \ + cond_tests_qt \ cond_tests_tiff EXTRA_DIST = disabled_tests \ diff --git a/milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple b/milena/tests/unit_test/cond_tests_boost-tuple similarity index 100% rename from milena/tests/unit_test/cond_tests_boost-preprocessor_boost-tuple rename to milena/tests/unit_test/cond_tests_boost-tuple diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5751682..71543be 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -3,16 +3,14 @@ check_PROGRAMS = # Starting a conditional unit test list. -if HAVE_BOOST_PREPROCESSOR if HAVE_BOOST_TUPLE check_PROGRAMS += \ mln_accu_tuple -mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${BOOST_PREPROCESSOR_CPPFLAGS} ${AM_CPPFLAGS} -mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${BOOST_PREPROCESSOR_LDFLAGS} ${AM_LDFLAGS} +mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} ${AM_CPPFLAGS} +mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${AM_LDFLAGS} mln_accu_tuple_SOURCES = mln_accu_tuple.cc endif HAVE_BOOST_TUPLE -endif HAVE_BOOST_PREPROCESSOR # Starting a conditional unit test list. if HAVE_CFITSIO -- 1.5.6.5

1 0