* scribo/toolchain/internal/content_in_doc_functor.hh, * src/Makefile.am, * src/contest/DAE-2011/content_in_hdoc_dae.cc: Here. --- scribo/ChangeLog | 17 +++++++++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 5 +++++ scribo/src/Makefile.am | 3 ++- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 4 ++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a2d00e3..9ba701f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-06-07 Guillaume Lazzara <z@lrde.epita.fr> + Disable OCR in ICDAR toolchains. + + * scribo/toolchain/internal/content_in_doc_functor.hh, + * src/Makefile.am, + * src/contest/DAE-2011/content_in_hdoc_dae.cc: Here. + +2011-06-07 Guillaume Lazzara <z@lrde.epita.fr> + + Add one more toolchain for DAE contest. + + * scribo/toolchain/internal/content_in_doc_functor.hh: + * src/Makefile.am + * src/contest/DAE-2011/Makefile.am + * src/contest/DAE-2011/content_in_hdoc_dae.cc + +2011-06-07 Guillaume Lazzara <z@lrde.epita.fr> + * src/contest/DAE-2011/content_in_hdoc_dae.cc: Specify output dir. 2011-06-07 Guillaume Lazzara <z@lrde.epita.fr> diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index 4308056..4f2c074 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -57,7 +57,10 @@ # include <scribo/preprocessing/denoise_fg.hh> +# ifndef SCRIBO_NOCR # include <scribo/text/recognition.hh> +# endif // ! SCRIBO_NOCR + # include <scribo/text/merging.hh> # include <scribo/text/link_lines.hh> # include <scribo/text/paragraphs.hh> @@ -437,6 +440,7 @@ namespace scribo on_progress(); +# ifndef SCRIBO_NOCR // Text recognition if (enable_ocr) { @@ -446,6 +450,7 @@ namespace scribo on_progress(); } +# endif // ! SCRIBO_NOCR // // Link text lines // on_new_progress_label("Linking text lines"); diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6ab5d7d..26f2ade 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -28,7 +28,8 @@ SUBDIRS = \ preprocessing \ table \ text \ - toolchain + toolchain \ + util 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 f13b8f6..5986142 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) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -24,7 +24,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -# define SCRIBO_NOCR +#define SCRIBO_NOCR #include <libgen.h> #include <fstream> -- 1.5.6.5