[Olena-patches] branch exp/scribo-z updated: last-svn-commit-141-ga6a8d2a

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 exp/scribo-z has been updated discards ce69474de3375928b3bd460111356d419f6a966c (commit) discards 7b922a208b3587cd49009a40570556a7489e6d67 (commit) discards f97f87ab21572b65556b8ce6ad3e85e45bdade54 (commit) discards 3d900b511f6ae7a69e94fca37496b08001a5af26 (commit) discards fa4e901d4f50eaf5e6722fe1f59f3e31a6c6cad6 (commit) discards c79a06f6e3c83a117c2351a92b6ae285ce1bcddf (commit) discards d4c8eff509fe8cdd929bc870285d6f541cb0a1c3 (commit) discards 5da79fec92fd6243d7fcb18b6d82ee409e3db88d (commit) discards 38d6f4b283b93c22ab87f5af48022805fe3ac417 (commit) discards 939d9227392236f0140ee4f209c7f4de0610a495 (commit) discards 945a59425d822a366559fc6902c8fa7ba029bf7a (commit) discards 540f63088ec1703dd7549216a114bd78e337ea36 (commit) discards 0242b33a1e464b02a883109c413eb00fea7cec81 (commit) discards 8c3d422c9ba5d83d82bbb8d7934d8da13745f85c (commit) discards 8a4ccc7b6030e056d4fcb34d0b5e2d523df39007 (commit) discards 8ffa2cd611274d87846dfc38a901a0f57c86d667 (commit) discards 7a85156e4c3599dce998b6cf744a248cb00f45e2 (commit) discards 76fe8ddaa93e30ee334eef94a0e5e59805eb27dc (commit) discards 40008b1e746b1fd15007f8e67f5fe5670c088ada (commit) discards 916ce2389f402e615da841dc61ff9748175228a1 (commit) discards 00f283bf45bb76c8bc2b5890a410c711893164c5 (commit) discards c8df55aa82c119ef4a74dbf0329f734c28990154 (commit) discards 0c1fecd0788ea5b0d9201274118294edc1d0d017 (commit) discards 51911f2b8c73b9637fcb985f06d60c8d92c44a62 (commit) discards 9257884ecf526dc7da611db4864e0ad7b154271f (commit) discards 4f7c875dd1b5f3388e7f99694501e7f4683b8ed2 (commit) discards 44705979ad01252039fcaf8cdf90e04e1dea4e1c (commit) discards 8655a111b01696082f97d02d80d3ab4c7f29d9a5 (commit) discards f0b6bc87ebe17e8e37964a466c7e5f0813d4e262 (commit) via a6a8d2a44d746824876f24c53af69f83036ddaf3 (commit) via 810f0413346986f6e7fc86f513ee1df28f142418 (commit) via 33ffff60e3846bf4499c3eafaa2dfd37791fb4e2 (commit) via 31216d34c0c51609cbe6921cd0d285701d583e3b (commit) via db55e631a5d4be26186cf58f23d63c9ae8a1a88e (commit) via 080134d6115e902c66ee0eb866008d7ad8e161f8 (commit) via 40d518005c478e2b5640a04019fdbf84c6858d27 (commit) via cbbdf4e015a418723730e0173ae88377ab365f1e (commit) via ff15d075512aadb2cfa4e99d36d3fa080809822f (commit) via 12ddb9702902e9c12be67d23fad1053e320f151e (commit) via b8aaebae9a034fa3b39de284bd2677801bc15471 (commit) via cbbbffd5c0c474d94fdab9e79c90e0ea92ec185c (commit) via 99e2b8fc744f5ab029cee5c4fa8eb465750101af (commit) via 41c82626a63b343f4d54e620c3055c1db6bf91de (commit) via 8c069f07986676a26ea14a1daa4e623d75302cbc (commit) via ca67a57fcb8149672ea524e5d20cab138c9147d6 (commit) via 21af64ad3a6645b7c1e7afa3347ba545911affa1 (commit) via 24e4f689ffc6598a646431b8344fe3c7b6c73da5 (commit) via 04aef4bf80daa8b02650ad3b2479dfea0bfa666c (commit) via 3b8335a122ff4d071759346847666d62c702f2b4 (commit) via ff1e5aae555fb905fa33369c85c94b0b0108feaf (commit) via c7cb9f3cfb759b353cb92e62c9154c0607b9faa8 (commit) via 28453cfc46940eb2fa4e6bf993d0378a97b396a3 (commit) via f256a61a4a6aaabab1806c9f644bfd0005c3e857 (commit) via 464d58f97a427e842a704e17a6c50ca6a88e11f5 (commit) via 9c5c48319714b54f41adc49d4b5417294e8b6079 (commit) via 9d7a1cca8578a712714a94258d081b1a4e3d5d95 (commit) via a184c8106407ea7b3ce30dc14b1d548ac93813f2 (commit) via b826d4152097bfcb1138f05f647862c69f739769 (commit) via 32401e08eb7edab00e58069690e7371af8346fdd (commit) via 622c2395fcf4ecd00991ba4dfda4eddc49604ba1 (commit) via 752d8cae10e26fae6500a073893aa6aad2c85403 (commit) via d02047f7f328aa892cb80f57374f3c6ba6a3fdc1 (commit) via 8d47be1577e975889b17016f2fda968d79780b57 (commit) via 548b72e33fc2b5352a5ca511693a5ae43fd94cba (commit) via 11701a0cb30bfb85d57a07a94e88485ebd7c0c4a (commit) via 53a98117e4a7985a38bf6b708d99069ba17353aa (commit) via b54300a5ba958e308a8ff9edb32f685247999e2a (commit) via 6143a5ecb90ebfec07d7f7e4605e086f7bc61f83 (commit) via 2c6947d729838521895b4ef091210d1f82ad66fa (commit) via 4dad6c9aa0df1dddd07a4fa53cecc05b7287ff4a (commit) via d10f1a65daf8af9a90af3c937226f5c4d5b4750a (commit) via b1a4d275224ac708a9b05dae7915a27109886cc9 (commit) via 9f724b07283be1b79455a1b1a80c87205db7415d (commit) via 6adbc43e3b823f9eeb385911e3a47e5ec8c963e9 (commit) via 4a19598794bc2ebec9d40f2bdd02afe17e9c4f85 (commit) via c5e55142e34779d78be4944489e03949fa03551f (commit) via 1c596f64a2ca06f073d0a6d3e37fb334bc5f64c9 (commit) via 70ca845540984efeee0654cf989389d19dc9166b (commit) via 1f9aa31e2c16defebcda3f4a5689caf779756c2a (commit) via 8e0ab28cbc07882bc55a6e633928a7c46be9d018 (commit) via 643c15954419858896b0cd759737e7620c541fe8 (commit) via 899f6280731edf03ae30f23dcdd4745ecbe9a1f2 (commit) via 98cab34716892c5b65385589ab6c3edbd46f9710 (commit) via 482527bb90e7b716941dc1a9061a217c7ae8891d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (ce69474de3375928b3bd460111356d419f6a966c) \ N -- N -- N (a6a8d2a44d746824876f24c53af69f83036ddaf3) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- a6a8d2a src/README: New. 810f041 configure.ac: configure several directories in scribo/. 33ffff6 Improve Scribo demo. 31216d3 Small fixes. db55e63 Add the binarization tool submitted to H-DIBCO 2010. 080134d Update tools in scribo/src. 40d5180 Add a specific toolchain for Nepomuk integration. cbbdf4e Cleanup sample tools. ff15d07 toolchain/text_in_doc.hh: Introduce a new routine for extracting text in a document. 12ddb97 core/def/lbl_type.hh: Introduce a global label type. b8aaeba Improve line detection. cbbbffd io/text_boxes/save.hh: New. Save text boxes information. 99e2b8f Add a new deskew algorithm. 41c8262 Add crop tools. 8c069f0 Small fixes. ca67a57 Store OCR results in the line_info structure. 21af64a Improve debug outputs in Sauvola and make binarization tools compile again. 24e4f68 * mln/io/magick/load.hh: set minimum resolution for PDF files to 300DPI. 04aef4b Small fixes for Nuxeo/XWiki. 3b8335a text/merging.hh: Disable some debug. ff1e5aa Prepare DIA tools for Nuxeo/XWiki. c7cb9f3 Improve OCR recognition. 28453cf postprocessing/fill_object_holes.hh: New routine. f256a61 Add new routines to detect separators. 464d58f Add A first draft of a README in Scribo. 9c5c483 Move AFP's GUI into Scribo's demo directory. 9d7a1cc Introduce dmax_functor concept. a184c81 Small fixes in Scribo. b826d41 Fix few bugs. 32401e0 Improve the usability of AFP's GUI. 622c239 Add support for more image types. 752d8ca Improve options menu and progress dialog. d02047f Add a GUI for AFP's use case. 8d47be1 Improve dematerialization wizard. 548b72e Add a new demo in Scribo. 11701a0 io/xml/save_text_lines.hh: Fix XML output. 53a9811 debug/decision_image.hh: Add the anchor::Type as argument. b54300a Use anchor::Type in alignment routines' dispatch. 6143a5e Small fixes related to object_groups. 2c6947d Add init() member to object_links structure. 4dad6c9 scribo/src/text_in_photo_fast.cc: Group routine parameters in a global structure. d10f1a6 Add new Sauvola overloads and update examples. b1a4d27 Add support for various image types in text_in_photo_fast. 9f724b0 Improve dematerialization wizard. 6adbc43 Add a new demo in Scribo. 4a19598 Small fixes in Scribo. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 + build-aux/autotroll.mk | 108 +++ configure.ac | 11 +- m4/autotroll.m4 | 563 ++++++++++++++++ milena/ChangeLog | 189 ++++-- milena/mln/border/thickness.hh | 4 + milena/mln/canvas/labeling/blobs.hh | 17 +- milena/mln/core/alias/dpoint1d.hh | 4 + milena/mln/core/alias/dpoint2d.hh | 4 + milena/mln/core/alias/dpoint3d.hh | 4 + milena/mln/core/image/imorph/interpolated.hh | 13 +- milena/mln/core/point.hh | 51 ++- milena/mln/core/routine/extend.hh | 57 ++- milena/mln/fun/internal/x2x_linear_impl.hh | 20 +- milena/mln/fun/v2v/hsl_to_rgb.hh | 3 + milena/mln/fun/v2v/qt_rgb_to_int_u.hh | 71 ++ milena/mln/fun/x2x/composed.hh | 18 +- milena/mln/fun/x2x/rotation.hh | 5 +- milena/mln/fun/x2x/translation.hh | 6 +- milena/mln/geom/rotate.hh | 13 +- milena/mln/labeling/blobs.hh | 4 +- milena/mln/labeling/blobs_and_compute.hh | 31 +- milena/mln/labeling/compute.hh | 1 + milena/mln/literal/black.hh | 4 + milena/mln/literal/colors.hh | 7 +- milena/mln/literal/identity.hh | 4 + milena/mln/literal/one.hh | 3 + milena/mln/literal/origin.hh | 6 +- milena/mln/literal/white.hh | 4 + milena/mln/literal/zero.hh | 4 + milena/mln/subsampling/antialiased.hh | 19 +- milena/mln/tag/init.hh | 4 + milena/mln/trace/entering.hh | 3 + milena/mln/trace/quiet.hh | 5 +- milena/mln/value/internal/make_generic_name.hh | 1 + milena/mln/value/qt/rgb32.hh | 6 +- milena/mln/value/rgb.hh | 3 + milena/mln/value/sign.hh | 10 +- milena/tests/fun/v2v/Makefile.am | 9 + milena/tests/fun/v2v/qt_rgb_to_int_u.cc | 44 ++ scribo/ChangeLog | 243 +++++++ scribo/binarization/internal/first_pass_functor.hh | 31 +- scribo/binarization/sauvola_ms.hh | 98 +-- scribo/binarization/sauvola_ms_split.hh | 23 +- scribo/binarization/sauvola_threshold_image.hh | 120 ++++- .../binarization/sauvola_threshold_image_debug.hh | 29 +- scribo/convert/from_qimage.hh | 92 +++ scribo/core/def/lbl_type.hh | 48 ++ scribo/core/line_info.hh | 36 +- scribo/core/object_groups.hh | 14 +- scribo/debug/save_bboxes_image.hh | 2 +- scribo/demo/demat/demat.pro | 19 +- scribo/demo/demat/src/main.cc | 4 + scribo/demo/demat/src/main_window.cc | 48 +- scribo/demo/demat/src/main_window.hh | 5 + scribo/demo/demat/src/preprocessing_task.hh | 1 + scribo/demo/demat/src/runner.cc | 91 ++-- scribo/demo/demat/src/runner.hh | 1 + scribo/demo/demat/ui/main_window.ui | 15 + scribo/demo/review/src/main.cc | 13 +- scribo/demo/review/src/mainwindow.cc | 58 +- scribo/demo/review/src/mainwindow.hh | 2 +- scribo/demo/shared/src/crop_item.cc | 84 ++- scribo/demo/shared/src/crop_item.hh | 8 + scribo/demo/shared/src/image_viewer.cc | 79 ++- scribo/demo/shared/src/image_viewer.hh | 9 +- scribo/demo/shared/src/image_viewer.hxx | 31 + .../demo/shared/src/internal/interactive_scene.cc | 11 +- .../demo/shared/src/internal/interactive_scene.hh | 1 + scribo/demo/shared/ui/image_viewer.ui | 34 +- scribo/demo/wizard/src/load_page.cc | 1 + scribo/demo/wizard/src/main_window.cc | 10 +- scribo/demo/wizard/src/runner.cc | 6 +- scribo/filter/object_links_non_aligned_simple.hh | 4 +- scribo/io/text_boxes/save.hh | 102 +++ scribo/postprocessing/fill_object_holes.hh | 20 +- scribo/preprocessing/crop.hh | 84 +++ scribo/preprocessing/crop_without_localization.hh | 97 +++ scribo/preprocessing/denoise_bg.hh | 6 +- scribo/preprocessing/deskew.hh | 437 ++++++++++++ scribo/preprocessing/deskew_crop.hh | 187 ++++++ scribo/preprocessing/rotate_90.hh | 1 + scribo/preprocessing/unskew.hh | 115 ---- scribo/primitive/extract/lines_h_pattern.hh | 40 +- scribo/primitive/extract/lines_pattern.hh | 227 ++++++- scribo/primitive/extract/lines_v_pattern.hh | 39 +- scribo/primitive/group/from_double_link.hh | 1 - scribo/primitive/group/from_single_link.hh | 8 +- scribo/primitive/internal/find_root.hh | 9 +- .../link/with_single_right_link_dmax_ratio.hh | 1 + scribo/primitive/remove/separators.hh | 14 +- scribo/src/Makefile.am | 84 +-- scribo/src/README | 13 + scribo/src/binarization/Makefile.am | 11 +- scribo/src/binarization/fg_sauvola_ms.cc | 17 +- scribo/src/binarization/pgm_sauvola_ms.cc | 7 +- scribo/src/binarization/ppm_fg_sauvola_ms.cc | 16 +- scribo/src/binarization/ppm_sauvola_ms.cc | 13 +- scribo/src/binarization/ppm_sauvola_ms_split.cc | 8 +- scribo/src/binarization/sauvola_debug.cc | 19 +- scribo/src/binarization/sauvola_ms.cc | 15 +- scribo/src/binarization/sauvola_ms_debug.cc | 147 ++++ scribo/src/binarization/sauvola_ms_split.cc | 6 +- scribo/src/contest/Makefile.am | 23 + scribo/src/contest/hdibco-2010/Makefile.am | 27 + .../src/contest/hdibco-2010/sauvola_ms_hdibco.cc | 85 +++ scribo/src/multi_scale/Makefile.am | 26 - scribo/src/multi_scale/find_lines.cc | 180 ----- scribo/src/pbm_text_in_doc.cc | 132 ++++ scribo/src/postprocessing/Makefile.am | 26 + scribo/src/postprocessing/fill_object_holes.cc | 67 ++ scribo/src/preprocessing/Makefile.am | 32 +- scribo/src/preprocessing/denoise.cc | 69 -- scribo/src/preprocessing/denoise_bg.cc | 67 ++ scribo/src/preprocessing/denoise_fg.cc | 66 ++ scribo/src/preprocessing/subsample.cc | 16 +- scribo/src/text/Makefile.am | 18 +- scribo/src/text/pbm_lines_recognition.cc | 107 +++ scribo/src/text/pbm_recognition.cc | 20 +- scribo/src/text/recognition.cc | 101 --- scribo/src/text_in_article_pbm.cc | 381 ----------- scribo/src/text_in_article_preprocess.cc | 91 --- scribo/src/text_in_doc.cc | 304 --------- scribo/src/text_in_doc_ppm.cc | 322 --------- scribo/src/text_in_doc_preprocess.cc | 103 +++ scribo/src/text_in_photo.cc | 250 ------- scribo/src/text_in_photo_fast.cc | 704 ------------------- scribo/src/text_in_photo_invert.cc | 245 ------- scribo/src/text_in_photo_pbm_fast.cc | 441 ------------ scribo/src/text_in_photo_ppm.cc | 532 --------------- scribo/src/text_in_picture.cc | 706 ++++++++++++++++++++ scribo/subsampling/bilinear.hh | 2 +- scribo/test.cc | 44 -- scribo/tests/Makefile.am | 1 + scribo/tests/img/text_to_group.pgm | Bin 0 -> 3053 bytes scribo/tests/img/wildly.pbm | Bin 0 -> 2208 bytes scribo/tests/preprocessing/Makefile.am | 10 +- scribo/tests/preprocessing/crop.cc | 51 ++ .../preprocessing/crop_without_localization.cc | 55 ++ scribo/tests/preprocessing/deskew.cc | 52 ++ scribo/tests/preprocessing/unskew.cc | 44 -- scribo/tests/toolchain/Makefile.am | 23 + scribo/tests/toolchain/nepomuk/Makefile.am | 45 ++ scribo/tests/toolchain/nepomuk/text_extraction.cc | 44 ++ scribo/text/merging.hh | 2 +- scribo/text/recognition.hh | 55 +-- scribo/toolchain/nepomuk/text_extraction.hh | 160 +++++ scribo/toolchain/text_in_doc.hh | 294 ++++++++ scribo/upsampling/bs2x.hh | 4 +- 149 files changed, 5915 insertions(+), 4472 deletions(-) create mode 100644 build-aux/autotroll.mk create mode 100644 m4/autotroll.m4 create mode 100644 milena/mln/fun/v2v/qt_rgb_to_int_u.hh create mode 100644 milena/tests/fun/v2v/qt_rgb_to_int_u.cc create mode 100644 scribo/convert/from_qimage.hh create mode 100644 scribo/core/def/lbl_type.hh create mode 100644 scribo/demo/shared/src/image_viewer.hxx create mode 100644 scribo/io/text_boxes/save.hh create mode 100644 scribo/preprocessing/crop.hh create mode 100644 scribo/preprocessing/crop_without_localization.hh create mode 100644 scribo/preprocessing/deskew.hh create mode 100644 scribo/preprocessing/deskew_crop.hh delete mode 100644 scribo/preprocessing/unskew.hh create mode 100644 scribo/src/README create mode 100644 scribo/src/binarization/sauvola_ms_debug.cc create mode 100644 scribo/src/contest/Makefile.am create mode 100644 scribo/src/contest/hdibco-2010/Makefile.am create mode 100644 scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc delete mode 100644 scribo/src/multi_scale/Makefile.am delete mode 100644 scribo/src/multi_scale/find_lines.cc create mode 100644 scribo/src/pbm_text_in_doc.cc create mode 100644 scribo/src/postprocessing/Makefile.am create mode 100644 scribo/src/postprocessing/fill_object_holes.cc delete mode 100644 scribo/src/preprocessing/denoise.cc create mode 100644 scribo/src/preprocessing/denoise_bg.cc create mode 100644 scribo/src/preprocessing/denoise_fg.cc create mode 100644 scribo/src/text/pbm_lines_recognition.cc delete mode 100644 scribo/src/text/recognition.cc delete mode 100644 scribo/src/text_in_article_pbm.cc delete mode 100644 scribo/src/text_in_article_preprocess.cc delete mode 100644 scribo/src/text_in_doc.cc delete mode 100644 scribo/src/text_in_doc_ppm.cc create mode 100644 scribo/src/text_in_doc_preprocess.cc delete mode 100644 scribo/src/text_in_photo.cc delete mode 100644 scribo/src/text_in_photo_fast.cc delete mode 100644 scribo/src/text_in_photo_invert.cc delete mode 100644 scribo/src/text_in_photo_pbm_fast.cc delete mode 100644 scribo/src/text_in_photo_ppm.cc create mode 100644 scribo/src/text_in_picture.cc delete mode 100644 scribo/test.cc create mode 100644 scribo/tests/img/text_to_group.pgm create mode 100644 scribo/tests/img/wildly.pbm create mode 100644 scribo/tests/preprocessing/crop.cc create mode 100644 scribo/tests/preprocessing/crop_without_localization.cc create mode 100644 scribo/tests/preprocessing/deskew.cc delete mode 100644 scribo/tests/preprocessing/unskew.cc create mode 100644 scribo/tests/toolchain/Makefile.am create mode 100644 scribo/tests/toolchain/nepomuk/Makefile.am create mode 100644 scribo/tests/toolchain/nepomuk/text_extraction.cc create mode 100644 scribo/toolchain/nepomuk/text_extraction.hh create mode 100644 scribo/toolchain/text_in_doc.hh hooks/post-receive -- Olena, a generic and efficient image processing platform