* src/content_in_hdoc.cc, * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, * src/non_text_components.cc, * src/text_in_doc_preprocess.cc: Here. --- scribo/ChangeLog | 9 +++++++++ scribo/src/content_in_hdoc.cc | 4 ++-- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 8 ++++++++ scribo/src/non_text_components.cc | 2 +- scribo/src/text_in_doc_preprocess.cc | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 37b1518..1e2239b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-02-26 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix call to text_in_doc_preprocess(). + + * src/content_in_hdoc.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, + * src/non_text_components.cc, + * src/text_in_doc_preprocess.cc: Here. + +2013-02-26 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix various warnings. * scribo/binarization/otsu_threshold.hh: Fix comparisons between diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index 650c436..c9760fb 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011, 2012 EPITA Research and Development +// Copyright (C) 2010, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -118,7 +118,7 @@ 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, 0, K, 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 deb5bdd..21a7732 100644 --- a/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc +++ b/scribo/src/contest/hdlac-2011/content_in_hdoc_hdlac.cc @@ -87,6 +87,8 @@ int main(int argc, char* argv[]) image2d<value::rgb8> input; mln::io::magick::load(input, argv[1]); + mln::debug::internal::filename_prefix = basename(argv[1]); + // Preprocess document image2d<bool> input_preproc; { @@ -133,5 +135,11 @@ int main(int argc, char* argv[]) scribo::io::xml::save(doc, argv[2], scribo::io::xml::Page); std::cout << "End of process - " << t << std::endl; + scribo::io::img::save(doc, mln::debug::filename("debug_wo_image.png"), + scribo::io::img::DebugWoImage); + scribo::io::img::save(doc, mln::debug::filename("debug_with_image.png"), + scribo::io::img::DebugWithImage); + + trace::exiting("main"); } diff --git a/scribo/src/non_text_components.cc b/scribo/src/non_text_components.cc index 27884f8..e6db89b 100644 --- a/scribo/src/non_text_components.cc +++ b/scribo/src/non_text_components.cc @@ -93,7 +93,7 @@ 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, 0.34, false, false); diff --git a/scribo/src/text_in_doc_preprocess.cc b/scribo/src/text_in_doc_preprocess.cc index 57dd800..39b48bb 100644 --- a/scribo/src/text_in_doc_preprocess.cc +++ b/scribo/src/text_in_doc_preprocess.cc @@ -91,7 +91,7 @@ int main(int argc, char* argv[]) image2d<bool> output; output = toolchain::text_in_doc_preprocess(input_rgb, fg_extraction, - lambda, 0.34, verbose); + lambda, 0.34, false, verbose); mln::io::pbm::save(output, options.arg("output.pbm")); } -- 1.7.2.5