[Olena-patches] olena-2.0-27-g8e3077c Fix compilation in Scribo.

* scribo/primitive/link/merge_double_link_closest_aligned.hh: Add a missing include. * src/content_in_hdoc.cc, * src/contest/DAE-2011/content_in_doc_dae.cc, * src/contest/DAE-2011/content_in_hdoc_dae.cc, * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, * src/non_text_components.cc: Add mandatory arguments. --- scribo/ChangeLog | 13 +++++++++++++ .../link/merge_double_link_closest_aligned.hh | 4 +++- scribo/src/content_in_hdoc.cc | 7 ++++--- scribo/src/contest/DAE-2011/content_in_doc_dae.cc | 5 +++-- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 5 +++-- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 10 ++++++---- scribo/src/non_text_components.cc | 5 +++-- 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eafcc32..464fb63 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2012-05-10 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation in Scribo. + + * scribo/primitive/link/merge_double_link_closest_aligned.hh: Add + a missing include. + + * src/content_in_hdoc.cc, + * src/contest/DAE-2011/content_in_doc_dae.cc, + * src/contest/DAE-2011/content_in_hdoc_dae.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, + * src/non_text_components.cc: Add mandatory arguments. + 2011-12-06 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * scribo/text/recognition.hh: Restore previous locale. diff --git a/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh b/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh index d80fe85..a6143c8 100644 --- a/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh +++ b/scribo/scribo/primitive/link/merge_double_link_closest_aligned.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -31,6 +32,7 @@ # define SCRIBO_PRIMITIVE_LINK_MERGE_DOUBLE_LINK_CLOSEST_ALIGNED_HH +# include <mln/util/couple.hh> # include <scribo/core/macros.hh> # include <scribo/core/object_links.hh> # include <scribo/core/tag/anchor.hh> diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index 737b1d3..650c436 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -118,7 +118,8 @@ int main(int argc, char* argv[]) std::cout << "Using K = " << K << std::endl; } - input_preproc = toolchain::text_in_doc_preprocess(input, false, K); + input_preproc = toolchain::text_in_doc_preprocess(input, false, K, + false, false); // Cleanup components on borders { diff --git a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc index d194bd1..9d5034f 100644 --- a/scribo/src/contest/DAE-2011/content_in_doc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_doc_dae.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -80,7 +80,8 @@ int main(int argc, char* argv[]) // Preprocess document image2d<bool> input_preproc; - input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34); + input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34, + false, false); bool denoise = true; std::string language = ""; diff --git a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc index 5986142..c3dad6c 100644 --- a/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc +++ b/scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -91,7 +91,8 @@ int main(int argc, char* argv[]) // Preprocess document image2d<bool> input_preproc; { - input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34); + input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34, + false, false); // Cleanup components on borders { diff --git a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc index c00b70f..deb5bdd 100644 --- a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc +++ b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -90,7 +90,8 @@ int main(int argc, char* argv[]) // Preprocess document image2d<bool> input_preproc; { - input_preproc = toolchain::text_in_doc_preprocess(input, false, 0, 0.34); + input_preproc = toolchain::text_in_doc_preprocess(input, false, 0, 0.34, + false, false); // Cleanup components on borders { @@ -106,7 +107,8 @@ int main(int argc, char* argv[]) || bbox(e).pmax().row() == b.pmax().row() || bbox(e).pmin().col() == b.pmin().col() || bbox(e).pmax().col() == b.pmax().col()) - data::fill(((input_preproc | bbox(e)).rw() | (pw::value(lbl) == pw::cst(e))).rw(), false); + data::fill(((input_preproc | bbox(e)).rw() + | (pw::value(lbl) == pw::cst(e))).rw(), false); } } diff --git a/scribo/src/non_text_components.cc b/scribo/src/non_text_components.cc index 38a4e5e..27884f8 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/non_text_components.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -93,7 +93,8 @@ int main(int argc, char* argv[]) // Preprocess document image2d<bool> - input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34); + input_preproc = toolchain::text_in_doc_preprocess(input, false, 0.34, + false, false); bool denoise = true; -- 1.7.2.5