---
scribo/ChangeLog | 17 ++++++++++-------
scribo/text/merging.hh | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 59f9e67..67159ad 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,18 +1,21 @@
2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr>
+ * text/merging.hh: Disable some debug.
+
+2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Prepare DIA tools for Nuxeo/XWiki.
- * scribo/src/Makefile.am: Add a new target.
+ * src/Makefile.am: Add a new target.
- * scribo/src/text_in_article_preprocess.cc: New.
+ * src/text_in_article_preprocess.cc: New.
- * scribo/src/text_in_article_pbm.cc: Add optional cropping and
- makes the debug optionnal.
+ * src/text_in_article_pbm.cc: Add optional cropping and makes the
+ debug optionnal.
- * scribo/text/clean.hh: Improve cleanup.
+ * text/clean.hh: Improve cleanup.
- * scribo/text/recognition.hh: Remove last '\n' in Tesseract's
- output.
+ * text/recognition.hh: Remove last '\n' in Tesseract's output.
2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr>
diff --git a/scribo/text/merging.hh b/scribo/text/merging.hh
index b29e63f..5309b10 100644
--- a/scribo/text/merging.hh
+++ b/scribo/text/merging.hh
@@ -606,7 +606,7 @@ namespace scribo
if (lines(mc).type() == line::Text) // included in a text line => weird
{
++count_txtline_IN_txtline;
- std::cout << "weird: inclusion of a txt_line in a txt_line!" <<
std::endl;
+// std::cout << "weird: inclusion of a txt_line in a txt_line!"
<< std::endl;
/// Merge is perform if the current line is a
/// petouille considered as a line.
--
1.5.6.5