* demo/viewer/icons/olena_smaller.jpg, * demo/viewer/viewer.qrc: Change icon location. * scribo/text/paragraphs_closing.hh: Avoid a warning. * src/content_in_doc.cc: Fix a parameter description. * src/debug/show_lines_boldness.cc, * src/debug/show_text_lines.cc, * src/debug/show_text_lines_wo_seps.cc: Remove useless includes. * src/scribo-cli.in: Pass arguments correctly. --- scribo/ChangeLog | 17 +++++++++++++++++ .../{shared => viewer}/icons/olena_smaller.jpg | Bin 8028 -> 8028 bytes scribo/demo/viewer/viewer.qrc | 2 +- scribo/scribo/text/paragraphs_closing.hh | 4 ++-- scribo/src/content_in_doc.cc | 2 +- scribo/src/debug/show_lines_boldness.cc | 3 --- scribo/src/debug/show_text_lines.cc | 2 -- scribo/src/debug/show_text_lines_wo_seps.cc | 2 -- scribo/src/scribo-cli.in | 2 +- 9 files changed, 22 insertions(+), 12 deletions(-) copy scribo/demo/{shared => viewer}/icons/olena_smaller.jpg (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index df9e8db..f351b82 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-09-12 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Small fixes in Scribo. + + * demo/viewer/icons/olena_smaller.jpg, + * demo/viewer/viewer.qrc: Change icon location. + + * scribo/text/paragraphs_closing.hh: Avoid a warning. + + * src/content_in_doc.cc: Fix a parameter description. + + * src/debug/show_lines_boldness.cc, + * src/debug/show_text_lines.cc, + * src/debug/show_text_lines_wo_seps.cc: Remove useless includes. + + * src/scribo-cli.in: Pass arguments correctly. + +2011-09-12 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + More fixes in Scribo build system. * demo/viewer/Makefile.am: Add missing distributed files. diff --git a/scribo/demo/shared/icons/olena_smaller.jpg b/scribo/demo/viewer/icons/olena_smaller.jpg similarity index 100% copy from scribo/demo/shared/icons/olena_smaller.jpg copy to scribo/demo/viewer/icons/olena_smaller.jpg diff --git a/scribo/demo/viewer/viewer.qrc b/scribo/demo/viewer/viewer.qrc index 361b332..c64fdcc 100644 --- a/scribo/demo/viewer/viewer.qrc +++ b/scribo/demo/viewer/viewer.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="icons"> - <file>../shared/icons/olena_smaller.jpg</file> + <file>icons/olena_smaller.jpg</file> </qresource> </RCC> diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh index 13f8bc2..476c14e 100644 --- a/scribo/scribo/text/paragraphs_closing.hh +++ b/scribo/scribo/text/paragraphs_closing.hh @@ -83,7 +83,7 @@ namespace scribo if (last_pixel_value) { unsigned k = j + 1; - for (; !(input.at_(i, k)) && (k < ncols); ++k); + for ( ; !(input.at_(i, k)) && (k < ncols); ++k); count = k - j; const int threshold = deltas(last_pixel_value); @@ -133,7 +133,7 @@ namespace scribo if (last_pixel_value) { unsigned k = i + 1; - for (; !(input.at_(k, j)) && (k < nrows); ++k); + for ( ; !(input.at_(k, j)) && (k < nrows); ++k); count = k - i; const int threshold = deltas(last_pixel_value); diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 91d8b4f..bd1109d 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -80,7 +80,7 @@ static const scribo::debug::opt_data opt_desc[] = { "debug-prefix", "Enable debug image outputs. Prefix image name with that " "given prefix.", "<prefix>", 0, 1, 0 }, { "ocr-lang", "Set the language to be recognized by the OCR (Tesseract). " - "According to your system, you can choose between eng (default), " + "Depending on your system, you can choose between eng (default), " "fra, deu, ita, nld, por, spa, vie", "<lang>", scribo::debug::check_ocr_lang, 1, "eng" }, { "verbose", "Enable verbose mode", 0, 0, 0, 0 }, diff --git a/scribo/src/debug/show_lines_boldness.cc b/scribo/src/debug/show_lines_boldness.cc index a3815c0..eec473a 100644 --- a/scribo/src/debug/show_lines_boldness.cc +++ b/scribo/src/debug/show_lines_boldness.cc @@ -34,11 +34,8 @@ #include <mln/data/convert.hh> #include <mln/literal/colors.hh> -#include <scribo/text/recognition.hh> - #include <scribo/debug/usage.hh> -#include <scribo/core/document.hh> #include <scribo/core/component_set.hh> #include <scribo/core/object_links.hh> #include <scribo/core/object_groups.hh> diff --git a/scribo/src/debug/show_text_lines.cc b/scribo/src/debug/show_text_lines.cc index 57608f0..5b7eaff 100644 --- a/scribo/src/debug/show_text_lines.cc +++ b/scribo/src/debug/show_text_lines.cc @@ -34,8 +34,6 @@ #include <mln/data/convert.hh> #include <mln/literal/colors.hh> -#include <scribo/text/recognition.hh> - #include <scribo/debug/usage.hh> #include <scribo/core/document.hh> diff --git a/scribo/src/debug/show_text_lines_wo_seps.cc b/scribo/src/debug/show_text_lines_wo_seps.cc index 98ef05e..8031940 100644 --- a/scribo/src/debug/show_text_lines_wo_seps.cc +++ b/scribo/src/debug/show_text_lines_wo_seps.cc @@ -34,8 +34,6 @@ #include <mln/data/convert.hh> #include <mln/literal/colors.hh> -#include <scribo/text/recognition.hh> - #include <scribo/debug/usage.hh> #include <scribo/core/document.hh> diff --git a/scribo/src/scribo-cli.in b/scribo/src/scribo-cli.in index 0369cad..7cc4864 100755 --- a/scribo/src/scribo-cli.in +++ b/scribo/src/scribo-cli.in @@ -171,7 +171,7 @@ case $1 in ;; *) - run_cmd $1 + run_cmd $@ ;; esac -- 1.7.2.5