- Olena-patches

branch next-build-test updated: last-svn-commit-721-g1ee88c2
by lazzara＠lrde.epita.fr 13 Dec '10

13 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via 1ee88c22deb72bd4a481d53f0932358b7d491072 (commit) from 619aa0ed4462cfb9ed0ed9204c54fcbbd55ef52c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 1ee88c2 tests/unit_test/cond_tests_tesseract_tiff: Add conditional unit-tests. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 5 +++++ scribo/tests/unit_test/cond_tests_tesseract_tiff | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-721-g1ee88c2 tests/unit_test/cond_tests_tesseract_tiff: Add conditional unit-tests.
by Guillaume Lazzara 13 Dec '10

13 Dec '10

--- scribo/ChangeLog | 5 +++++ scribo/tests/unit_test/cond_tests_tesseract_tiff | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 04e5ec1..23afe4d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/cond_tests_tesseract_tiff: Add conditional + unit-tests. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix unit-tests in Scribo. * scribo/toolchain/internal/content_in_doc_functor.hh, diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index 5424dbd..c55f4c1 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,2 +1,4 @@ scribo/text/recognition.hh +scribo/toolchain/internal/content_in_doc_functor.hh +scribo/toolchain/internal/text_in_doc_functor.hh scribo/toolchain/text_in_doc.hh -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-720-g619aa0e
by lazzara＠lrde.epita.fr 13 Dec '10

13 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via 619aa0ed4462cfb9ed0ed9204c54fcbbd55ef52c (commit) from 5306e4e13ab2b4d3caeb58d15b8d1ba0fb99bb9d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 619aa0e Fix unit-tests in Scribo. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 10 ++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 2 +- .../toolchain/internal/text_in_doc_functor.hh | 2 +- .../scribo/toolchain/internal/toolchain_functor.hh | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-720-g619aa0e Fix unit-tests in Scribo.
by Guillaume Lazzara 13 Dec '10

13 Dec '10

* scribo/toolchain/internal/content_in_doc_functor.hh, * scribo/toolchain/internal/text_in_doc_functor.hh: Fix guards. * scribo/toolchain/internal/toolchain_functor.hh: Add a missing include. --- scribo/ChangeLog | 10 ++++++++++ .../toolchain/internal/content_in_doc_functor.hh | 2 +- .../toolchain/internal/text_in_doc_functor.hh | 2 +- .../scribo/toolchain/internal/toolchain_functor.hh | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 40f7db0..04e5ec1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix unit-tests in Scribo. + + * scribo/toolchain/internal/content_in_doc_functor.hh, + * scribo/toolchain/internal/text_in_doc_functor.hh: Fix guards. + + * scribo/toolchain/internal/toolchain_functor.hh: Add a missing + include. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/Makefile.am (SUBDIRS): Fix invalid assignment. 2010-12-13 Guillaume Lazzara <z(a)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 5459487..12e5137 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_PREPROCESS_FUNCTOR_HH +#ifndef SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_CONTENT_IN_DOC_FUNCTOR_HH # include <mln/io/ppm/save.hh> diff --git a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh index 701f1e6..fdbee90 100644 --- a/scribo/scribo/toolchain/internal/text_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_doc_functor.hh @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_PREPROCESS_FUNCTOR_HH +#ifndef SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_TEXT_IN_DOC_FUNCTOR_HH # include <mln/io/ppm/save.hh> diff --git a/scribo/scribo/toolchain/internal/toolchain_functor.hh b/scribo/scribo/toolchain/internal/toolchain_functor.hh index d10ea28..a29dafa 100644 --- a/scribo/scribo/toolchain/internal/toolchain_functor.hh +++ b/scribo/scribo/toolchain/internal/toolchain_functor.hh @@ -26,6 +26,8 @@ #ifndef SCRIBO_TOOLCHAIN_INTERNAL_TOOLCHAIN_FUNCTOR_HH # define SCRIBO_TOOLCHAIN_INTERNAL_TOOLCHAIN_FUNCTOR_HH +# include <iostream> + namespace scribo { -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-719-g5306e4e
by lazzara＠lrde.epita.fr 13 Dec '10

13 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via 5306e4e13ab2b4d3caeb58d15b8d1ba0fb99bb9d (commit) via db3466e6f12fca8d9c92ae661ae0b5d053b8e4ba (commit) via 47737dc394d2bb22742e7bd2f964bed0cd950648 (commit) via 626d241b525d8c8339f47db71552fdd507441e20 (commit) via ac6d6f3b631b86ed8c9ff6164ad5730f43037038 (commit) via 93da222f1f71aff9addd237d8bd5d065aba3882f (commit) via 6a4e9c53629433058a6fbbbb012b86b275eda65a (commit) via 7186af46bed3e9755e7c319178fdf677b42efdce (commit) via 0be53fd662d3b5ae1c7d3740e07710df4a95c0a6 (commit) from afe7341edce8ebc4977d31410bb7aaacd33c72aa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5306e4e Merge remote branch 'remotes/origin/next' into next-build-test ----------------------------------------------------------------------- Summary of changes: AUTHORS | 6 +- ChangeLog | 10 +++ m4/autotroll.m4 | 3 + milena/ChangeLog | 60 +++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 +- milena/mln/core/concept/value_set.hh | 5 +- milena/mln/core/site_set/p_complex_piter.hh | 6 +- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/core/site_set/p_n_faces_piter.hh | 83 ++++++++++++++------------- milena/mln/morpho/tree/data.hh | 5 +- milena/mln/trace/warning.hh | 10 ++-- milena/mln/util/array.hh | 8 +- milena/mln/util/fibonacci_heap.hh | 40 +++++++------- swilena/ChangeLog | 9 +++ swilena/python/Makefile.am | 12 ++-- 15 files changed, 176 insertions(+), 89 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-719-g5306e4e Merge remote branch 'remotes/origin/next' into next-build-test
by Guillaume Lazzara 13 Dec '10

13 Dec '10

This is a merge commit message of the following branches: Merge: afe7341... db3466e... AUTHORS | 6 +- ChangeLog | 10 +++ m4/autotroll.m4 | 3 + milena/ChangeLog | 60 +++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 +- milena/mln/core/concept/value_set.hh | 5 +- milena/mln/core/site_set/p_complex_piter.hh | 6 +- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/core/site_set/p_n_faces_piter.hh | 83 ++++++++++++++------------- milena/mln/morpho/tree/data.hh | 5 +- milena/mln/trace/warning.hh | 10 ++-- milena/mln/util/array.hh | 8 +- milena/mln/util/fibonacci_heap.hh | 40 +++++++------- swilena/ChangeLog | 9 +++ swilena/python/Makefile.am | 12 ++-- 15 files changed, 176 insertions(+), 89 deletions(-) diff --cc ChangeLog index a8f671e,b63a9a3..b565a26 --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,13 +1,26 @@@ + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Honor `--without-qt' in configure. + + * m4/autotroll.m4: Here. + + 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + + * AUTHORS: Clean up whitespace. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure scribo/demo/xml2doc directory. + +2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-upload.sh: Upload tarball for branch next-build-test. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Use tar-ustar to allow filenames with more than 99 + characters. + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. diff --cc milena/ChangeLog index dd33710,9f07662..0fb0b2b --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,25 -1,63 +1,85 @@@ + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Work around g++ 4.5 deficiencies to compile Milena. + + * mln/core/concept/proxy.hxx + (internal::helper_unproxy_rec< P, true >::P_) + (internal::helper_unproxy_rec< const P, true >::P_): + Remove these intermediate typedefs... + (internal::helper_unproxy_rec< P, true >::ret) + (internal::helper_unproxy_rec< const P, true >::ret): + ...to inline these definitions. + * mln/util/array.hh + (internal::subject_impl<util::array<T>&, E>::operator()) + (internal::subject_impl<util::array<T>&, E>::operator[]) + (internal::subject_impl<const util::array<T>&, E>::operator() const) + (internal::subject_impl<const util::array<T>&, E>::operator[] const): + * mln/core/site_set/p_graph_piter.hh + (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): + Use the exact same return type as in the declaration. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix forward declarations in complex piters. + + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_n_faces_piter.hh: + Here. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Rename parameter `P' as `G' (geometry) in p_n_faces_piters. + + * mln/core/site_set/p_complex_piter.hh: Here. + + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the type of the underlying site of p_n_faces_piters. + + * mln/core/site_set/p_n_faces_piter.hh + (mln::p_n_faces_fwd_piter, mln::p_n_faces_bkd_piter): + Change the third parameter of the base class from `P' to + `mln_site(P)'. + + 2010-07-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix output streams uses. + + * mln/core/concept/value_set.hh + (operator<<(std::ostream&, const Value_Set<E>&)) + * mln/morpho/tree/data.hh + (operator<< (std::ostream&, const tree::data<I, S>&)): + Use the stream passed as argument instead of std::cout. + * mln/util/fibonacci_heap.hh + (mln::util::internal::fibonacci_heap_node::print_): Take an output + stream as argument instead of using the standard output. + (mln::util::fibonacci_heap::print_): Rename first argument from + `cout' to `ostr' prevent confusions with std::cout. + * mln/trace/warning.hh (mln::trace::warning): Print warnings on + the standard error instead of the standard ourput. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle more global vars with MLN_WO_GLOBAL_VARS + + * mln/canvas/browsing/depth_first_search.hh, + * mln/debug/filename.hh, + * mln/debug/quiet.hh, + * mln/labeling/colorize.hh, + * mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards. + +2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick + instead of ImageMagick. + +2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a fastest implementation in io::magick. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Use pointers to access image data. + 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> Handle properly non 8-bit Magick::Quantum's. hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next-build-test updated: last-svn-commit-710-gafe7341
by lazzara＠lrde.epita.fr 13 Dec '10

13 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via afe7341edce8ebc4977d31410bb7aaacd33c72aa (commit) via e30fdda4236d1b003e56ab852e7573423187e06c (commit) from ac9ebc9fb10783ddaf7b63e2c6ba91e6cea3f914 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- afe7341 demo/Makefile.am (SUBDIRS): Fix invalid assignmens. e30fdda demo/xml2doc/Makefile.am: Add a file dependency. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 ++++++++ scribo/demo/Makefile.am | 6 ++++-- scribo/demo/xml2doc/Makefile.am | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-710-gafe7341 demo/Makefile.am (SUBDIRS): Fix invalid assignmens.
by Guillaume Lazzara 13 Dec '10

13 Dec '10

--- scribo/ChangeLog | 4 ++++ scribo/demo/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4b4f375..40f7db0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/Makefile.am (SUBDIRS): Fix invalid assignment. + +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/Makefile.am: Add a file dependency. 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index 2d55093..328f17e 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -15,15 +15,17 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. +SUBDIRS = + if HAVE_QT -SUBDIRS = review +SUBDIRS += review if HAVE_MAGICKXX -SUBDIRS = viewer +SUBDIRS += viewer endif HAVE_MAGICKXX -- 1.5.6.5

1 0

last-svn-commit-709-ge30fdda demo/xml2doc/Makefile.am: Add a file dependency.
by Guillaume Lazzara 13 Dec '10

13 Dec '10

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/Makefile.am | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7d0a372..4b4f375 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-12-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/xml2doc/Makefile.am: Add a file dependency. + 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> Temporary fix PDF rendering. diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index f6ab232..946b208 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -43,7 +43,8 @@ BUILT_SOURCES = common.moc.cc \ noinst_HEADERS = common.hh \ image_crop.hh \ loader.hh \ - xml_transform.hh + xml_transform.hh \ + datarootdir.hh # Generated files noinst_gen_files = datarootdir.hh -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-708-gac9ebc9
by lazzara＠lrde.epita.fr 10 Dec '10

10 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via ac9ebc9fb10783ddaf7b63e2c6ba91e6cea3f914 (commit) via f9fd47cd3def35ef73884d168c6f80f298d534b1 (commit) via 8734ec09ad7a30062596c37e9522024bf7846957 (commit) via 9dcc9c1167c229f786014d590539f6f80e717397 (commit) via 50bccc16d46c13ef13a460d3a8d7cf34709e84a4 (commit) via 31fc353bee03fbb2ae7f460c351fc098784553c1 (commit) via cb3d4f6e5a7d6b37ce21ad356b5c9d4fbcd79f9c (commit) via 82146b7677e9337b0e62fd2e07f15aeb12ae9d19 (commit) via 0a5f6a56c1fffbbe61e256450e3b2f1a97e3d2d5 (commit) via 3cc1d66c3b876e8d3cc6e1dbf015cf5c5c40869b (commit) via c338ad576f89e95f066217fde6c14fe914501522 (commit) via 4a28847099484ca8430ac924db629123046cd8cf (commit) via fa358e849090fa08d5125cbe8f81d9e8987af194 (commit) via ce3d7a733232debf5f0fb4c0bcda7caa896f7985 (commit) via 56ca0bcf3b59cff675d09051141b06fb5228ad66 (commit) via a0df2e7cf96eadc5da1e714f9aa9fad6ccccd092 (commit) via 911aaa70828f695346ef5632b7b7c8d5b54c39f0 (commit) via 680fbedcf0db6cab1a4a36c6581f1e2ebb927c5a (commit) from 3d16fd32fef9d30de88637605ed81a83c0d2f778 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ac9ebc9 Temporary fix PDF rendering. f9fd47c Integrate the DIA toolchain in Scribo viewer. 8734ec0 Fix guards and license. 9dcc9c1 Add configuration widgets in Scribo viewer. 50bccc1 src/scribo-cli.in: Add a call to xml2doc. 31fc353 Small fixes. cb3d4f6 Add new options to command lines tools. 82146b7 Rewrite toolchains as functors. 0a5f6a5 scribo/core/document.hh: Add new methods. 3cc1d66 Fix missing inlines and MLN_WO_GLOBALS_VARS guards in Scribo. c338ad5 Handle more global vars with MLN_WO_GLOBAL_VARS 4a28847 configure.ac: Configure scribo/demo/xml2doc directory. fa358e8 Fix guards and license in xml2doc. ce3d7a7 Get rid of xml_transform.sh and handle xsl files location after installation. 56ca0bc Include xml2doc in build system. a0df2e7 Import xml_transform from Arthur's sandbox to demo/xml2doc. 911aaa7 scribo/toolchain/text_in_doc.hh: Set english as default recognized language. 680fbed Add missing ImageMagick initialization. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 1 + milena/ChangeLog | 10 + milena/mln/canvas/browsing/depth_first_search.hh | 7 +- milena/mln/debug/filename.hh | 15 +- milena/mln/debug/quiet.hh | 7 +- milena/mln/labeling/colorize.hh | 4 + milena/mln/math/pi.hh | 7 +- scribo/ChangeLog | 169 ++++++++ scribo/demo/Makefile.am | 22 +- scribo/demo/viewer/Makefile.am | 73 +++- scribo/demo/viewer/README | 9 - scribo/demo/viewer/browser_widget.cc | 9 - scribo/demo/viewer/browser_widget.hh | 17 +- scribo/demo/viewer/common.hh | 17 +- scribo/demo/viewer/config.cc | 156 ++++++++ scribo/demo/viewer/config.hh | 69 ++++ scribo/demo/viewer/defs.hh | 31 ++ scribo/demo/viewer/general_options.cc | 60 +++ scribo/demo/viewer/general_options.hh | 40 ++ scribo/demo/viewer/general_options.ui | 100 +++++ scribo/demo/viewer/help_dialog.cc | 9 - scribo/demo/viewer/help_dialog.hh | 15 +- scribo/demo/viewer/image_region.cc | 9 - scribo/demo/viewer/image_region.hh | 15 +- scribo/demo/viewer/image_region.hxx | 34 ++- scribo/demo/viewer/image_scene.cc | 10 +- scribo/demo/viewer/image_scene.hh | 18 +- scribo/demo/viewer/image_view.cc | 9 - scribo/demo/viewer/image_view.hh | 17 +- scribo/demo/viewer/image_widget.cc | 9 - scribo/demo/viewer/image_widget.hh | 17 +- scribo/demo/viewer/key_widget.cc | 9 - scribo/demo/viewer/key_widget.hh | 15 +- scribo/demo/viewer/main.cc | 16 +- scribo/demo/viewer/option_widget.cc | 30 ++ scribo/demo/viewer/option_widget.hh | 30 ++ scribo/demo/viewer/preferences_dialog.cc | 113 ++++++ scribo/demo/viewer/preferences_dialog.hh | 45 +++ scribo/demo/viewer/preferences_dialog.ui | 121 ++++++ scribo/demo/viewer/preprocess.cc | 29 ++ scribo/demo/viewer/preprocess.hh | 41 ++ scribo/demo/viewer/process.cc | 42 ++ scribo/demo/viewer/process.hh | 46 +++ scribo/demo/viewer/runner.cc | 150 +++++++ scribo/demo/viewer/runner.hh | 61 +++ scribo/demo/viewer/step_widget.cc | 108 +++--- scribo/demo/viewer/step_widget.hh | 19 +- scribo/demo/viewer/toolchain_options.cc | 75 ++++ scribo/demo/viewer/toolchain_options.hh | 37 ++ scribo/demo/viewer/toolchain_options.ui | 121 ++++++ scribo/demo/viewer/viewer.cc | 160 ++++++-- scribo/demo/viewer/viewer.hh | 34 +- scribo/demo/viewer/viewer.hxx | 4 - scribo/demo/viewer/xml_widget.cc | 9 - scribo/demo/viewer/xml_widget.hh | 17 +- scribo/demo/xml2doc/Makefile.am | 69 ++++ .../arthur/xml_transform => demo/xml2doc}/README | 0 .../xml_transform => demo/xml2doc}/common.cc | 0 .../xml_transform => demo/xml2doc}/common.hh | 0 scribo/demo/xml2doc/datarootdir.hh.in | 35 ++ scribo/demo/xml2doc/image_crop.cc | 331 ++++++++++++++++ scribo/demo/xml2doc/image_crop.hh | 54 +++ scribo/demo/xml2doc/loader.cc | 190 +++++++++ scribo/demo/xml2doc/loader.hh | 42 ++ scribo/demo/xml2doc/main.cc | 278 +++++++++++++ .../xml2doc/templates/bin}/ooconvert | 0 .../xml2doc}/templates/html/css.css | 0 .../xml2doc}/templates/html/main.xsl | 0 .../xml2doc}/templates/html/main_base64.xsl | 0 .../xml2doc}/templates/opendoc/css.css | 0 .../xml2doc}/templates/opendoc/xsl.xsl | 0 scribo/demo/xml2doc/templates/pdf/line.xsl | 204 ++++++++++ .../xml2doc}/templates/pdf/main.xsl | 0 .../xml2doc}/templates/pdf/regions.xsl | 0 .../pdf => demo/xml2doc/templates/svg}/line.xsl | 0 .../xml2doc}/templates/svg/main.xsl | 0 .../xml2doc}/templates/svg/regions.xsl | 0 scribo/demo/xml2doc/xml_transform.cc | 124 ++++++ scribo/demo/xml2doc/xml_transform.hh | 54 +++ scribo/sandbox/arthur/xml_transform/image_crop.cc | 340 ---------------- scribo/sandbox/arthur/xml_transform/image_crop.hh | 63 --- scribo/sandbox/arthur/xml_transform/loader.cc | 199 ---------- scribo/sandbox/arthur/xml_transform/loader.hh | 51 --- scribo/sandbox/arthur/xml_transform/main.cc | 172 -------- .../arthur/xml_transform/templates/svg/line.xsl | 129 ------ .../xml_transform/templates/xml_transform.sh | 134 ------- .../sandbox/arthur/xml_transform/xml_transform.cc | 133 ------- .../sandbox/arthur/xml_transform/xml_transform.hh | 63 --- .../sandbox/arthur/xml_transform/xml_transform.pro | 17 - .../binarization/internal/first_pass_functor.hh | 142 ++++--- scribo/scribo/binarization/sauvola_ms.hh | 2 + scribo/scribo/core/component_info.hh | 17 +- scribo/scribo/core/document.hh | 30 ++- scribo/scribo/core/init_integral_image.hh | 16 +- scribo/scribo/core/tag/component.hh | 2 + scribo/scribo/core/tag/line.hh | 3 + scribo/scribo/io/xml/save.hh | 3 + scribo/scribo/make/debug_filename.hh | 3 + scribo/scribo/preprocessing/deskew.hh | 5 + scribo/scribo/preprocessing/split_bg_fg.hh | 6 +- .../primitive/extract/separators_nonvisible.hh | 65 ++-- .../scribo/primitive/link/internal/dmax_default.hh | 1 + .../link/internal/dmax_width_and_height.hh | 2 + .../primitive/link/internal/dmax_width_only.hh | 2 + scribo/scribo/text/merging.hh | 3 + scribo/scribo/text/recognition.hh | 11 +- .../toolchain/internal/content_in_doc_functor.hh | 415 ++++++++++++++++++++ .../toolchain/internal/text_in_doc_functor.hh | 401 +++++++++++++++++++ .../internal/text_in_doc_preprocess_functor.hh | 304 ++++++++++++++ .../scribo/toolchain/internal/toolchain_functor.hh | 94 +++++ scribo/scribo/toolchain/text_in_doc.hh | 251 +----------- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 64 ++-- scribo/src/Makefile.am | 7 +- scribo/src/binarization/sauvola_ms.cc | 2 + scribo/src/content_in_doc.cc | 51 ++- scribo/src/debug/show_links_single_right.cc | 4 +- scribo/src/pbm_text_in_doc.cc | 24 +- scribo/src/scribo-cli.in | 13 + scribo/src/text_in_doc_preprocess.cc | 2 + scribo/src/text_in_picture_neg.cc | 2 + scribo/src/text_recognition_in_picture.cc | 2 + 122 files changed, 4918 insertions(+), 2034 deletions(-) create mode 100644 scribo/demo/viewer/config.cc create mode 100644 scribo/demo/viewer/config.hh create mode 100644 scribo/demo/viewer/defs.hh create mode 100644 scribo/demo/viewer/general_options.cc create mode 100644 scribo/demo/viewer/general_options.hh create mode 100644 scribo/demo/viewer/general_options.ui create mode 100644 scribo/demo/viewer/option_widget.cc create mode 100644 scribo/demo/viewer/option_widget.hh create mode 100644 scribo/demo/viewer/preferences_dialog.cc create mode 100644 scribo/demo/viewer/preferences_dialog.hh create mode 100644 scribo/demo/viewer/preferences_dialog.ui create mode 100644 scribo/demo/viewer/preprocess.cc create mode 100644 scribo/demo/viewer/preprocess.hh create mode 100644 scribo/demo/viewer/process.cc create mode 100644 scribo/demo/viewer/process.hh create mode 100644 scribo/demo/viewer/runner.cc create mode 100644 scribo/demo/viewer/runner.hh create mode 100644 scribo/demo/viewer/toolchain_options.cc create mode 100644 scribo/demo/viewer/toolchain_options.hh create mode 100644 scribo/demo/viewer/toolchain_options.ui create mode 100644 scribo/demo/xml2doc/Makefile.am rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/README (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/common.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/common.hh (100%) create mode 100644 scribo/demo/xml2doc/datarootdir.hh.in create mode 100644 scribo/demo/xml2doc/image_crop.cc create mode 100644 scribo/demo/xml2doc/image_crop.hh create mode 100644 scribo/demo/xml2doc/loader.cc create mode 100644 scribo/demo/xml2doc/loader.hh create mode 100644 scribo/demo/xml2doc/main.cc rename scribo/{sandbox/arthur/xml_transform/templates => demo/xml2doc/templates/bin}/ooconvert (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/css.css (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/main_base64.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/opendoc/css.css (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/opendoc/xsl.xsl (100%) create mode 100644 scribo/demo/xml2doc/templates/pdf/line.xsl rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/pdf/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/pdf/regions.xsl (100%) rename scribo/{sandbox/arthur/xml_transform/templates/pdf => demo/xml2doc/templates/svg}/line.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/svg/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/svg/regions.xsl (100%) create mode 100644 scribo/demo/xml2doc/xml_transform.cc create mode 100644 scribo/demo/xml2doc/xml_transform.hh delete mode 100644 scribo/sandbox/arthur/xml_transform/image_crop.cc delete mode 100644 scribo/sandbox/arthur/xml_transform/image_crop.hh delete mode 100644 scribo/sandbox/arthur/xml_transform/loader.cc delete mode 100644 scribo/sandbox/arthur/xml_transform/loader.hh delete mode 100644 scribo/sandbox/arthur/xml_transform/main.cc delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/svg/line.xsl delete mode 100755 scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh delete mode 100644 scribo/sandbox/arthur/xml_transform/xml_transform.cc delete mode 100644 scribo/sandbox/arthur/xml_transform/xml_transform.hh delete mode 100644 scribo/sandbox/arthur/xml_transform/xml_transform.pro create mode 100644 scribo/scribo/toolchain/internal/content_in_doc_functor.hh create mode 100644 scribo/scribo/toolchain/internal/text_in_doc_functor.hh create mode 100644 scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh create mode 100644 scribo/scribo/toolchain/internal/toolchain_functor.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0