- Olena-patches

last-svn-commit-456-g6ca68ab configure.ac: Set oln_with_* variables correctly
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 4 ++++ configure.ac | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a3e7db..b8a1e37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Set oln_with_* variables correctly. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Require Qt 4.x minimum to enable the use of Qt. 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index e782d82..9c9e263 100644 --- a/configure.ac +++ b/configure.ac @@ -234,7 +234,7 @@ if test "x$with_magickxx" != 'xyes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-magickxx=$with_magickxx " fi -have_magickxx='no' +oln_have_magickxx='no' MAGICKXX_CFLAGS="" MAGICKXX_LIBS="" MAGICKXX_PKG="" @@ -242,11 +242,11 @@ if test "x$with_magickxx" = 'xyes'; then AC_MSG_RESULT([]) AC_MSG_RESULT([* libMagick++]) AC_MSG_RESULT([---------------]) - PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], have_magickxx=yes, have_magickxx=no) + PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], oln_have_magickxx=yes, oln_have_magickxx=no) AC_MSG_RESULT([]) fi -if test "$have_magickxx" = 'yes'; then +if test "$oln_have_magickxx" = 'yes'; then AC_DEFINE([HAVE_MAGICKXX], 1, [Define to 1 if we can use libMagick++]) # Use standard variable names. MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" @@ -255,7 +255,7 @@ if test "$have_magickxx" = 'yes'; then AC_SUBST(MAGICKXX_LDFLAGS) fi -AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') +AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = 'xyes') #------------------------------------------------------------ @@ -292,6 +292,8 @@ OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], AC_MSG_RESULT([]) AC_MSG_RESULT([* Qt]) AC_MSG_RESULT([----]) + +oln_have_qt='no' AT_WITH_QT([+xml], [], [], AC_MSG_WARN([Qt dependent programs will be disabled.])) @@ -299,6 +301,7 @@ if test "x$QT_VERSION_MAJOR" != "x"; then AT_REQUIRE_QT_VERSION([4], AC_MSG_WARN([Your Qt version is too old! Qt dependent programs will be disabled.]), AC_DEFINE([HAVE_QT], 1, [Define to 1 if we can use Qt])) + oln_have_qt='yes' fi AM_CONDITIONAL([HAVE_QT], [test "x$QT_VERSION_MAJOR" == "x4"]) -- 1.5.6.5

1 0

last-svn-commit-455-ga9958fa headers.mk: Regen.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bc6cbd1..4b07835 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> Fix tests in Milena. diff --git a/milena/headers.mk b/milena/headers.mk index 6ee6d7f..b483024 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -159,6 +159,8 @@ mln/convert/to_fun.hh \ mln/convert/to_image.hh \ mln/convert/to_p_array.hh \ mln/convert/to_p_set.hh \ +mln/convert/to_qimage.hh \ +mln/convert/to_qimage_nocopy.hh \ mln/convert/to_upper_window.hh \ mln/convert/to_window.hh \ mln/core/a_point_of.hh \ @@ -447,6 +449,7 @@ mln/data/replace.hh \ mln/data/saturate.hh \ mln/data/sort_offsets.hh \ mln/data/sort_psites.hh \ +mln/data/split.hh \ mln/data/stretch.hh \ mln/data/to_enc.hh \ mln/data/transform.hh \ @@ -462,6 +465,7 @@ mln/debug/format.hh \ mln/debug/histo.hh \ mln/debug/iota.hh \ mln/debug/iota.spe.hh \ +mln/debug/mosaic.hh \ mln/debug/println.hh \ mln/debug/println.spe.hh \ mln/debug/println_with_border.hh \ @@ -470,10 +474,13 @@ mln/debug/put_word.hh \ mln/debug/quiet.hh \ mln/debug/slices_2d.hh \ mln/debug/superpose.hh \ +mln/debug/z_order.hh \ mln/display/all.hh \ mln/display/essential.hh \ mln/draw/all.hh \ mln/draw/box.hh \ +mln/draw/box_plain.hh \ +mln/draw/dashed_line.hh \ mln/draw/essential.hh \ mln/draw/line.hh \ mln/draw/plot.hh \ @@ -507,6 +514,8 @@ mln/fun/internal/resolve.hh \ mln/fun/internal/selector.hh \ mln/fun/internal/x2x_linear_impl.hh \ mln/fun/meta/impl.hh \ +mln/fun/n2v/all.hh \ +mln/fun/n2v/white_gaussian.hh \ mln/fun/ops.hh \ mln/fun/p2b/all.hh \ mln/fun/p2b/antilogy.hh \ @@ -546,6 +555,8 @@ mln/fun/v2v/inc.hh \ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ +mln/fun/v2v/qt_rgb_to_int_u.hh \ +mln/fun/v2v/rgb_to_int_u.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ mln/fun/v2w2v/all.hh \ @@ -591,6 +602,7 @@ mln/geom/chamfer.hh \ mln/geom/complex_geometry.hh \ mln/geom/delta.hh \ mln/geom/essential.hh \ +mln/geom/horizontal_symmetry.hh \ mln/geom/max_col.hh \ mln/geom/max_ind.hh \ mln/geom/max_row.hh \ @@ -612,6 +624,7 @@ mln/geom/size1d.hh \ mln/geom/size2d.hh \ mln/geom/size3d.hh \ mln/geom/translate.hh \ +mln/geom/vertical_symmetry.hh \ mln/graph/all.hh \ mln/graph/attribute/card.hh \ mln/graph/attribute/representative.hh \ @@ -624,6 +637,7 @@ mln/histo/all.hh \ mln/histo/array.hh \ mln/histo/compute.hh \ mln/histo/compute.spe.hh \ +mln/histo/equalize.hh \ mln/histo/essential.hh \ mln/histo/point_from_value.hh \ mln/io/abort.hh \ @@ -632,8 +646,10 @@ mln/io/cloud/all.hh \ mln/io/cloud/load.hh \ mln/io/cloud/save.hh \ mln/io/dicom/all.hh \ +mln/io/dicom/get_header.hh \ mln/io/dicom/load.hh \ mln/io/dump/all.hh \ +mln/io/dump/get_header.hh \ mln/io/dump/load.hh \ mln/io/dump/save.hh \ mln/io/essential.hh \ @@ -682,6 +698,10 @@ mln/io/ppm/load.hh \ mln/io/ppm/save.hh \ mln/io/ppms/all.hh \ mln/io/ppms/load.hh \ +mln/io/raw/all.hh \ +mln/io/raw/get_header.hh \ +mln/io/raw/load.hh \ +mln/io/raw/save.hh \ mln/io/tiff/all.hh \ mln/io/tiff/load.hh \ mln/io/txt/all.hh \ @@ -706,6 +726,7 @@ mln/labeling/relabel.hh \ mln/labeling/superpose.hh \ mln/labeling/value.hh \ mln/labeling/value.spe.hh \ +mln/labeling/value_and_compute.hh \ mln/labeling/wrap.hh \ mln/linear/all.hh \ mln/linear/ch_convolve.hh \ @@ -972,6 +993,7 @@ mln/set/inter.hh \ mln/set/sym_diff.hh \ mln/set/uni.hh \ mln/set/unique.hh \ +mln/subsampling/antialiased.hh \ mln/tag/all.hh \ mln/tag/essential.hh \ mln/tag/init.hh \ @@ -1198,6 +1220,7 @@ mln/value/internal/gray_f.hh \ mln/value/internal/integer.hh \ mln/value/internal/iterable_set.hh \ mln/value/internal/limits.hh \ +mln/value/internal/make_generic_name.hh \ mln/value/internal/value_like.hh \ mln/value/interval.hh \ mln/value/label.hh \ @@ -1209,6 +1232,7 @@ mln/value/mixin.hh \ mln/value/ops.hh \ mln/value/other.hh \ mln/value/proxy.hh \ +mln/value/qt/rgb32.hh \ mln/value/rgb.hh \ mln/value/rgb16.hh \ mln/value/rgb8.hh \ @@ -1236,6 +1260,7 @@ mln/win/octagon2d.hh \ mln/win/rectangle2d.hh \ mln/win/segment1d.hh \ mln/win/shift.hh \ +mln/win/sline3d.hh \ mln/win/sphere3d.hh \ mln/win/sym.hh \ mln/win/vline2d.hh \ -- 1.5.6.5

1 0

last-svn-commit-454-gbe773a9 Regen headers.mk and unit-tests.mk in Scribo.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 4 ---- scribo/tests/unit_test/unit-tests.mk | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index da50444..f1f4f72 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen headers.mk and unit-tests.mk in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Update READMEs. * README, diff --git a/scribo/headers.mk b/scribo/headers.mk index ce8700a..231742b 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -128,14 +128,11 @@ scribo/primitive/extract/vertical_separators.hh \ scribo/primitive/group/all.hh \ scribo/primitive/group/apply.hh \ scribo/primitive/group/from_double_link.hh \ -scribo/primitive/group/from_double_link_any.hh \ scribo/primitive/group/from_graph.hh \ scribo/primitive/group/from_single_link.hh \ -scribo/primitive/group/from_single_link_robust.hh \ scribo/primitive/internal/all.hh \ scribo/primitive/internal/find_graph_link.hh \ scribo/primitive/internal/find_root.hh \ -scribo/primitive/internal/find_root_robust.hh \ scribo/primitive/internal/have_link_valid.hh \ scribo/primitive/internal/is_link_valid.hh \ scribo/primitive/internal/rd.hh \ @@ -168,7 +165,6 @@ scribo/primitive/link/with_single_left_link_dmax_ratio.hh \ scribo/primitive/link/with_single_right_link.hh \ scribo/primitive/link/with_single_right_link_bottom.hh \ scribo/primitive/link/with_single_right_link_dmax_ratio.hh \ -scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh \ scribo/primitive/link/with_single_right_link_top.hh \ scribo/primitive/link/with_single_up_link.hh \ scribo/primitive/regroup/from_single_left_link.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 82664fa..ec63a26 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -1,6 +1,6 @@ ## Generated by ./build-aux/build_unit_test.sh, do not modify. -check_PROGRAMS = +check_PROGRAMS = # Starting a conditional unit test list. if HAVE_QT -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-453-g013ef3d
by lazzara＠lrde.epita.fr 11 Aug '10

11 Aug '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 exp/next has been updated via 013ef3d7c8f41542dc327c3f86d3741476c61aa5 (commit) via 6793cca44120828368141b44d52d589d47c72f72 (commit) from f7bc7e130d7cd61342e2a1bd50433caf8dc251e2 (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 ----------------------------------------------------------------- 013ef3d configure.ac: Require Qt 4.x minimum to enable the use of Qt. 6793cca m4/autotroll.m4: Fix an invalid generation of configure with autoconf 2.61. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++++++++ configure.ac | 39 +++++++++++++++++++++++++++++---------- m4/autotroll.m4 | 2 +- 3 files changed, 39 insertions(+), 11 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-453-g013ef3d configure.ac: Require Qt 4.x minimum to enable the use of Qt.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 4 ++++ configure.ac | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d45bfe7..0a3e7db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Require Qt 4.x minimum to enable the use of Qt. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * m4/autotroll.m4: Fix an invalid generation of configure with autoconf 2.61. diff --git a/configure.ac b/configure.ac index d5cdca0..e782d82 100644 --- a/configure.ac +++ b/configure.ac @@ -203,7 +203,10 @@ AC_MSG_RESULT([------------------------------------------------------------]) ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) -# CFITSIO library. +## ---------------- ## +## CFITSIO library. ## +## ---------------- ## + AC_MSG_RESULT([]) AC_MSG_RESULT([* libcfitsio]) AC_MSG_RESULT([------------]) @@ -211,7 +214,10 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) #------------------------------------------------------------ -# Magick++. + +## --------- ## +## Magick++. ## +## --------- ## # FIXME: We should handle Magick++ both with Magick++-config and # pkg-config? instead of OLN_WITH_LIB. See how other projects handle @@ -253,8 +259,10 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') #------------------------------------------------------------ +## ------------- ## +## TIFF library. ## +## ------------- ## -# TIFF library. AC_MSG_RESULT([]) AC_MSG_RESULT([* libtiff]) AC_MSG_RESULT([---------]) @@ -267,21 +275,32 @@ AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) -# Tesseract. +## ---------- ## +## Tesseract. ## +## ---------- ## + AC_MSG_RESULT([]) AC_MSG_RESULT([* Tesseract]) AC_MSG_RESULT([-----------]) -OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], - [tesseract], [TESSERACT]) +OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], + [TESSERACT]) + +## --- ## +## Qt. ## +## --- ## -# Qt. AC_MSG_RESULT([]) AC_MSG_RESULT([* Qt]) AC_MSG_RESULT([----]) AT_WITH_QT([+xml], [], [], - AC_DEFINE([HAVE_QT], 0, [Define to 1 if we can use Qt]), - AC_DEFINE([HAVE_QT], 1)) -AM_CONDITIONAL([HAVE_QT], [test x$QT_PATH != x]) + AC_MSG_WARN([Qt dependent programs will be disabled.])) + +if test "x$QT_VERSION_MAJOR" != "x"; then + AT_REQUIRE_QT_VERSION([4], AC_MSG_WARN([Your Qt version is too old! Qt dependent programs will be disabled.]), + AC_DEFINE([HAVE_QT], 1, + [Define to 1 if we can use Qt])) +fi +AM_CONDITIONAL([HAVE_QT], [test "x$QT_VERSION_MAJOR" == "x4"]) AC_MSG_RESULT([]) -- 1.5.6.5

1 0

last-svn-commit-452-g6793cca m4/autotroll.m4: Fix an invalid generation of configure with autoconf 2.61.
by Guillaume Lazzara 11 Aug '10

11 Aug '10

--- ChangeLog | 5 +++++ m4/autotroll.m4 | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d389263..d45bfe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/autotroll.m4: Fix an invalid generation of configure with + autoconf 2.61. + 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> * bootstrap: Update calls to build_unit_test.sh. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index d04619d..9a7a96e 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -531,7 +531,7 @@ AC_DEFUN([AT_REQUIRE_QT_VERSION], fi AC_SUBST([QT_VERSION], [$at_cv_QT_VERSION]) AS_VERSION_COMPARE([$QT_VERSION], [$1], - [AX_INSTEAD_IF([$2; break;], [This package requires Qt $1 or above.])]) + [AX_INSTEAD_IF([$2; break; ], [This package requires Qt $1 or above.])]) # Run the user code $3 -- 1.5.6.5

1 0

last-svn-commit-426-g332c9ac Have Tesseract-related parts of Scribo compile again.
by Roland Levillain 10 Aug '10

10 Aug '10

* scribo/debug/bboxes_enlarged_image.hh, * scribo/debug/looks_like_a_text_line_image.hh, * scribo/debug/mean_and_base_lines_image.hh, * scribo/debug/save_bboxes_image.hh: Catch up with scribo::line_info<L>'s current interface. Reported by Olivier Grisel <ogrisel(a)nuxeo.com>. --- scribo/ChangeLog | 11 +++++++++++ scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/debug/mean_and_base_lines_image.hh | 2 +- scribo/debug/save_bboxes_image.hh | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8ae04f3..08477d4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + + Have Tesseract-related parts of Scribo compile again. + + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_bboxes_image.hh: + Catch up with scribo::line_info<L>'s current interface. + Reported by Olivier Grisel <ogrisel(a)nuxeo.com>. + 2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> * core/component_set.hh: Add a new internal member diff --git a/scribo/debug/bboxes_enlarged_image.hh b/scribo/debug/bboxes_enlarged_image.hh index edd6d7a..2563a1a 100644 --- a/scribo/debug/bboxes_enlarged_image.hh +++ b/scribo/debug/bboxes_enlarged_image.hh @@ -104,7 +104,7 @@ namespace scribo image2d<value::rgb8> output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { if (text::internal::looks_like_a_text_line(lines(l))) mln::draw::box(output, lines(l).ebbox(), text_value); diff --git a/scribo/debug/looks_like_a_text_line_image.hh b/scribo/debug/looks_like_a_text_line_image.hh index a40c7d6..d8aacf0 100644 --- a/scribo/debug/looks_like_a_text_line_image.hh +++ b/scribo/debug/looks_like_a_text_line_image.hh @@ -98,7 +98,7 @@ namespace scribo image2d<value::rgb8> output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { if (text::internal::looks_like_a_text_line(lines(l))) mln::draw::box(output, lines(l).bbox(), text_value); diff --git a/scribo/debug/mean_and_base_lines_image.hh b/scribo/debug/mean_and_base_lines_image.hh index c4517c7..16a9aad 100644 --- a/scribo/debug/mean_and_base_lines_image.hh +++ b/scribo/debug/mean_and_base_lines_image.hh @@ -100,7 +100,7 @@ namespace scribo for_all_lines(l, lines) { - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { mln::draw::box(output, lines(l).bbox(), bbox_value); diff --git a/scribo/debug/save_bboxes_image.hh b/scribo/debug/save_bboxes_image.hh index ee479cc..f406e08 100644 --- a/scribo/debug/save_bboxes_image.hh +++ b/scribo/debug/save_bboxes_image.hh @@ -113,7 +113,7 @@ namespace scribo output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) mln::draw::box(output, lines(l).bbox(), value); mln::io::ppm::save(output, filename); -- 1.5.6.5

1 0

branch exp/next updated: last-svn-commit-451-gf7bc7e1
by lazzara＠lrde.epita.fr 10 Aug '10

10 Aug '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 exp/next has been updated discards d8c4e9470b3f962e8a97894431e7d5abc8772f53 (commit) via f7bc7e130d7cd61342e2a1bd50433caf8dc251e2 (commit) via 3c2ce9bb05ba3502ded2bab10d64d19d10607874 (commit) via d34c8dd49b1cafb412ed6acbc9a7df856e744ada (commit) via d5c383adedab294cc3158789aae82a358ed9f8b3 (commit) via 59987833613195d29de390caf60ea67a6d05c63c (commit) via 6bf37e8533f6fe5e1ccb3db532ac2c75624a3973 (commit) via 0545aad9399df4de95f731d4ea7ff019e996efb0 (commit) via 324908fe7cfefc7e54ebab5419c195ba111adecc (commit) via 5ee999b4a272ce703a8441e19d21914ee24a325c (commit) via af62462e491439835ff02d83dd051209402b9e15 (commit) via 8fed6fb92cee676f1b08171261d1c3c3998affca (commit) via cb1501f56a94071aa6087845f47acbbb4e359487 (commit) via 4aec8b7df9701854f4a66a5759cba50d417e2477 (commit) via 6626ff4c9b970161a3afb4771f6b5d5d17cbc054 (commit) via 5a13b71e549e3e14f56c654c2cf8060668ee651d (commit) via 8bd912698276dec80d783a2a0d1c45934b7197d6 (commit) via c05d4df52ff6ff73eab3e75343e39a4bd59c25b6 (commit) via a0961e1c87e3d8b33fc3f956f4e5eabf1301e3f4 (commit) via 087715863927fde36a5c856fa87ba071c978a824 (commit) via 8283ce59a3fbee4679d7d5e6909ac69da6dc9565 (commit) via 8559cd77490d273ee43ab417b4b666aeb12a3f4b (commit) via 6b43c06339028b02542e0214c12a976d10f8b8d7 (commit) via 52112930338d0852964eba2a09f7984c04d3b29e (commit) via c3c62f2274a751f3cc0846f81d8f54c8c50192fb (commit) via 26c8584dbd90fb2668efe2cfe260eefc65201055 (commit) via 332c9acf642b9ab88ed466b1ad0e0500fc2c885c (commit) via 5ba287436f0ad7ae908f61e666e01ea6fbb546a0 (commit) via 6270c8c945def50f6fb12b95511567e27b04db24 (commit) via 290ccbee439ac1cfc9dbd0185b60260d10dbd206 (commit) via 9fffc8073f5ea86ae99a3b5ddd23d53d10cdb429 (commit) via aa19b0aaad96157c6cbc41fd92ceb07b8f370063 (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 (d8c4e9470b3f962e8a97894431e7d5abc8772f53) \ N -- N -- N (f7bc7e130d7cd61342e2a1bd50433caf8dc251e2) 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 ----------------------------------------------------------------- f7bc7e1 Fix tests in Milena. 3c2ce9b Update READMEs. d34c8dd Update Scribo include paths. d5c383a Move Scribo includes in a specific directory. 5998783 bootstrap: Update calls to build_unit_test.sh. 6bf37e8 mln/io/dicom/get_header.hh: Add missing headers. 0545aad Setup conditional unit-tests in Scribo. 324908f Setup conditional unit-tests in Milena. 5ee999b build-aux/build_unit_test.sh: Add support for conditional unit-tests. af62462 tests/unit_test/disabled_tests: Update list of disabled tests. 8fed6fb Add a new rotation tool. cb1501f Remove deprecated references to object_image. 4aec8b7 Cleanup Makefiles. 6626ff4 Cleanup and improve text recognition. 5a13b71 Cleanup and make use of the new routines. 8bd9126 Make use of the new component_set interface. c05d4df Fix compilation of Scribo tools. a0961e1 Catch up with the current interface of scribo::debug::usage. 0877158 Replace the use of object_image with component_set. 8283ce5 Small fixes in Scribo. 8559cd7 Add missing includes and headers in AFP's dedicated code. 6b43c06 Add new routines in Scribo. 5211293 Remove deprecated files. c3c62f2 Small changes in Milena. 26c8584 Fix many tests in Scribo. 332c9ac Have Tesseract-related parts of Scribo compile again. 5ba2874 Replace deduced type 'point' by 'site'. 6270c8c core/component_set.hh: Add a new internal member valid_comps_image_(). 290ccbe filter/object_groups_with_holes.hh: Fix an invalid mismatch between groups ids and their related component ids and add more comments. 9fffc80 configure.ac: Improve configure's outputs for external library checks. aa19b0a Handle libMagick++ dependency with pkg-config. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 23 +- INSTALL | 200 ++++- bootstrap | 11 +- build-aux/build_unit_test.sh | 192 ++++- configure.ac | 77 ++- m4/pkg.m4 | 155 ++++ milena/ChangeLog | 64 ++ milena/mln/accu/internal/base.hh | 4 +- milena/mln/accu/math/sum.hh | 3 +- milena/mln/core/point.hh | 6 +- milena/mln/data/paste_without_localization.hh | 1 + milena/mln/geom/max_col.hh | 8 +- milena/mln/geom/max_row.hh | 8 +- milena/mln/geom/min_col.hh | 8 +- milena/mln/geom/min_row.hh | 8 +- milena/mln/geom/rotate.hh | 93 ++- milena/mln/io/dicom/get_header.hh | 7 + milena/mln/labeling/blobs_and_compute.hh | 3 + milena/mln/labeling/flat_zones.hh | 34 +- milena/tests/geom/rotate.cc | 16 +- milena/tests/labeling/blobs_and_compute.cc | 17 +- milena/tests/labeling/colorize.cc | 6 +- milena/tests/labeling/flat_zones.cc | 4 +- milena/tests/labeling/foreground.cc | 4 +- milena/tests/labeling/relabel.cc | 6 +- milena/tests/unit_test/Makefile.am | 16 +- milena/tests/unit_test/cond_tests_cfitsio | 2 + milena/tests/unit_test/cond_tests_gdcm | 3 + milena/tests/unit_test/cond_tests_magickxx | 3 + milena/tests/unit_test/cond_tests_tiff | 2 + milena/tests/unit_test/disabled_tests | 10 - milena/tests/unit_test/unit-tests.mk | 76 ++- scribo/ChangeLog | 773 ++++++++++++++++ scribo/Makefile.am | 4 +- scribo/README | 17 +- scribo/all.hh | 51 -- scribo/binarization/internal/first_pass_functor.hh | 168 ---- scribo/convert/from_qimage.hh | 92 -- scribo/core/component_info.hh | 203 ----- scribo/core/component_set.hh | 576 ------------ scribo/core/erase_objects.hh | 86 -- scribo/core/internal/link_functor_base.hh | 119 --- scribo/core/macros.hh | 61 -- scribo/core/object_image.hh | 38 - scribo/core/tag/component.hh | 118 --- scribo/core/tag/line.hh | 213 ----- scribo/debug/bboxes_enlarged_image.hh | 136 --- scribo/debug/decision_image.hh | 180 ---- scribo/debug/highlight_text_area.hh | 255 ------ scribo/debug/links_decision_image.hh | 109 --- scribo/debug/looks_like_a_text_line_image.hh | 130 --- scribo/debug/mean_and_base_lines_image.hh | 147 ---- scribo/debug/save_bboxes_image.hh | 142 --- scribo/debug/save_linked_bboxes_image.hh | 291 ------ scribo/debug/save_object_diff.hh | 98 --- scribo/debug/several_links_decision_image.hh | 185 ---- scribo/demo/demat/demat.pro | 2 +- scribo/demo/wizard/wizard.pro | 2 +- scribo/draw/bounding_box_links.hh | 404 --------- scribo/draw/bounding_boxes.hh | 116 --- scribo/filter/internal/compute.hh | 147 ---- scribo/filter/object_groups_size_ratio.hh | 105 --- scribo/filter/object_groups_with_holes.hh | 310 ------- scribo/filter/object_links_bbox_w_ratio.hh | 97 -- scribo/filter/object_links_center_aligned.hh | 113 --- scribo/filter/object_links_left_aligned.hh | 122 --- scribo/filter/object_links_non_aligned_simple.hh | 132 --- scribo/filter/object_links_right_aligned.hh | 121 --- scribo/filter/objects_h_thick.hh | 196 ----- scribo/filter/objects_h_thin.hh | 192 ---- scribo/filter/objects_size_ratio.hh | 120 --- scribo/filter/objects_small.hh | 160 ---- scribo/filter/objects_thick.hh | 191 ---- scribo/filter/objects_thin.hh | 190 ---- scribo/filter/objects_v_thick.hh | 196 ----- scribo/filter/objects_v_thin.hh | 193 ---- scribo/filter/objects_with_holes.hh | 580 ------------ scribo/headers.mk | 344 +++++--- scribo/io/xml/save.hh | 249 ------ scribo/make/all.hh | 49 - scribo/make/text.hh | 180 ---- scribo/postprocessing/fill_object_holes.hh | 408 --------- scribo/preprocessing/all.hh | 46 - scribo/preprocessing/crop_without_localization.hh | 97 -- scribo/preprocessing/denoise_bg.hh | 156 ---- scribo/preprocessing/denoise_fg.hh | 131 --- scribo/preprocessing/deskew.hh | 437 --------- scribo/preprocessing/deskew_crop.hh | 187 ---- scribo/preprocessing/split_bg_fg.hh | 340 ------- scribo/primitive/extract/all.hh | 68 -- scribo/primitive/extract/lines_h_single.hh | 202 ----- .../primitive/extract/lines_h_thick_and_single.hh | 152 ---- scribo/primitive/extract/lines_pattern.hh | 297 ------- scribo/primitive/extract/lines_v_single.hh | 196 ----- .../primitive/extract/lines_v_thick_and_single.hh | 150 ---- scribo/primitive/group/all.hh | 57 -- scribo/primitive/group/from_double_link.hh | 127 --- scribo/primitive/group/from_graph.hh | 179 ---- scribo/primitive/internal/all.hh | 57 -- scribo/primitive/internal/find_graph_link.hh | 110 --- scribo/primitive/internal/is_link_valid.hh | 81 -- scribo/primitive/internal/update_link_array.hh | 105 --- scribo/primitive/link/all.hh | 60 -- scribo/primitive/link/compute_several.hh | 117 --- scribo/primitive/link/internal/anchors_3.hh | 147 ---- scribo/primitive/link/internal/compute_anchor.hh | 249 ------ .../primitive/link/internal/dmax_functor_base.hh | 100 --- .../primitive/link/internal/find_several_links.hh | 137 --- .../primitive/link/internal/link_functor_base.hh | 535 ------------ .../primitive/link/internal/link_ms_dmax_base.hh | 164 ---- .../link/internal/link_ms_dmax_ratio_base.hh | 170 ---- .../link/internal/link_several_dmax_base.hh | 265 ------ scribo/primitive/link/with_graph.hh | 123 --- scribo/primitive/link/with_rag.hh | 99 --- scribo/primitive/link/with_several_graphes.hh | 126 --- scribo/primitive/link/with_several_left_links.hh | 164 ---- .../link/with_several_right_closest_links.hh | 215 ----- scribo/primitive/link/with_several_right_links.hh | 166 ---- scribo/primitive/link/with_single_down_link.hh | 183 ---- scribo/primitive/link/with_single_up_link.hh | 183 ---- scribo/primitive/regroup/from_single_left_link.hh | 140 --- scribo/primitive/remove/separators.hh | 112 --- scribo/scribo.mk | 6 +- scribo/scribo/all.hh | 53 ++ scribo/scribo/binarization/all.hh | 55 ++ .../{ => scribo}/binarization/global_threshold.hh | 0 .../binarization/global_threshold_auto.hh | 0 .../binarization/internal/first_pass_functor.hh | 170 ++++ .../{ => scribo}/binarization/local_threshold.hh | 0 scribo/{ => scribo}/binarization/sauvola.hh | 0 scribo/{ => scribo}/binarization/sauvola_ms.hh | 0 .../{ => scribo}/binarization/sauvola_ms_split.hh | 0 .../binarization/sauvola_threshold_image.hh | 0 .../binarization/sauvola_threshold_image_debug.hh | 0 scribo/{ => scribo}/canvas/integral_browsing.hh | 0 scribo/scribo/convert/from_qimage.hh | 93 ++ scribo/{ => scribo}/core/all.hh | 0 scribo/{ => scribo}/core/central_sites.hh | 0 scribo/scribo/core/component_info.hh | 203 +++++ scribo/scribo/core/component_set.hh | 606 +++++++++++++ scribo/{ => scribo}/core/concept/dmax_functor.hh | 0 scribo/{ => scribo}/core/concept/link_functor.hh | 0 scribo/{ => scribo}/core/def/lbl_type.hh | 0 scribo/scribo/core/erase_objects.hh | 86 ++ scribo/{ => scribo}/core/init_integral_image.hh | 0 scribo/{ => scribo}/core/line_info.hh | 0 scribo/{ => scribo}/core/line_set.hh | 0 scribo/scribo/core/macros.hh | 64 ++ scribo/{ => scribo}/core/object_groups.hh | 0 scribo/{ => scribo}/core/object_links.hh | 0 scribo/{ => scribo}/core/tag/anchor.hh | 0 scribo/scribo/core/tag/component.hh | 121 +++ scribo/scribo/core/tag/line.hh | 216 +++++ .../{ => scribo}/debug/alignment_decision_image.hh | 0 scribo/{ => scribo}/debug/all.hh | 0 scribo/scribo/debug/bboxes_enlarged_image.hh | 136 +++ scribo/{ => scribo}/debug/char_space_image.hh | 0 scribo/scribo/debug/decision_image.hh | 183 ++++ scribo/scribo/debug/highlight_text_area.hh | 305 +++++++ scribo/{ => scribo}/debug/line_info_image.hh | 0 scribo/scribo/debug/links_decision_image.hh | 111 +++ .../scribo/debug/looks_like_a_text_line_image.hh | 130 +++ scribo/scribo/debug/mean_and_base_lines_image.hh | 149 ++++ scribo/scribo/debug/save_bboxes_image.hh | 174 ++++ scribo/scribo/debug/save_comp_diff.hh | 105 +++ scribo/{ => scribo}/debug/save_label_image.hh | 0 scribo/scribo/debug/save_linked_bboxes_image.hh | 277 ++++++ scribo/{ => scribo}/debug/save_table_image.hh | 0 .../scribo/debug/several_links_decision_image.hh | 179 ++++ scribo/scribo/debug/text_areas_image.hh | 132 +++ scribo/{ => scribo}/debug/usage.hh | 0 scribo/{ => scribo}/draw/all.hh | 0 scribo/scribo/draw/bounding_box_links.hh | 340 +++++++ scribo/scribo/draw/bounding_boxes.hh | 117 +++ scribo/{ => scribo}/draw/groups_bboxes.hh | 0 .../estim/object_groups_v_thickness.hh | 0 scribo/{ => scribo}/filter/all.hh | 0 scribo/{ => scribo}/filter/common/objects_photo.hh | 0 .../filter/internal/alignment_angle.hh | 0 .../filter/internal/component_aligned.hh | 0 scribo/scribo/filter/internal/compute.hh | 147 ++++ scribo/scribo/filter/object_groups_size_ratio.hh | 105 +++ scribo/{ => scribo}/filter/object_groups_small.hh | 0 .../filter/object_groups_v_thickness.hh | 0 scribo/scribo/filter/object_groups_with_holes.hh | 341 ++++++++ .../filter/object_links_bbox_h_ratio.hh | 0 .../filter/object_links_bbox_overlap.hh | 0 .../{ => scribo}/filter/object_links_bbox_ratio.hh | 0 scribo/scribo/filter/object_links_bbox_w_ratio.hh | 95 ++ .../filter/object_links_bottom_aligned.hh | 0 .../scribo/filter/object_links_center_aligned.hh | 109 +++ scribo/scribo/filter/object_links_left_aligned.hh | 118 +++ .../filter/object_links_non_aligned_simple.hh | 131 +++ scribo/scribo/filter/object_links_right_aligned.hh | 118 +++ .../filter/object_links_top_aligned.hh | 0 scribo/scribo/filter/objects_h_thick.hh | 192 ++++ scribo/scribo/filter/objects_h_thin.hh | 196 +++++ scribo/{ => scribo}/filter/objects_large.hh | 0 scribo/scribo/filter/objects_size_ratio.hh | 125 +++ scribo/scribo/filter/objects_small.hh | 150 ++++ scribo/scribo/filter/objects_thick.hh | 191 ++++ scribo/scribo/filter/objects_thin.hh | 191 ++++ scribo/scribo/filter/objects_v_thick.hh | 192 ++++ scribo/scribo/filter/objects_v_thin.hh | 196 +++++ scribo/scribo/filter/objects_with_holes.hh | 466 ++++++++++ scribo/{ => scribo}/fun/v2b/label_to_bool.hh | 0 .../{ => scribo}/fun/v2b/objects_large_filter.hh | 0 .../{ => scribo}/fun/v2b/objects_small_filter.hh | 0 scribo/{ => scribo}/io/text_boxes/save.hh | 0 scribo/scribo/io/xml/save.hh | 253 ++++++ scribo/scribo/make/all.hh | 49 + scribo/{ => scribo}/make/debug_filename.hh | 0 scribo/{ => scribo}/make/influence_zone_graph.hh | 0 scribo/scribo/postprocessing/all.hh | 48 + scribo/scribo/postprocessing/fill_object_holes.hh | 409 +++++++++ scribo/scribo/preprocessing/all.hh | 63 ++ scribo/{ => scribo}/preprocessing/crop.hh | 0 .../preprocessing/crop_without_localization.hh | 99 +++ scribo/{ => scribo}/preprocessing/denoise.hh | 0 scribo/scribo/preprocessing/denoise_bg.hh | 159 ++++ scribo/scribo/preprocessing/denoise_fg.hh | 118 +++ scribo/scribo/preprocessing/deskew.hh | 439 ++++++++++ scribo/scribo/preprocessing/deskew_crop.hh | 187 ++++ .../preprocessing/homogeneous_contrast.hh | 0 scribo/{ => scribo}/preprocessing/rotate_90.hh | 0 scribo/scribo/preprocessing/split_bg_fg.hh | 341 ++++++++ scribo/{ => scribo}/primitive/all.hh | 0 scribo/scribo/primitive/extract/all.hh | 68 ++ scribo/{ => scribo}/primitive/extract/canvas.hh | 0 scribo/{ => scribo}/primitive/extract/cells.hh | 0 .../{ => scribo}/primitive/extract/components.hh | 0 .../primitive/extract/horizontal_separators.hh | 0 .../primitive/extract/lines_discontinued.hh | 0 .../primitive/extract/lines_h_discontinued.hh | 0 .../primitive/extract/lines_h_pattern.hh | 0 scribo/scribo/primitive/extract/lines_h_single.hh | 202 +++++ .../primitive/extract/lines_h_thick.hh | 0 .../primitive/extract/lines_h_thick_and_single.hh | 151 ++++ scribo/scribo/primitive/extract/lines_pattern.hh | 298 +++++++ .../{ => scribo}/primitive/extract/lines_thick.hh | 0 .../primitive/extract/lines_v_discontinued.hh | 0 .../primitive/extract/lines_v_pattern.hh | 0 scribo/scribo/primitive/extract/lines_v_single.hh | 198 +++++ .../primitive/extract/lines_v_thick.hh | 0 .../primitive/extract/lines_v_thick_and_single.hh | 150 ++++ .../{ => scribo}/primitive/extract/separators.hh | 0 .../primitive/extract/vertical_separators.hh | 0 scribo/scribo/primitive/group/all.hh | 58 ++ scribo/{ => scribo}/primitive/group/apply.hh | 0 scribo/scribo/primitive/group/from_double_link.hh | 125 +++ scribo/scribo/primitive/group/from_graph.hh | 180 ++++ .../primitive/group/from_single_link.hh | 0 scribo/scribo/primitive/internal/all.hh | 57 ++ .../scribo/primitive/internal/find_graph_link.hh | 115 +++ .../{ => scribo}/primitive/internal/find_root.hh | 0 .../primitive/internal/have_link_valid.hh | 0 scribo/scribo/primitive/internal/is_link_valid.hh | 81 ++ scribo/{ => scribo}/primitive/internal/rd.hh | 0 .../primitive/internal/update_graph_link.hh | 0 scribo/scribo/primitive/link/all.hh | 61 ++ scribo/{ => scribo}/primitive/link/compute.hh | 0 scribo/scribo/primitive/link/compute_several.hh | 117 +++ .../primitive/link/internal/compute_anchor.hh | 252 ++++++ .../primitive/link/internal/dmax_default.hh | 0 .../primitive/link/internal/dmax_functor_base.hh | 102 +++ .../link/internal/dmax_width_and_height.hh | 0 .../primitive/link/internal/dmax_width_only.hh | 0 .../primitive/link/internal/find_link.hh | 0 .../primitive/link/internal/find_several_links.hh | 137 +++ .../primitive/link/internal/link_functor_base.hh | 516 +++++++++++ .../link/internal/link_several_dmax_base.hh | 291 ++++++ .../link/internal/link_single_dmax_base.hh | 0 .../link/internal/link_single_dmax_ratio_base.hh | 0 .../primitive/link/merge_double_link.hh | 0 scribo/scribo/primitive/link/with_graph.hh | 121 +++ scribo/scribo/primitive/link/with_rag.hh | 103 +++ .../scribo/primitive/link/with_several_graphes.hh | 127 +++ .../primitive/link/with_several_left_links.hh | 141 +++ .../link/with_several_right_closest_links.hh | 207 +++++ .../primitive/link/with_several_right_links.hh | 143 +++ .../link/with_several_right_links_overlap.hh | 0 .../scribo/primitive/link/with_single_down_link.hh | 181 ++++ .../primitive/link/with_single_left_link.hh | 0 .../link/with_single_left_link_dmax_ratio.hh | 0 .../primitive/link/with_single_right_link.hh | 0 .../link/with_single_right_link_bottom.hh | 0 .../link/with_single_right_link_dmax_ratio.hh | 0 .../primitive/link/with_single_right_link_top.hh | 0 .../scribo/primitive/link/with_single_up_link.hh | 181 ++++ .../primitive/regroup/from_single_left_link.hh | 144 +++ .../regroup/from_single_left_link_wrt_h_ratio.hh | 153 ++++ scribo/scribo/primitive/remove/separators.hh | 114 +++ scribo/scribo/subsampling/bilinear.hh | 119 +++ scribo/{ => scribo}/subsampling/integral.hh | 0 .../subsampling/integral_single_image.hh | 0 scribo/scribo/table/align_lines_horizontaly.hh | 106 +++ scribo/{ => scribo}/table/align_lines_verticaly.hh | 0 scribo/{ => scribo}/table/all.hh | 0 .../{ => scribo}/table/connect_horizontal_lines.hh | 0 .../{ => scribo}/table/connect_vertical_lines.hh | 0 scribo/scribo/table/erase.hh | 99 +++ scribo/scribo/table/extract.hh | 118 +++ scribo/scribo/table/internal/align_lines.hh | 199 +++++ scribo/{ => scribo}/table/internal/all.hh | 0 .../{ => scribo}/table/internal/connect_lines.hh | 0 scribo/{ => scribo}/table/internal/repair_lines.hh | 0 scribo/scribo/table/rebuild.hh | 158 ++++ .../{ => scribo}/table/repair_horizontal_lines.hh | 0 scribo/{ => scribo}/table/repair_vertical_lines.hh | 0 scribo/{ => scribo}/text/all.hh | 0 scribo/{ => scribo}/text/clean.hh | 0 scribo/{ => scribo}/text/clean_inplace.hh | 0 scribo/{ => scribo}/text/extract_lines.hh | 0 scribo/{ => scribo}/text/look_like_text_lines.hh | 0 scribo/scribo/text/merging.hh | 922 ++++++++++++++++++++ scribo/{ => scribo}/text/recognition.hh | 0 scribo/scribo/toolchain/nepomuk/text_extraction.hh | 163 ++++ scribo/{ => scribo}/toolchain/text_in_doc.hh | 0 scribo/{ => scribo}/upsampling/bs2x.hh | 0 scribo/scribo/upsampling/eagle.hh | 149 ++++ scribo/src/Makefile.am | 9 +- scribo/src/README | 28 +- scribo/src/afp/components.hh | 69 ++- scribo/src/afp/link.hh | 49 +- scribo/src/afp/regroup.hh | 36 + scribo/src/contest/hdibco-2010/Makefile.am | 4 +- scribo/src/debug/show_links_bbox_overlap.cc | 19 +- scribo/src/debug/show_links_bottom_aligned.cc | 6 +- scribo/src/debug/show_links_center_aligned.cc | 19 +- .../show_links_left_right_links_validation.cc | 1 - scribo/src/debug/show_links_non_h_aligned.cc | 25 +- scribo/src/debug/show_links_several_right.cc | 27 +- .../src/debug/show_links_several_right_overlap.cc | 36 +- scribo/src/debug/show_links_single_down.cc | 31 +- .../debug/show_links_single_down_left_aligned.cc | 24 +- .../debug/show_links_single_down_right_aligned.cc | 27 +- scribo/src/debug/show_links_single_left.cc | 33 +- .../src/debug/show_links_single_left_dmax_ratio.cc | 44 +- scribo/src/debug/show_links_single_right.cc | 35 +- .../debug/show_links_single_right_dmax_ratio.cc | 36 +- scribo/src/debug/show_links_single_up.cc | 37 +- .../src/debug/show_links_single_up_left_aligned.cc | 27 +- .../debug/show_links_single_up_right_aligned.cc | 27 +- scribo/src/debug/show_links_top_aligned.cc | 12 +- scribo/src/debug/show_objects_large.cc | 27 +- scribo/src/debug/show_objects_large_small.cc | 41 +- scribo/src/debug/show_objects_small.cc | 27 +- scribo/src/debug/show_objects_thick.cc | 26 +- scribo/src/debug/show_objects_thin.cc | 24 +- scribo/src/filter/objects_large.cc | 30 +- scribo/src/filter/objects_small.cc | 22 +- scribo/src/filter/objects_thick.cc | 30 +- scribo/src/filter/objects_thin.cc | 30 +- scribo/src/filter/objects_with_holes.cc | 27 +- scribo/src/filter/objects_with_holes_pgm.cc | 23 +- scribo/src/misc/negate.cc | 5 +- scribo/src/misc/superpose.cc | 7 +- scribo/src/pbm_lines_in_doc.cc | 299 ------- scribo/src/preprocessing/Makefile.am | 51 +- scribo/src/preprocessing/preprocess.cc | 27 +- scribo/src/preprocessing/rotate.cc | 68 ++ scribo/src/preprocessing/rotate_90.cc | 30 +- scribo/src/preprocessing/split_bg_fg.cc | 14 +- scribo/src/preprocessing/unskew.cc | 22 +- .../extract/extract_discontinued_hlines.cc | 26 +- .../extract/extract_discontinued_lines.cc | 47 +- .../extract/extract_discontinued_vlines.cc | 27 +- .../src/primitive/extract/extract_thick_hlines.cc | 25 +- .../src/primitive/extract/extract_thick_vlines.cc | 25 +- scribo/src/primitive/extract/lines_pattern.cc | 6 +- .../src/primitive/find/find_discontinued_lines.cc | 18 +- scribo/src/primitive/find/find_pattern_lines.cc | 10 +- scribo/src/primitive/find/find_single_lines.cc | 35 +- .../primitive/find/find_thick_and_single_lines.cc | 29 +- scribo/src/primitive/find/find_thick_lines.cc | 20 +- scribo/src/primitive/group/Makefile.am | 15 +- .../src/primitive/group/group_from_double_link.cc | 62 +- .../group/group_from_double_several_links.cc | 34 +- .../group/group_from_several_left_links.cc | 32 +- .../src/primitive/group/group_from_single_link.cc | 62 +- scribo/src/table/erase.cc | 15 +- scribo/src/table/extract.cc | 7 +- scribo/src/text/cleantxt.cc | 45 +- scribo/src/text_in_picture.cc | 128 ++-- scribo/src/text_recognition_in_picture.cc | 133 ++-- scribo/subsampling/bilinear.hh | 114 --- scribo/table/align_lines_horizontaly.hh | 101 --- scribo/table/erase.hh | 101 --- scribo/table/extract.hh | 116 --- scribo/table/internal/align_lines.hh | 196 ----- scribo/table/rebuild.hh | 157 ---- scribo/tests/Makefile.am | 5 +- scribo/tests/core/Makefile.am | 8 +- scribo/tests/core/object_image.cc | 72 -- scribo/tests/filter/objects_with_holes.cc | 67 +- scribo/tests/filter/small_and_large_bboxes.cc | 67 +- scribo/tests/preprocessing/crop.cc | 5 +- .../preprocessing/crop_without_localization.cc | 5 +- scribo/tests/preprocessing/deskew.cc | 4 +- scribo/tests/preprocessing/rotate_90.cc | 2 +- scribo/tests/table/extract_lines_with_rank.cc | 5 +- scribo/tests/table/repair_lines.cc | 5 +- scribo/tests/tests.mk | 23 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 2 +- scribo/tests/unit_test/Makefile.am | 27 +- scribo/tests/unit_test/build_unit_test.sh | 85 -- scribo/tests/unit_test/cond_tests_qt | 1 + .../tests/unit_test/cond_tests_qt_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + scribo/tests/unit_test/disabled_tests | 3 +- scribo/tests/unit_test/unit-tests.mk | 310 ++------ scribo/text/merging.hh | 922 -------------------- scribo/toolchain/nepomuk/text_extraction.hh | 160 ---- scribo/upsampling/eagle.hh | 145 --- 414 files changed, 19260 insertions(+), 18599 deletions(-) create mode 100644 m4/pkg.m4 create mode 100644 milena/tests/unit_test/cond_tests_cfitsio create mode 100644 milena/tests/unit_test/cond_tests_gdcm create mode 100644 milena/tests/unit_test/cond_tests_magickxx create mode 100644 milena/tests/unit_test/cond_tests_tiff delete mode 100644 scribo/all.hh delete mode 100644 scribo/binarization/internal/first_pass_functor.hh delete mode 100644 scribo/convert/from_qimage.hh delete mode 100644 scribo/core/component_info.hh delete mode 100644 scribo/core/component_set.hh delete mode 100644 scribo/core/erase_objects.hh delete mode 100644 scribo/core/internal/link_functor_base.hh delete mode 100644 scribo/core/macros.hh delete mode 100644 scribo/core/object_image.hh delete mode 100644 scribo/core/tag/component.hh delete mode 100644 scribo/core/tag/line.hh delete mode 100644 scribo/debug/bboxes_enlarged_image.hh delete mode 100644 scribo/debug/decision_image.hh delete mode 100644 scribo/debug/highlight_text_area.hh delete mode 100644 scribo/debug/links_decision_image.hh delete mode 100644 scribo/debug/looks_like_a_text_line_image.hh delete mode 100644 scribo/debug/mean_and_base_lines_image.hh delete mode 100644 scribo/debug/save_bboxes_image.hh delete mode 100644 scribo/debug/save_linked_bboxes_image.hh delete mode 100644 scribo/debug/save_object_diff.hh delete mode 100644 scribo/debug/several_links_decision_image.hh delete mode 100644 scribo/draw/bounding_box_links.hh delete mode 100644 scribo/draw/bounding_boxes.hh delete mode 100644 scribo/filter/internal/compute.hh delete mode 100644 scribo/filter/object_groups_size_ratio.hh delete mode 100644 scribo/filter/object_groups_with_holes.hh delete mode 100644 scribo/filter/object_links_bbox_w_ratio.hh delete mode 100644 scribo/filter/object_links_center_aligned.hh delete mode 100644 scribo/filter/object_links_left_aligned.hh delete mode 100644 scribo/filter/object_links_non_aligned_simple.hh delete mode 100644 scribo/filter/object_links_right_aligned.hh delete mode 100644 scribo/filter/objects_h_thick.hh delete mode 100644 scribo/filter/objects_h_thin.hh delete mode 100644 scribo/filter/objects_size_ratio.hh delete mode 100644 scribo/filter/objects_small.hh delete mode 100644 scribo/filter/objects_thick.hh delete mode 100644 scribo/filter/objects_thin.hh delete mode 100644 scribo/filter/objects_v_thick.hh delete mode 100644 scribo/filter/objects_v_thin.hh delete mode 100644 scribo/filter/objects_with_holes.hh delete mode 100644 scribo/io/xml/save.hh delete mode 100644 scribo/make/all.hh delete mode 100644 scribo/make/text.hh delete mode 100644 scribo/postprocessing/fill_object_holes.hh delete mode 100644 scribo/preprocessing/all.hh delete mode 100644 scribo/preprocessing/crop_without_localization.hh delete mode 100644 scribo/preprocessing/denoise_bg.hh delete mode 100644 scribo/preprocessing/denoise_fg.hh delete mode 100644 scribo/preprocessing/deskew.hh delete mode 100644 scribo/preprocessing/deskew_crop.hh delete mode 100644 scribo/preprocessing/split_bg_fg.hh delete mode 100644 scribo/primitive/extract/all.hh delete mode 100644 scribo/primitive/extract/lines_h_single.hh delete mode 100644 scribo/primitive/extract/lines_h_thick_and_single.hh delete mode 100644 scribo/primitive/extract/lines_pattern.hh delete mode 100644 scribo/primitive/extract/lines_v_single.hh delete mode 100644 scribo/primitive/extract/lines_v_thick_and_single.hh delete mode 100644 scribo/primitive/group/all.hh delete mode 100644 scribo/primitive/group/from_double_link.hh delete mode 100644 scribo/primitive/group/from_graph.hh delete mode 100644 scribo/primitive/internal/all.hh delete mode 100644 scribo/primitive/internal/find_graph_link.hh delete mode 100644 scribo/primitive/internal/is_link_valid.hh delete mode 100644 scribo/primitive/internal/update_link_array.hh delete mode 100644 scribo/primitive/link/all.hh delete mode 100644 scribo/primitive/link/compute_several.hh delete mode 100644 scribo/primitive/link/internal/anchors_3.hh delete mode 100644 scribo/primitive/link/internal/compute_anchor.hh delete mode 100644 scribo/primitive/link/internal/dmax_functor_base.hh delete mode 100644 scribo/primitive/link/internal/find_several_links.hh delete mode 100644 scribo/primitive/link/internal/link_functor_base.hh delete mode 100644 scribo/primitive/link/internal/link_ms_dmax_base.hh delete mode 100644 scribo/primitive/link/internal/link_ms_dmax_ratio_base.hh delete mode 100644 scribo/primitive/link/internal/link_several_dmax_base.hh delete mode 100644 scribo/primitive/link/with_graph.hh delete mode 100644 scribo/primitive/link/with_rag.hh delete mode 100644 scribo/primitive/link/with_several_graphes.hh delete mode 100644 scribo/primitive/link/with_several_left_links.hh delete mode 100644 scribo/primitive/link/with_several_right_closest_links.hh delete mode 100644 scribo/primitive/link/with_several_right_links.hh delete mode 100644 scribo/primitive/link/with_single_down_link.hh delete mode 100644 scribo/primitive/link/with_single_up_link.hh delete mode 100644 scribo/primitive/regroup/from_single_left_link.hh delete mode 100644 scribo/primitive/remove/separators.hh create mode 100644 scribo/scribo/all.hh create mode 100644 scribo/scribo/binarization/all.hh rename scribo/{ => scribo}/binarization/global_threshold.hh (100%) rename scribo/{ => scribo}/binarization/global_threshold_auto.hh (100%) create mode 100644 scribo/scribo/binarization/internal/first_pass_functor.hh rename scribo/{ => scribo}/binarization/local_threshold.hh (100%) rename scribo/{ => scribo}/binarization/sauvola.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_ms.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_ms_split.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_threshold_image.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_threshold_image_debug.hh (100%) rename scribo/{ => scribo}/canvas/integral_browsing.hh (100%) create mode 100644 scribo/scribo/convert/from_qimage.hh rename scribo/{ => scribo}/core/all.hh (100%) rename scribo/{ => scribo}/core/central_sites.hh (100%) create mode 100644 scribo/scribo/core/component_info.hh create mode 100644 scribo/scribo/core/component_set.hh rename scribo/{ => scribo}/core/concept/dmax_functor.hh (100%) rename scribo/{ => scribo}/core/concept/link_functor.hh (100%) rename scribo/{ => scribo}/core/def/lbl_type.hh (100%) create mode 100644 scribo/scribo/core/erase_objects.hh rename scribo/{ => scribo}/core/init_integral_image.hh (100%) rename scribo/{ => scribo}/core/line_info.hh (100%) rename scribo/{ => scribo}/core/line_set.hh (100%) create mode 100644 scribo/scribo/core/macros.hh rename scribo/{ => scribo}/core/object_groups.hh (100%) rename scribo/{ => scribo}/core/object_links.hh (100%) rename scribo/{ => scribo}/core/tag/anchor.hh (100%) create mode 100644 scribo/scribo/core/tag/component.hh create mode 100644 scribo/scribo/core/tag/line.hh rename scribo/{ => scribo}/debug/alignment_decision_image.hh (100%) rename scribo/{ => scribo}/debug/all.hh (100%) create mode 100644 scribo/scribo/debug/bboxes_enlarged_image.hh rename scribo/{ => scribo}/debug/char_space_image.hh (100%) create mode 100644 scribo/scribo/debug/decision_image.hh create mode 100644 scribo/scribo/debug/highlight_text_area.hh rename scribo/{ => scribo}/debug/line_info_image.hh (100%) create mode 100644 scribo/scribo/debug/links_decision_image.hh create mode 100644 scribo/scribo/debug/looks_like_a_text_line_image.hh create mode 100644 scribo/scribo/debug/mean_and_base_lines_image.hh create mode 100644 scribo/scribo/debug/save_bboxes_image.hh create mode 100644 scribo/scribo/debug/save_comp_diff.hh rename scribo/{ => scribo}/debug/save_label_image.hh (100%) create mode 100644 scribo/scribo/debug/save_linked_bboxes_image.hh rename scribo/{ => scribo}/debug/save_table_image.hh (100%) create mode 100644 scribo/scribo/debug/several_links_decision_image.hh create mode 100644 scribo/scribo/debug/text_areas_image.hh rename scribo/{ => scribo}/debug/usage.hh (100%) rename scribo/{ => scribo}/draw/all.hh (100%) create mode 100644 scribo/scribo/draw/bounding_box_links.hh create mode 100644 scribo/scribo/draw/bounding_boxes.hh rename scribo/{ => scribo}/draw/groups_bboxes.hh (100%) rename scribo/{ => scribo}/estim/object_groups_v_thickness.hh (100%) rename scribo/{ => scribo}/filter/all.hh (100%) rename scribo/{ => scribo}/filter/common/objects_photo.hh (100%) rename scribo/{ => scribo}/filter/internal/alignment_angle.hh (100%) rename scribo/{ => scribo}/filter/internal/component_aligned.hh (100%) create mode 100644 scribo/scribo/filter/internal/compute.hh create mode 100644 scribo/scribo/filter/object_groups_size_ratio.hh rename scribo/{ => scribo}/filter/object_groups_small.hh (100%) rename scribo/{ => scribo}/filter/object_groups_v_thickness.hh (100%) create mode 100644 scribo/scribo/filter/object_groups_with_holes.hh rename scribo/{ => scribo}/filter/object_links_bbox_h_ratio.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_overlap.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_ratio.hh (100%) create mode 100644 scribo/scribo/filter/object_links_bbox_w_ratio.hh rename scribo/{ => scribo}/filter/object_links_bottom_aligned.hh (100%) create mode 100644 scribo/scribo/filter/object_links_center_aligned.hh create mode 100644 scribo/scribo/filter/object_links_left_aligned.hh create mode 100644 scribo/scribo/filter/object_links_non_aligned_simple.hh create mode 100644 scribo/scribo/filter/object_links_right_aligned.hh rename scribo/{ => scribo}/filter/object_links_top_aligned.hh (100%) create mode 100644 scribo/scribo/filter/objects_h_thick.hh create mode 100644 scribo/scribo/filter/objects_h_thin.hh rename scribo/{ => scribo}/filter/objects_large.hh (100%) create mode 100644 scribo/scribo/filter/objects_size_ratio.hh create mode 100644 scribo/scribo/filter/objects_small.hh create mode 100644 scribo/scribo/filter/objects_thick.hh create mode 100644 scribo/scribo/filter/objects_thin.hh create mode 100644 scribo/scribo/filter/objects_v_thick.hh create mode 100644 scribo/scribo/filter/objects_v_thin.hh create mode 100644 scribo/scribo/filter/objects_with_holes.hh rename scribo/{ => scribo}/fun/v2b/label_to_bool.hh (100%) rename scribo/{ => scribo}/fun/v2b/objects_large_filter.hh (100%) rename scribo/{ => scribo}/fun/v2b/objects_small_filter.hh (100%) rename scribo/{ => scribo}/io/text_boxes/save.hh (100%) create mode 100644 scribo/scribo/io/xml/save.hh create mode 100644 scribo/scribo/make/all.hh rename scribo/{ => scribo}/make/debug_filename.hh (100%) rename scribo/{ => scribo}/make/influence_zone_graph.hh (100%) create mode 100644 scribo/scribo/postprocessing/all.hh create mode 100644 scribo/scribo/postprocessing/fill_object_holes.hh create mode 100644 scribo/scribo/preprocessing/all.hh rename scribo/{ => scribo}/preprocessing/crop.hh (100%) create mode 100644 scribo/scribo/preprocessing/crop_without_localization.hh rename scribo/{ => scribo}/preprocessing/denoise.hh (100%) create mode 100644 scribo/scribo/preprocessing/denoise_bg.hh create mode 100644 scribo/scribo/preprocessing/denoise_fg.hh create mode 100644 scribo/scribo/preprocessing/deskew.hh create mode 100644 scribo/scribo/preprocessing/deskew_crop.hh rename scribo/{ => scribo}/preprocessing/homogeneous_contrast.hh (100%) rename scribo/{ => scribo}/preprocessing/rotate_90.hh (100%) create mode 100644 scribo/scribo/preprocessing/split_bg_fg.hh rename scribo/{ => scribo}/primitive/all.hh (100%) create mode 100644 scribo/scribo/primitive/extract/all.hh rename scribo/{ => scribo}/primitive/extract/canvas.hh (100%) rename scribo/{ => scribo}/primitive/extract/cells.hh (100%) rename scribo/{ => scribo}/primitive/extract/components.hh (100%) rename scribo/{ => scribo}/primitive/extract/horizontal_separators.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_pattern.hh (100%) create mode 100644 scribo/scribo/primitive/extract/lines_h_single.hh rename scribo/{ => scribo}/primitive/extract/lines_h_thick.hh (100%) create mode 100644 scribo/scribo/primitive/extract/lines_h_thick_and_single.hh create mode 100644 scribo/scribo/primitive/extract/lines_pattern.hh rename scribo/{ => scribo}/primitive/extract/lines_thick.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_pattern.hh (100%) create mode 100644 scribo/scribo/primitive/extract/lines_v_single.hh rename scribo/{ => scribo}/primitive/extract/lines_v_thick.hh (100%) create mode 100644 scribo/scribo/primitive/extract/lines_v_thick_and_single.hh rename scribo/{ => scribo}/primitive/extract/separators.hh (100%) rename scribo/{ => scribo}/primitive/extract/vertical_separators.hh (100%) create mode 100644 scribo/scribo/primitive/group/all.hh rename scribo/{ => scribo}/primitive/group/apply.hh (100%) create mode 100644 scribo/scribo/primitive/group/from_double_link.hh create mode 100644 scribo/scribo/primitive/group/from_graph.hh rename scribo/{ => scribo}/primitive/group/from_single_link.hh (100%) create mode 100644 scribo/scribo/primitive/internal/all.hh create mode 100644 scribo/scribo/primitive/internal/find_graph_link.hh rename scribo/{ => scribo}/primitive/internal/find_root.hh (100%) rename scribo/{ => scribo}/primitive/internal/have_link_valid.hh (100%) create mode 100644 scribo/scribo/primitive/internal/is_link_valid.hh rename scribo/{ => scribo}/primitive/internal/rd.hh (100%) rename scribo/{ => scribo}/primitive/internal/update_graph_link.hh (100%) create mode 100644 scribo/scribo/primitive/link/all.hh rename scribo/{ => scribo}/primitive/link/compute.hh (100%) create mode 100644 scribo/scribo/primitive/link/compute_several.hh create mode 100644 scribo/scribo/primitive/link/internal/compute_anchor.hh rename scribo/{ => scribo}/primitive/link/internal/dmax_default.hh (100%) create mode 100644 scribo/scribo/primitive/link/internal/dmax_functor_base.hh rename scribo/{ => scribo}/primitive/link/internal/dmax_width_and_height.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/dmax_width_only.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/find_link.hh (100%) create mode 100644 scribo/scribo/primitive/link/internal/find_several_links.hh create mode 100644 scribo/scribo/primitive/link/internal/link_functor_base.hh create mode 100644 scribo/scribo/primitive/link/internal/link_several_dmax_base.hh rename scribo/{ => scribo}/primitive/link/internal/link_single_dmax_base.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/link_single_dmax_ratio_base.hh (100%) rename scribo/{ => scribo}/primitive/link/merge_double_link.hh (100%) create mode 100644 scribo/scribo/primitive/link/with_graph.hh create mode 100644 scribo/scribo/primitive/link/with_rag.hh create mode 100644 scribo/scribo/primitive/link/with_several_graphes.hh create mode 100644 scribo/scribo/primitive/link/with_several_left_links.hh create mode 100644 scribo/scribo/primitive/link/with_several_right_closest_links.hh create mode 100644 scribo/scribo/primitive/link/with_several_right_links.hh rename scribo/{ => scribo}/primitive/link/with_several_right_links_overlap.hh (100%) create mode 100644 scribo/scribo/primitive/link/with_single_down_link.hh rename scribo/{ => scribo}/primitive/link/with_single_left_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_left_link_dmax_ratio.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_bottom.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_dmax_ratio.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_top.hh (100%) create mode 100644 scribo/scribo/primitive/link/with_single_up_link.hh create mode 100644 scribo/scribo/primitive/regroup/from_single_left_link.hh create mode 100644 scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh create mode 100644 scribo/scribo/primitive/remove/separators.hh create mode 100644 scribo/scribo/subsampling/bilinear.hh rename scribo/{ => scribo}/subsampling/integral.hh (100%) rename scribo/{ => scribo}/subsampling/integral_single_image.hh (100%) create mode 100644 scribo/scribo/table/align_lines_horizontaly.hh rename scribo/{ => scribo}/table/align_lines_verticaly.hh (100%) rename scribo/{ => scribo}/table/all.hh (100%) rename scribo/{ => scribo}/table/connect_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/connect_vertical_lines.hh (100%) create mode 100644 scribo/scribo/table/erase.hh create mode 100644 scribo/scribo/table/extract.hh create mode 100644 scribo/scribo/table/internal/align_lines.hh rename scribo/{ => scribo}/table/internal/all.hh (100%) rename scribo/{ => scribo}/table/internal/connect_lines.hh (100%) rename scribo/{ => scribo}/table/internal/repair_lines.hh (100%) create mode 100644 scribo/scribo/table/rebuild.hh rename scribo/{ => scribo}/table/repair_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/repair_vertical_lines.hh (100%) rename scribo/{ => scribo}/text/all.hh (100%) rename scribo/{ => scribo}/text/clean.hh (100%) rename scribo/{ => scribo}/text/clean_inplace.hh (100%) rename scribo/{ => scribo}/text/extract_lines.hh (100%) rename scribo/{ => scribo}/text/look_like_text_lines.hh (100%) create mode 100644 scribo/scribo/text/merging.hh rename scribo/{ => scribo}/text/recognition.hh (100%) create mode 100644 scribo/scribo/toolchain/nepomuk/text_extraction.hh rename scribo/{ => scribo}/toolchain/text_in_doc.hh (100%) rename scribo/{ => scribo}/upsampling/bs2x.hh (100%) create mode 100644 scribo/scribo/upsampling/eagle.hh delete mode 100644 scribo/src/pbm_lines_in_doc.cc create mode 100644 scribo/src/preprocessing/rotate.cc delete mode 100644 scribo/subsampling/bilinear.hh delete mode 100644 scribo/table/align_lines_horizontaly.hh delete mode 100644 scribo/table/erase.hh delete mode 100644 scribo/table/extract.hh delete mode 100644 scribo/table/internal/align_lines.hh delete mode 100644 scribo/table/rebuild.hh delete mode 100644 scribo/tests/core/object_image.cc delete mode 100755 scribo/tests/unit_test/build_unit_test.sh create mode 100644 scribo/tests/unit_test/cond_tests_qt create mode 100644 scribo/tests/unit_test/cond_tests_qt_tesseract_tiff create mode 100644 scribo/tests/unit_test/cond_tests_tesseract_tiff delete mode 100644 scribo/text/merging.hh delete mode 100644 scribo/toolchain/nepomuk/text_extraction.hh delete mode 100644 scribo/upsampling/eagle.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-451-gf7bc7e1 Fix tests in Milena.
by Guillaume Lazzara 10 Aug '10

10 Aug '10

* tests/geom/rotate.cc: Fix test. * mln/labeling/blobs_and_compute.hh: Add comments. * mln/labeling/flat_zones.hh: Add missing members to functors. * tests/labeling/blobs_and_compute.cc: Fix return type. * tests/labeling/flat_zones.cc, * tests/labeling/foreground.cc: Fix functor template parameters. * tests/labeling/relabel.cc: The number of components is not updated anymore. * tests/labeling/colorize.cc: Fix reference according to last changes in labeling::colorize routine * mln/core/point.hh: Add mln:: namespace prefix. --- milena/ChangeLog | 23 +++++++++++++++++++ milena/mln/core/point.hh | 6 ++-- milena/mln/labeling/blobs_and_compute.hh | 3 ++ milena/mln/labeling/flat_zones.hh | 34 +++++++++++++++++++-------- milena/tests/geom/rotate.cc | 16 +++++++----- milena/tests/labeling/blobs_and_compute.cc | 17 +++++++++----- milena/tests/labeling/colorize.cc | 6 +++- milena/tests/labeling/flat_zones.cc | 4 +- milena/tests/labeling/foreground.cc | 4 +- milena/tests/labeling/relabel.cc | 6 +--- 10 files changed, 83 insertions(+), 36 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3701f90..bc6cbd1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,28 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix tests in Milena. + + * tests/geom/rotate.cc: Fix test. + + * mln/labeling/blobs_and_compute.hh: Add comments. + + * mln/labeling/flat_zones.hh: Add missing members to functors. + + * tests/labeling/blobs_and_compute.cc: Fix return type. + + * tests/labeling/flat_zones.cc, + * tests/labeling/foreground.cc: Fix functor template parameters. + + * tests/labeling/relabel.cc: The number of components is not + updated anymore. + + * tests/labeling/colorize.cc: Fix reference according to last + changes in labeling::colorize routine. + + * mln/core/point.hh: Add mln:: namespace prefix. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/dicom/get_header.hh: Add missing headers. 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index 1b9efc8..4dc7c5e 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -317,7 +317,7 @@ namespace mln enum { dim = G::dim }; for (unsigned i = 0; i < dim; ++i) - to[i] = internal::convert_data<C2>(from[i]); + to[i] = mln::internal::convert_data<C2>(from[i]); } @@ -337,9 +337,9 @@ namespace mln else { for (unsigned i = dim - 2; i < dim; ++i) - to[i] = internal::convert_data<C2>(from[j++]); + to[i] = mln::internal::convert_data<C2>(from[j++]); for (unsigned i = 2; i < dim; ++i, ++j) - to[i-j] = internal::convert_data<C2>(from[j]); + to[i-j] = mln::internal::convert_data<C2>(from[j]); } } diff --git a/milena/mln/labeling/blobs_and_compute.hh b/milena/mln/labeling/blobs_and_compute.hh index dd3eb98..e8f784c 100644 --- a/milena/mln/labeling/blobs_and_compute.hh +++ b/milena/mln/labeling/blobs_and_compute.hh @@ -52,6 +52,9 @@ namespace mln \param[in,out] nlabels The number of labels found. \param[in] accu An accumulator to be computed while labeling. + \return The labeled image, computed attributes for each regions + and an array of the accumulators used to compute the + attributes. */ template <typename I, typename N, typename L, typename A> util::couple<mln_ch_value(I,L), diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 66bc44d..431bd86 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -51,7 +51,8 @@ namespace mln /// template <typename I, typename N, typename L> mln_ch_value(I, L) - flat_zones(const Image& input, const Neighborhood<N>& nbh, L& nlabels); + flat_zones(const Image& input, const Neighborhood<N>& nbh, + L& nlabels); @@ -62,7 +63,7 @@ namespace mln // Flat zone functor for the labeling canvas. - template <typename I> + template <typename I, typename L> struct flat_zones_functor { const I& input; @@ -72,24 +73,37 @@ namespace mln typedef mln_psite(I) P; void init() {} - bool handles(const P&) const { return true; } - bool equiv(const P& n, const P& p) const { return input(n) == - input(p); } + bool handles(const P&) const { return true; } + + bool equiv(const P& n, const P& p) const + { return input(n) == input(p); } + bool labels(const P&) const { return true; } void do_no_union(const P&, const P&) {} void init_attr(const P&) {} void merge_attr(const P&, const P&) {} + void set_new_label(const P& p, const L& l){} + void set_label(const P& p, const L& l) {} + void finalize() {} + // Fastest implementation. void init_() {} - bool handles_(unsigned) const { return true; } - bool equiv_(unsigned n, unsigned p) const { return input.element(n) == - input.element(p); } + + bool handles_(unsigned) const + { return true; } + + bool equiv_(unsigned n, unsigned p) const + { return input.element(n) == input.element(p); } + bool labels_(unsigned) const { return true; } void do_no_union_(unsigned, unsigned) {} void init_attr_(unsigned) {} void merge_attr_(unsigned, unsigned) {} + void set_new_label_(unsigned, const L&) {} + void set_label_(unsigned, const L&) {} + void finalize_() {} // end of requirements. @@ -117,7 +131,7 @@ namespace mln mln_precondition(input.is_valid()); // Call the labeling canvas. - typedef impl::flat_zones_functor F; + typedef impl::flat_zones_functor<I,L> F; F f(input); mln_ch_value(I, L) output = canvas::labeling::video(input, nbh, nlabels, f); diff --git a/milena/tests/geom/rotate.cc b/milena/tests/geom/rotate.cc index c06aeb2..0b7a842 100644 --- a/milena/tests/geom/rotate.cc +++ b/milena/tests/geom/rotate.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -33,8 +34,12 @@ int main() { using namespace mln; - bool ref_values[][5] = { { 0, 1, 1, 0, 0 }, - { 0, 0, 1, 1, 0 } }; + bool ref_values[][5] = { { 0, 1, 0, 0, 0 }, + { 0, 1, 1, 0, 0 }, + { 0, 0, 1, 1, 0 }, + { 0, 0, 0, 1, 1 }, + { 0, 0, 0, 0, 1 } }; + bool values[][5] = { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 }, @@ -45,10 +50,7 @@ int main() image2d<bool> ima = make::image(values); - image2d<bool> ref(make::box2d(1,0, 2,4), 0); - for (unsigned i = 0; i < 2; ++i) - for (unsigned j = 0; j < 5; ++j) - ref(ref.point_at_index(i + j + 4 * i)) = ref_values[i][j]; + image2d<bool> ref = make::image(ref_values); image2d<bool> ima_rot = geom::rotate(ima, 45); diff --git a/milena/tests/labeling/blobs_and_compute.cc b/milena/tests/labeling/blobs_and_compute.cc index 8516bba..8fd5744 100644 --- a/milena/tests/labeling/blobs_and_compute.cc +++ b/milena/tests/labeling/blobs_and_compute.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -45,12 +46,16 @@ int main() typedef image2d<value::label_8> L; typedef util::array<point2d> arr_t; - typedef util::couple<L,arr_t> res_t; + typedef accu::center<point2d,point2d> accu_t; + typedef util::array<accu_t> accu_arr_t; + typedef util::couple<L,util::couple<arr_t, accu_arr_t> > res_t; res_t result = labeling::blobs_and_compute(pic, c4(), n, - accu::center<point2d,point2d>()); + accu_t()); - mln_assertion(result.second().size() == 34); - mln_assertion(result.second()[1] == point2d(10,30)); - mln_assertion(result.second()[33] == point2d(310,66)); + + mln_assertion(result.second().first().size() == 34); + mln_assertion(result.second().second().size() == 34); + mln_assertion(result.second().first()[1] == point2d(10,30)); + mln_assertion(result.second().second()[33] == point2d(310,66)); mln_assertion(n == 33); } diff --git a/milena/tests/labeling/colorize.cc b/milena/tests/labeling/colorize.cc index 9c4d352..3d3a9ea 100644 --- a/milena/tests/labeling/colorize.cc +++ b/milena/tests/labeling/colorize.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -35,6 +36,7 @@ #include <mln/labeling/colorize.hh> #include <mln/data/compare.hh> +#include <mln/debug/println.hh> int main() { @@ -44,7 +46,7 @@ int main() { 0, 0 } }; typedef value::rgb8 rgb_t; - value::rgb8 ref_data[][2] = { { rgb_t(171,46,231), rgb_t(171,46,231) }, + value::rgb8 ref_data[][2] = { { rgb_t(220,80,117), rgb_t(220,80,117) }, { rgb_t(0,0,0), rgb_t(0,0,0) } }; image2d<value::int_u8> ima = make::image(values); diff --git a/milena/tests/labeling/flat_zones.cc b/milena/tests/labeling/flat_zones.cc index 6b4b37e..e1e09d1 100644 --- a/milena/tests/labeling/flat_zones.cc +++ b/milena/tests/labeling/flat_zones.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -65,7 +65,7 @@ int main() { typedef image2d<int_u8> I; - labeling::impl::flat_zones_functor f(lena); + labeling::impl::flat_zones_functor<I,unsigned> f(lena); unsigned nlabels_generic, nlabels_fastest; mln_assertion(canvas::labeling::impl::generic::labeling(lena, diff --git a/milena/tests/labeling/foreground.cc b/milena/tests/labeling/foreground.cc index acdecb6..8be0aeb 100644 --- a/milena/tests/labeling/foreground.cc +++ b/milena/tests/labeling/foreground.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -54,7 +54,7 @@ int main() // which calls canvas::labeling_video and its generic dispatch // leads to canvas::impl::generic::labeling. - labeling::impl::value_functor f(pic, true); + labeling::impl::value_functor<I,unsigned> f(pic, true); unsigned n_; ref = canvas::labeling::impl::generic::labeling(pic, nbh, n_, diff --git a/milena/tests/labeling/relabel.cc b/milena/tests/labeling/relabel.cc index 79382ba..27ec2df 100644 --- a/milena/tests/labeling/relabel.cc +++ b/milena/tests/labeling/relabel.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,7 +27,6 @@ #include <mln/core/image/image2d.hh> #include <mln/labeling/relabel.hh> #include <mln/value/label_16.hh> -#include <mln/debug/println.hh> struct not_to_remove : public mln::Function_v2b< not_to_remove > @@ -76,11 +76,9 @@ int main() } { - label_16 new_nlabels; labeling::relabel_inplace(lbl, nlabels, not_to_remove()); - mln_assertion(nlabels == 2u); mln_piter_(image2d<label_16>) p(lbl.domain()); for_all(p) mln_assertion(is_valid(lbl(p))); -- 1.5.6.5

1 0

last-svn-commit-447-g5998783 bootstrap: Update calls to build_unit_test.sh.
by Guillaume Lazzara 10 Aug '10

10 Aug '10

--- ChangeLog | 4 ++++ bootstrap | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfa1ef6..d389263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * bootstrap: Update calls to build_unit_test.sh. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Add support for conditional unit-tests. diff --git a/bootstrap b/bootstrap index a9decca..6a68272 100755 --- a/bootstrap +++ b/bootstrap @@ -217,13 +217,14 @@ if $regen_p; then fi # Generate unit test files. -run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests +run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests mln # Generate unit test files for Scribo. -run . scribo/tests/unit_test/build_unit_test.sh \ - scribo \ - scribo/tests/unit_test \ - scribo/tests/unit_test/disabled_tests +run . ./build-aux/build_unit_test.sh \ + scribo/scribo \ + scribo/tests/unit_test \ + scribo/tests/unit_test/disabled_tests \ + scribo # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0