Olena-patches September 2011

olena-patches@lrde.epita.fr

7 participants
173 discussions

last-svn-commit-983-g210ab54 Small fixes in Scribo.

by Guillaume Lazzara

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

13 years, 3 months

last-svn-commit-982-g563d81e More fixes in Scribo build system.

by Guillaume Lazzara

* demo/viewer/Makefile.am: Add missing distributed files. * src/contest/DAE-2011/Makefile.am, * src/contest/hdlac-2011/Makefile.am, * src/debug/Makefile.am: Fix dependencies. --- scribo/ChangeLog | 10 ++++++++++ scribo/demo/viewer/Makefile.am | 4 +++- scribo/src/contest/DAE-2011/Makefile.am | 26 ++++++++++++-------------- scribo/src/contest/hdlac-2011/Makefile.am | 17 ++++++++--------- scribo/src/debug/Makefile.am | 18 ++++++++---------- 5 files changed, 41 insertions(+), 34 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 94fa9e9..df9e8db 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + More fixes in Scribo build system. + + * demo/viewer/Makefile.am: Add missing distributed files. + + * src/contest/DAE-2011/Makefile.am, + * src/contest/hdlac-2011/Makefile.am, + * src/debug/Makefile.am: Fix dependencies. + 2011-09-10 Roland Levillain <roland(a)lrde.epita.fr> Fix compilation dependencies of unit tests in Scribo. diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 09d9ecc..fb68e50 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -133,5 +133,7 @@ EXTRA_DIST = \ segmentation_options.ui \ ocr_options.ui \ help_dialog.ui \ - demodir.hh.in + demodir.hh.in \ + viewer.qrc \ + icons/olena_smaller.jpg diff --git a/scribo/src/contest/DAE-2011/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am index 00d0009..5ee3576 100644 --- a/scribo/src/contest/DAE-2011/Makefile.am +++ b/scribo/src/contest/DAE-2011/Makefile.am @@ -27,22 +27,20 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_dae content_in_doc_dae content_in_hdoc_dae_SOURCES = content_in_hdoc_dae.cc -content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) -content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) +content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + -I$(top_builddir) +content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) content_in_doc_dae_SOURCES = content_in_doc_dae.cc -content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) -content_in_doc_dae_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) +content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + -I$(top_builddir) +content_in_doc_dae_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) endif HAVE_MAGICKXX diff --git a/scribo/src/contest/hdlac-2011/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am index 7d9258a..1c1f1dd 100644 --- a/scribo/src/contest/hdlac-2011/Makefile.am +++ b/scribo/src/contest/hdlac-2011/Makefile.am @@ -27,12 +27,11 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_hdlac content_in_hdoc_hdlac_SOURCES = content_in_hdoc_hdlac.cc -content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) -content_in_hdoc_hdlac_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) - -endif HAVE_MAGICKXX +content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + -I$(top_builddir) +content_in_hdoc_hdlac_LDFLAGS = $(AM_LDFLAGS) \ + -lpthread \ + $(MAGICKXX_LDFLAGS) + +endif HAVE_MAGICKXX \ No newline at end of file diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 838974d..b1e22de 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -86,6 +86,14 @@ show_objects_thin_SOURCES = show_objects_thin.cc if HAVE_MAGICKXX + noinst_PROGRAMS += show_lines_boldness + show_lines_boldness_SOURCES = show_lines_boldness.cc + show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) + show_lines_boldness_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) + + noinst_PROGRAMS += show_components_color show_components_color_SOURCES = show_components_color.cc show_components_color_CPPFLAGS = $(AM_CPPFLAGS) \ @@ -100,16 +108,6 @@ if HAVE_MAGICKXX show_components_boldness_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) -if HAVE_TESSERACT - noinst_PROGRAMS += show_lines_boldness - show_lines_boldness_SOURCES = show_lines_boldness.cc - show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) - show_lines_boldness_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) -endif HAVE_TESSERACT - if HAVE_QT noinst_PROGRAMS += show_paragraph_blocks -- 1.7.2.5

13 years, 3 months

branch next-next created: last-svn-commit-980-gc760a8e

by git＠lrde.epita.fr

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-next has been created at c760a8e92a6869ba1a5bce54216dc437ef4e5bbb (commit) - Log ----------------------------------------------------------------- c760a8e Fix compilation dependencies of unit tests in Scribo. 4ff4976 Fix compilation dependencies in Scribo. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

last-svn-commit-980-gc760a8e Fix compilation dependencies of unit tests in Scribo.

by Roland Levillain

* tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_magickxx, cond_tests_magickxx_qt and cond_tests_magickxx_tesseract. Remove cond_tests_qt_tesseract_tiff. * tests/unit_test/cond_tests_magickxx, * tests/unit_test/cond_tests_magickxx_qt, * tests/unit_test/cond_tests_magickxx_tesseract: New. * tests/unit_test/cond_tests_qt_tesseract_tiff: Remove (empty) file. * tests/unit_test/cond_tests_magickxx_tesseract_tiff: Add scribo/toolchain/content_in_doc.hh. * tests/unit_test/cond_tests_qt: Remove scribo/io/xml/internal/full_xml_visitor.hh and scribo/io/xml/load.hh. * tests/unit_test/cond_tests_tesseract_tiff: Remove. scribo/toolchain/content_in_doc.hh. * tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff: Remove empty line. * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 25 ++ scribo/tests/unit_test/Makefile.am | 13 +- scribo/tests/unit_test/cond_tests_magickxx | 27 +++ scribo/tests/unit_test/cond_tests_magickxx_qt | 2 + .../cond_tests_magickxx_qt_tesseract_tiff | 1 - .../tests/unit_test/cond_tests_magickxx_tesseract | 2 + .../unit_test/cond_tests_magickxx_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_qt | 2 - .../tests/unit_test/cond_tests_qt_tesseract_tiff | 1 - scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 - scribo/tests/unit_test/unit-tests.mk | 232 +++++++++++++------- 11 files changed, 219 insertions(+), 88 deletions(-) create mode 100644 scribo/tests/unit_test/cond_tests_magickxx create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_qt create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_tesseract delete mode 100644 scribo/tests/unit_test/cond_tests_qt_tesseract_tiff diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7b5ea85..94fa9e9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,30 @@ 2011-09-10 Roland Levillain <roland(a)lrde.epita.fr> + Fix compilation dependencies of unit tests in Scribo. + + * tests/unit_test/Makefile.am (COND_TESTS): + Add cond_tests_magickxx, cond_tests_magickxx_qt and + cond_tests_magickxx_tesseract. + Remove cond_tests_qt_tesseract_tiff. + * tests/unit_test/cond_tests_magickxx, + * tests/unit_test/cond_tests_magickxx_qt, + * tests/unit_test/cond_tests_magickxx_tesseract: + New. + * tests/unit_test/cond_tests_qt_tesseract_tiff: Remove (empty) + file. + * tests/unit_test/cond_tests_magickxx_tesseract_tiff: Add + scribo/toolchain/content_in_doc.hh. + * tests/unit_test/cond_tests_qt: Remove + scribo/io/xml/internal/full_xml_visitor.hh and + scribo/io/xml/load.hh. + * tests/unit_test/cond_tests_tesseract_tiff: Remove. + scribo/toolchain/content_in_doc.hh. + * tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff: + Remove empty line. + * tests/unit_test/unit-tests.mk: Regen. + +2011-09-10 Roland Levillain <roland(a)lrde.epita.fr> + Fix compilation dependencies in Scribo. * src/contest/DAE-2011/Makefile.am diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index e4c9e1b..c5b2621 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -17,10 +17,19 @@ include $(top_srcdir)/scribo/tests/tests.mk -COND_TESTS = cond_tests_magickxx_tesseract_tiff \ +# FIXME: Make this Makefile machinery more robust. For instance, +# `build_unit_test.sh' should be passed the file names in +# $(COND_TESTS) instead of looking for them on its own, as it consider +# wrong files (e.g. stray Emacs backup files ending in `~'). +# Moreover, maintaining these files by hand is really painful. How +# could we automate their creation and update? + +COND_TESTS = cond_tests_magickxx \ + cond_tests_magickxx_qt \ cond_tests_magickxx_qt_tesseract_tiff \ + cond_tests_magickxx_tesseract \ + cond_tests_magickxx_tesseract_tiff \ cond_tests_qt \ - cond_tests_qt_tesseract_tiff \ cond_tests_tesseract_tiff EXTRA_DIST = disabled_tests \ diff --git a/scribo/tests/unit_test/cond_tests_magickxx b/scribo/tests/unit_test/cond_tests_magickxx new file mode 100644 index 0000000..a40520d --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_magickxx @@ -0,0 +1,27 @@ +scribo/core/document.hh +scribo/core/internal/doc_serializer.hh +scribo/debug/text_color_image.hh +scribo/filter/images_in_paragraph.hh +scribo/filter/paragraphs_in_borders.hh +scribo/filter/paragraphs_in_image.hh +scribo/filter/separators_in_borders.hh +scribo/filter/separators_in_element.hh +scribo/filter/separators_in_paragraph.hh +scribo/filter/separators_vert_in_borders.hh +scribo/io/img/internal/debug_img_visitor.hh +scribo/io/img/internal/full_img_visitor.hh +scribo/io/img/internal/non_text_img_visitor.hh +scribo/io/img/internal/text_img_visitor.hh +scribo/io/img/save.hh +scribo/io/xml/internal/extended_page_xml_visitor.hh +scribo/io/xml/internal/page_xml_visitor.hh +scribo/io/xml/internal/print_page_preambule.hh +scribo/io/xml/save.hh +scribo/make/text_blocks_image.hh +scribo/make/text_components_image.hh +scribo/postprocessing/images_to_drop_capital.hh +scribo/primitive/extract/alignments.hh +scribo/primitive/extract/non_text.hh +scribo/primitive/extract/non_text_hdoc.hh +scribo/primitive/extract/non_text_kmean.hh +scribo/text/extract_lines_wo_merge.hh diff --git a/scribo/tests/unit_test/cond_tests_magickxx_qt b/scribo/tests/unit_test/cond_tests_magickxx_qt new file mode 100644 index 0000000..9ca2915 --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_magickxx_qt @@ -0,0 +1,2 @@ +scribo/io/xml/internal/full_xml_visitor.hh +scribo/io/xml/load.hh diff --git a/scribo/tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff b/scribo/tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff index f5840ef..7dfe76d 100644 --- a/scribo/tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff @@ -1,2 +1 @@ scribo/toolchain/nepomuk/text_extraction.hh - diff --git a/scribo/tests/unit_test/cond_tests_magickxx_tesseract b/scribo/tests/unit_test/cond_tests_magickxx_tesseract new file mode 100644 index 0000000..950ad4e --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_magickxx_tesseract @@ -0,0 +1,2 @@ +scribo/toolchain/content_in_hdoc.hh +scribo/toolchain/internal/content_in_hdoc_functor.hh diff --git a/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff index 3f1c2fb..0ce5760 100644 --- a/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff @@ -1 +1,2 @@ +scribo/toolchain/content_in_doc.hh scribo/toolchain/internal/content_in_doc_functor.hh diff --git a/scribo/tests/unit_test/cond_tests_qt b/scribo/tests/unit_test/cond_tests_qt index 4f4b667..a266fc6 100644 --- a/scribo/tests/unit_test/cond_tests_qt +++ b/scribo/tests/unit_test/cond_tests_qt @@ -1,5 +1,3 @@ scribo/convert/from_base64.hh scribo/convert/from_qimage.hh -scribo/io/xml/internal/full_xml_visitor.hh scribo/io/xml/internal/save_image_to_xml.hh -scribo/io/xml/load.hh diff --git a/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff b/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff deleted file mode 100644 index 8b13789..0000000 --- a/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff +++ /dev/null @@ -1 +0,0 @@ - diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index ee10868..72f8fa3 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,4 +1,3 @@ scribo/text/recognition.hh scribo/toolchain/internal/text_in_doc_functor.hh -scribo/toolchain/content_in_doc.hh scribo/toolchain/text_in_doc.hh diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 9eb3771..667bffa 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -4,6 +4,136 @@ check_PROGRAMS = # Starting a conditional unit test list. if HAVE_MAGICKXX +check_PROGRAMS += \ +scribo_core_document \ +scribo_core_internal_doc_serializer \ +scribo_debug_text_color_image \ +scribo_filter_images_in_paragraph \ +scribo_filter_paragraphs_in_borders \ +scribo_filter_paragraphs_in_image \ +scribo_filter_separators_in_borders \ +scribo_filter_separators_in_element \ +scribo_filter_separators_in_paragraph \ +scribo_filter_separators_vert_in_borders \ +scribo_io_img_internal_debug_img_visitor \ +scribo_io_img_internal_full_img_visitor \ +scribo_io_img_internal_non_text_img_visitor \ +scribo_io_img_internal_text_img_visitor \ +scribo_io_img_save \ +scribo_io_xml_internal_extended_page_xml_visitor \ +scribo_io_xml_internal_page_xml_visitor \ +scribo_io_xml_internal_print_page_preambule \ +scribo_io_xml_save \ +scribo_make_text_blocks_image \ +scribo_make_text_components_image \ +scribo_postprocessing_images_to_drop_capital \ +scribo_primitive_extract_alignments \ +scribo_primitive_extract_non_text \ +scribo_primitive_extract_non_text_hdoc \ +scribo_primitive_extract_non_text_kmean \ +scribo_text_extract_lines_wo_merge + +scribo_core_document_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_core_document_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_core_document_SOURCES = scribo_core_document.cc +scribo_core_internal_doc_serializer_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_core_internal_doc_serializer_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_core_internal_doc_serializer_SOURCES = scribo_core_internal_doc_serializer.cc +scribo_debug_text_color_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_debug_text_color_image_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_debug_text_color_image_SOURCES = scribo_debug_text_color_image.cc +scribo_filter_images_in_paragraph_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_images_in_paragraph_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_images_in_paragraph_SOURCES = scribo_filter_images_in_paragraph.cc +scribo_filter_paragraphs_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_paragraphs_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_paragraphs_in_borders_SOURCES = scribo_filter_paragraphs_in_borders.cc +scribo_filter_paragraphs_in_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_paragraphs_in_image_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_paragraphs_in_image_SOURCES = scribo_filter_paragraphs_in_image.cc +scribo_filter_separators_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_separators_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_separators_in_borders_SOURCES = scribo_filter_separators_in_borders.cc +scribo_filter_separators_in_element_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_separators_in_element_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_separators_in_element_SOURCES = scribo_filter_separators_in_element.cc +scribo_filter_separators_in_paragraph_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_separators_in_paragraph_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_separators_in_paragraph_SOURCES = scribo_filter_separators_in_paragraph.cc +scribo_filter_separators_vert_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_filter_separators_vert_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_filter_separators_vert_in_borders_SOURCES = scribo_filter_separators_vert_in_borders.cc +scribo_io_img_internal_debug_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_img_internal_debug_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_img_internal_debug_img_visitor_SOURCES = scribo_io_img_internal_debug_img_visitor.cc +scribo_io_img_internal_full_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_img_internal_full_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_img_internal_full_img_visitor_SOURCES = scribo_io_img_internal_full_img_visitor.cc +scribo_io_img_internal_non_text_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_img_internal_non_text_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_img_internal_non_text_img_visitor_SOURCES = scribo_io_img_internal_non_text_img_visitor.cc +scribo_io_img_internal_text_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_img_internal_text_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_img_internal_text_img_visitor_SOURCES = scribo_io_img_internal_text_img_visitor.cc +scribo_io_img_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_img_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_img_save_SOURCES = scribo_io_img_save.cc +scribo_io_xml_internal_extended_page_xml_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_internal_extended_page_xml_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_internal_extended_page_xml_visitor_SOURCES = scribo_io_xml_internal_extended_page_xml_visitor.cc +scribo_io_xml_internal_page_xml_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_internal_page_xml_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_internal_page_xml_visitor_SOURCES = scribo_io_xml_internal_page_xml_visitor.cc +scribo_io_xml_internal_print_page_preambule_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_internal_print_page_preambule_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_internal_print_page_preambule_SOURCES = scribo_io_xml_internal_print_page_preambule.cc +scribo_io_xml_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_save_SOURCES = scribo_io_xml_save.cc +scribo_make_text_blocks_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_make_text_blocks_image_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_make_text_blocks_image_SOURCES = scribo_make_text_blocks_image.cc +scribo_make_text_components_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_make_text_components_image_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_make_text_components_image_SOURCES = scribo_make_text_components_image.cc +scribo_postprocessing_images_to_drop_capital_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_postprocessing_images_to_drop_capital_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_postprocessing_images_to_drop_capital_SOURCES = scribo_postprocessing_images_to_drop_capital.cc +scribo_primitive_extract_alignments_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_primitive_extract_alignments_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_primitive_extract_alignments_SOURCES = scribo_primitive_extract_alignments.cc +scribo_primitive_extract_non_text_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_primitive_extract_non_text_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_primitive_extract_non_text_SOURCES = scribo_primitive_extract_non_text.cc +scribo_primitive_extract_non_text_hdoc_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_primitive_extract_non_text_hdoc_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_primitive_extract_non_text_hdoc_SOURCES = scribo_primitive_extract_non_text_hdoc.cc +scribo_primitive_extract_non_text_kmean_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_primitive_extract_non_text_kmean_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_primitive_extract_non_text_kmean_SOURCES = scribo_primitive_extract_non_text_kmean.cc +scribo_text_extract_lines_wo_merge_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_text_extract_lines_wo_merge_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_text_extract_lines_wo_merge_SOURCES = scribo_text_extract_lines_wo_merge.cc +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. +if HAVE_MAGICKXX +if HAVE_QT +check_PROGRAMS += \ +scribo_io_xml_internal_full_xml_visitor \ +scribo_io_xml_load + +scribo_io_xml_internal_full_xml_visitor_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_internal_full_xml_visitor_LDFLAGS= ${QT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_internal_full_xml_visitor_SOURCES = scribo_io_xml_internal_full_xml_visitor.cc +scribo_io_xml_load_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_io_xml_load_LDFLAGS= ${QT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_load_SOURCES = scribo_io_xml_load.cc +endif HAVE_QT +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. +if HAVE_MAGICKXX if HAVE_QT if HAVE_TESSERACT if HAVE_TIFF @@ -21,10 +151,30 @@ endif HAVE_MAGICKXX # Starting a conditional unit test list. if HAVE_MAGICKXX if HAVE_TESSERACT +check_PROGRAMS += \ +scribo_toolchain_content_in_hdoc \ +scribo_toolchain_internal_content_in_hdoc_functor + +scribo_toolchain_content_in_hdoc_CPPFLAGS= ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_toolchain_content_in_hdoc_LDFLAGS= ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_content_in_hdoc_SOURCES = scribo_toolchain_content_in_hdoc.cc +scribo_toolchain_internal_content_in_hdoc_functor_CPPFLAGS= ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_toolchain_internal_content_in_hdoc_functor_LDFLAGS= ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_internal_content_in_hdoc_functor_SOURCES = scribo_toolchain_internal_content_in_hdoc_functor.cc +endif HAVE_TESSERACT +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. +if HAVE_MAGICKXX +if HAVE_TESSERACT if HAVE_TIFF check_PROGRAMS += \ +scribo_toolchain_content_in_doc \ scribo_toolchain_internal_content_in_doc_functor +scribo_toolchain_content_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} +scribo_toolchain_content_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc @@ -37,9 +187,7 @@ if HAVE_QT check_PROGRAMS += \ scribo_convert_from_base64 \ scribo_convert_from_qimage \ -scribo_io_xml_internal_full_xml_visitor \ -scribo_io_xml_internal_save_image_to_xml \ -scribo_io_xml_load +scribo_io_xml_internal_save_image_to_xml scribo_convert_from_base64_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} scribo_convert_from_base64_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} @@ -47,25 +195,9 @@ scribo_convert_from_base64_SOURCES = scribo_convert_from_base64.cc scribo_convert_from_qimage_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} scribo_convert_from_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} scribo_convert_from_qimage_SOURCES = scribo_convert_from_qimage.cc -scribo_io_xml_internal_full_xml_visitor_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} -scribo_io_xml_internal_full_xml_visitor_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} -scribo_io_xml_internal_full_xml_visitor_SOURCES = scribo_io_xml_internal_full_xml_visitor.cc scribo_io_xml_internal_save_image_to_xml_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} scribo_io_xml_internal_save_image_to_xml_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} scribo_io_xml_internal_save_image_to_xml_SOURCES = scribo_io_xml_internal_save_image_to_xml.cc -scribo_io_xml_load_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} -scribo_io_xml_load_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} -scribo_io_xml_load_SOURCES = scribo_io_xml_load.cc -endif HAVE_QT - -# Starting a conditional unit test list. -if HAVE_QT -if HAVE_TESSERACT -if HAVE_TIFF -check_PROGRAMS += - -endif HAVE_TIFF -endif HAVE_TESSERACT endif HAVE_QT # Starting a conditional unit test list. @@ -74,7 +206,6 @@ if HAVE_TIFF check_PROGRAMS += \ scribo_text_recognition \ scribo_toolchain_internal_text_in_doc_functor \ -scribo_toolchain_content_in_doc \ scribo_toolchain_text_in_doc scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${AM_CPPFLAGS} @@ -83,9 +214,6 @@ scribo_text_recognition_SOURCES = scribo_text_recognition.cc scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${AM_CPPFLAGS} scribo_toolchain_internal_text_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_internal_text_in_doc_functor_SOURCES = scribo_toolchain_internal_text_in_doc_functor.cc -scribo_toolchain_content_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${AM_CPPFLAGS} -scribo_toolchain_content_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} -scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_text_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${AM_CPPFLAGS} scribo_toolchain_text_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_text_in_doc_SOURCES = scribo_toolchain_text_in_doc.cc @@ -119,11 +247,9 @@ scribo_core_concept_serializable \ scribo_core_concept_serialize_visitor \ scribo_core_def_color_type \ scribo_core_def_lbl_type \ -scribo_core_document \ scribo_core_erase_objects \ scribo_core_group_info \ scribo_core_init_integral_image \ -scribo_core_internal_doc_serializer \ scribo_core_internal_sort_comp_ids \ scribo_core_line_info \ scribo_core_line_links \ @@ -158,7 +284,6 @@ scribo_debug_save_comp_diff \ scribo_debug_save_label_image \ scribo_debug_save_table_image \ scribo_debug_text_areas_image \ -scribo_debug_text_color_image \ scribo_debug_usage \ scribo_draw_all \ scribo_draw_bounding_box_links \ @@ -172,7 +297,6 @@ scribo_estim_internal_compute_skeleton \ scribo_estim_object_groups_mean_width \ scribo_filter_all \ scribo_filter_common_objects_photo \ -scribo_filter_images_in_paragraph \ scribo_filter_internal_alignment_angle \ scribo_filter_internal_component_aligned \ scribo_filter_internal_compute \ @@ -204,40 +328,22 @@ scribo_filter_objects_v_thick \ scribo_filter_objects_v_thin \ scribo_filter_objects_with_holes \ scribo_filter_paragraphs_bbox_overlap \ -scribo_filter_paragraphs_in_borders \ -scribo_filter_paragraphs_in_image \ -scribo_filter_separators_in_borders \ -scribo_filter_separators_in_element \ -scribo_filter_separators_in_paragraph \ -scribo_filter_separators_vert_in_borders \ scribo_fun_v2b_label_to_bool \ scribo_fun_v2b_objects_large_filter \ scribo_fun_v2b_objects_on_border_filter \ scribo_fun_v2b_objects_small_filter \ scribo_fun_v2v_highlight \ -scribo_io_img_internal_debug_img_visitor \ scribo_io_img_internal_draw_edges \ -scribo_io_img_internal_full_img_visitor \ -scribo_io_img_internal_non_text_img_visitor \ -scribo_io_img_internal_text_img_visitor \ -scribo_io_img_save \ scribo_io_text_boxes_save \ scribo_io_xml_internal_compute_text_colour \ -scribo_io_xml_internal_extended_page_xml_visitor \ -scribo_io_xml_internal_page_xml_visitor \ scribo_io_xml_internal_print_box_coords \ scribo_io_xml_internal_print_image_coords \ -scribo_io_xml_internal_print_page_preambule \ scribo_io_xml_internal_time_info \ -scribo_io_xml_save \ scribo_make_all \ scribo_make_debug_filename \ scribo_make_influence_zone_graph \ -scribo_make_text_blocks_image \ -scribo_make_text_components_image \ scribo_postprocessing_all \ scribo_postprocessing_fill_object_holes \ -scribo_postprocessing_images_to_drop_capital \ scribo_preprocessing_all \ scribo_preprocessing_crop \ scribo_preprocessing_crop_without_localization \ @@ -250,7 +356,6 @@ scribo_preprocessing_homogeneous_contrast \ scribo_preprocessing_rotate_90 \ scribo_preprocessing_split_bg_fg \ scribo_primitive_all \ -scribo_primitive_extract_alignments \ scribo_primitive_extract_all \ scribo_primitive_extract_canvas \ scribo_primitive_extract_cells \ @@ -271,9 +376,6 @@ scribo_primitive_extract_lines_v_pattern \ scribo_primitive_extract_lines_v_single \ scribo_primitive_extract_lines_v_thick \ scribo_primitive_extract_lines_v_thick_and_single \ -scribo_primitive_extract_non_text \ -scribo_primitive_extract_non_text_hdoc \ -scribo_primitive_extract_non_text_kmean \ scribo_primitive_extract_separators \ scribo_primitive_extract_separators_nonvisible \ scribo_primitive_extract_vertical_separators \ @@ -349,7 +451,6 @@ scribo_text_clean \ scribo_text_clean_inplace \ scribo_text_extract_lines \ scribo_text_extract_lines_with_features \ -scribo_text_extract_lines_wo_merge \ scribo_text_extract_paragraphs \ scribo_text_extract_paragraphs_hdoc \ scribo_text_link_lines \ @@ -357,8 +458,6 @@ scribo_text_look_like_text_lines \ scribo_text_merging \ scribo_text_merging_hdoc \ scribo_text_paragraphs_closing \ -scribo_toolchain_content_in_hdoc \ -scribo_toolchain_internal_content_in_hdoc_functor \ scribo_toolchain_internal_text_in_doc_preprocess_functor \ scribo_toolchain_internal_text_in_picture_functor \ scribo_toolchain_internal_toolchain_functor \ @@ -397,11 +496,9 @@ scribo_core_concept_serializable_SOURCES = scribo_core_concept_serializable.cc scribo_core_concept_serialize_visitor_SOURCES = scribo_core_concept_serialize_visitor.cc scribo_core_def_color_type_SOURCES = scribo_core_def_color_type.cc scribo_core_def_lbl_type_SOURCES = scribo_core_def_lbl_type.cc -scribo_core_document_SOURCES = scribo_core_document.cc scribo_core_erase_objects_SOURCES = scribo_core_erase_objects.cc scribo_core_group_info_SOURCES = scribo_core_group_info.cc scribo_core_init_integral_image_SOURCES = scribo_core_init_integral_image.cc -scribo_core_internal_doc_serializer_SOURCES = scribo_core_internal_doc_serializer.cc scribo_core_internal_sort_comp_ids_SOURCES = scribo_core_internal_sort_comp_ids.cc scribo_core_line_info_SOURCES = scribo_core_line_info.cc scribo_core_line_links_SOURCES = scribo_core_line_links.cc @@ -436,7 +533,6 @@ scribo_debug_save_comp_diff_SOURCES = scribo_debug_save_comp_diff.cc scribo_debug_save_label_image_SOURCES = scribo_debug_save_label_image.cc scribo_debug_save_table_image_SOURCES = scribo_debug_save_table_image.cc scribo_debug_text_areas_image_SOURCES = scribo_debug_text_areas_image.cc -scribo_debug_text_color_image_SOURCES = scribo_debug_text_color_image.cc scribo_debug_usage_SOURCES = scribo_debug_usage.cc scribo_draw_all_SOURCES = scribo_draw_all.cc scribo_draw_bounding_box_links_SOURCES = scribo_draw_bounding_box_links.cc @@ -450,7 +546,6 @@ scribo_estim_internal_compute_skeleton_SOURCES = scribo_estim_internal_compute_s scribo_estim_object_groups_mean_width_SOURCES = scribo_estim_object_groups_mean_width.cc scribo_filter_all_SOURCES = scribo_filter_all.cc scribo_filter_common_objects_photo_SOURCES = scribo_filter_common_objects_photo.cc -scribo_filter_images_in_paragraph_SOURCES = scribo_filter_images_in_paragraph.cc scribo_filter_internal_alignment_angle_SOURCES = scribo_filter_internal_alignment_angle.cc scribo_filter_internal_component_aligned_SOURCES = scribo_filter_internal_component_aligned.cc scribo_filter_internal_compute_SOURCES = scribo_filter_internal_compute.cc @@ -482,40 +577,22 @@ scribo_filter_objects_v_thick_SOURCES = scribo_filter_objects_v_thick.cc scribo_filter_objects_v_thin_SOURCES = scribo_filter_objects_v_thin.cc scribo_filter_objects_with_holes_SOURCES = scribo_filter_objects_with_holes.cc scribo_filter_paragraphs_bbox_overlap_SOURCES = scribo_filter_paragraphs_bbox_overlap.cc -scribo_filter_paragraphs_in_borders_SOURCES = scribo_filter_paragraphs_in_borders.cc -scribo_filter_paragraphs_in_image_SOURCES = scribo_filter_paragraphs_in_image.cc -scribo_filter_separators_in_borders_SOURCES = scribo_filter_separators_in_borders.cc -scribo_filter_separators_in_element_SOURCES = scribo_filter_separators_in_element.cc -scribo_filter_separators_in_paragraph_SOURCES = scribo_filter_separators_in_paragraph.cc -scribo_filter_separators_vert_in_borders_SOURCES = scribo_filter_separators_vert_in_borders.cc scribo_fun_v2b_label_to_bool_SOURCES = scribo_fun_v2b_label_to_bool.cc scribo_fun_v2b_objects_large_filter_SOURCES = scribo_fun_v2b_objects_large_filter.cc scribo_fun_v2b_objects_on_border_filter_SOURCES = scribo_fun_v2b_objects_on_border_filter.cc scribo_fun_v2b_objects_small_filter_SOURCES = scribo_fun_v2b_objects_small_filter.cc scribo_fun_v2v_highlight_SOURCES = scribo_fun_v2v_highlight.cc -scribo_io_img_internal_debug_img_visitor_SOURCES = scribo_io_img_internal_debug_img_visitor.cc scribo_io_img_internal_draw_edges_SOURCES = scribo_io_img_internal_draw_edges.cc -scribo_io_img_internal_full_img_visitor_SOURCES = scribo_io_img_internal_full_img_visitor.cc -scribo_io_img_internal_non_text_img_visitor_SOURCES = scribo_io_img_internal_non_text_img_visitor.cc -scribo_io_img_internal_text_img_visitor_SOURCES = scribo_io_img_internal_text_img_visitor.cc -scribo_io_img_save_SOURCES = scribo_io_img_save.cc scribo_io_text_boxes_save_SOURCES = scribo_io_text_boxes_save.cc scribo_io_xml_internal_compute_text_colour_SOURCES = scribo_io_xml_internal_compute_text_colour.cc -scribo_io_xml_internal_extended_page_xml_visitor_SOURCES = scribo_io_xml_internal_extended_page_xml_visitor.cc -scribo_io_xml_internal_page_xml_visitor_SOURCES = scribo_io_xml_internal_page_xml_visitor.cc scribo_io_xml_internal_print_box_coords_SOURCES = scribo_io_xml_internal_print_box_coords.cc scribo_io_xml_internal_print_image_coords_SOURCES = scribo_io_xml_internal_print_image_coords.cc -scribo_io_xml_internal_print_page_preambule_SOURCES = scribo_io_xml_internal_print_page_preambule.cc scribo_io_xml_internal_time_info_SOURCES = scribo_io_xml_internal_time_info.cc -scribo_io_xml_save_SOURCES = scribo_io_xml_save.cc scribo_make_all_SOURCES = scribo_make_all.cc scribo_make_debug_filename_SOURCES = scribo_make_debug_filename.cc scribo_make_influence_zone_graph_SOURCES = scribo_make_influence_zone_graph.cc -scribo_make_text_blocks_image_SOURCES = scribo_make_text_blocks_image.cc -scribo_make_text_components_image_SOURCES = scribo_make_text_components_image.cc scribo_postprocessing_all_SOURCES = scribo_postprocessing_all.cc scribo_postprocessing_fill_object_holes_SOURCES = scribo_postprocessing_fill_object_holes.cc -scribo_postprocessing_images_to_drop_capital_SOURCES = scribo_postprocessing_images_to_drop_capital.cc scribo_preprocessing_all_SOURCES = scribo_preprocessing_all.cc scribo_preprocessing_crop_SOURCES = scribo_preprocessing_crop.cc scribo_preprocessing_crop_without_localization_SOURCES = scribo_preprocessing_crop_without_localization.cc @@ -528,7 +605,6 @@ scribo_preprocessing_homogeneous_contrast_SOURCES = scribo_preprocessing_homogen scribo_preprocessing_rotate_90_SOURCES = scribo_preprocessing_rotate_90.cc scribo_preprocessing_split_bg_fg_SOURCES = scribo_preprocessing_split_bg_fg.cc scribo_primitive_all_SOURCES = scribo_primitive_all.cc -scribo_primitive_extract_alignments_SOURCES = scribo_primitive_extract_alignments.cc scribo_primitive_extract_all_SOURCES = scribo_primitive_extract_all.cc scribo_primitive_extract_canvas_SOURCES = scribo_primitive_extract_canvas.cc scribo_primitive_extract_cells_SOURCES = scribo_primitive_extract_cells.cc @@ -549,9 +625,6 @@ scribo_primitive_extract_lines_v_pattern_SOURCES = scribo_primitive_extract_line scribo_primitive_extract_lines_v_single_SOURCES = scribo_primitive_extract_lines_v_single.cc scribo_primitive_extract_lines_v_thick_SOURCES = scribo_primitive_extract_lines_v_thick.cc scribo_primitive_extract_lines_v_thick_and_single_SOURCES = scribo_primitive_extract_lines_v_thick_and_single.cc -scribo_primitive_extract_non_text_SOURCES = scribo_primitive_extract_non_text.cc -scribo_primitive_extract_non_text_hdoc_SOURCES = scribo_primitive_extract_non_text_hdoc.cc -scribo_primitive_extract_non_text_kmean_SOURCES = scribo_primitive_extract_non_text_kmean.cc scribo_primitive_extract_separators_SOURCES = scribo_primitive_extract_separators.cc scribo_primitive_extract_separators_nonvisible_SOURCES = scribo_primitive_extract_separators_nonvisible.cc scribo_primitive_extract_vertical_separators_SOURCES = scribo_primitive_extract_vertical_separators.cc @@ -627,7 +700,6 @@ scribo_text_clean_SOURCES = scribo_text_clean.cc scribo_text_clean_inplace_SOURCES = scribo_text_clean_inplace.cc scribo_text_extract_lines_SOURCES = scribo_text_extract_lines.cc scribo_text_extract_lines_with_features_SOURCES = scribo_text_extract_lines_with_features.cc -scribo_text_extract_lines_wo_merge_SOURCES = scribo_text_extract_lines_wo_merge.cc scribo_text_extract_paragraphs_SOURCES = scribo_text_extract_paragraphs.cc scribo_text_extract_paragraphs_hdoc_SOURCES = scribo_text_extract_paragraphs_hdoc.cc scribo_text_link_lines_SOURCES = scribo_text_link_lines.cc @@ -635,8 +707,6 @@ scribo_text_look_like_text_lines_SOURCES = scribo_text_look_like_text_lines.cc scribo_text_merging_SOURCES = scribo_text_merging.cc scribo_text_merging_hdoc_SOURCES = scribo_text_merging_hdoc.cc scribo_text_paragraphs_closing_SOURCES = scribo_text_paragraphs_closing.cc -scribo_toolchain_content_in_hdoc_SOURCES = scribo_toolchain_content_in_hdoc.cc -scribo_toolchain_internal_content_in_hdoc_functor_SOURCES = scribo_toolchain_internal_content_in_hdoc_functor.cc scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc scribo_toolchain_internal_text_in_picture_functor_SOURCES = scribo_toolchain_internal_text_in_picture_functor.cc scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc -- 1.7.2.5

13 years, 3 months

last-svn-commit-979-g4ff4976 Fix compilation dependencies in Scribo.

by Roland Levillain

* src/contest/DAE-2011/Makefile.am (content_in_hdoc_dae_CPPFLAGS, content_in_doc_dae_CPPFLAGS) * src/contest/hdlac-2011/Makefile.am (content_in_hdoc_hdlac_CPPFLAGS): Add $(MAGICKXX_CPPFLAGS). * src/debug/Makefile.am (noinst_PROGRAMS): Move show_lines_boldness... (noinst_PROGRAMS) [HAVE_MAGICKXX, HAVE_TESSERACT]: ...here. (show_lines_boldness_SOURCES): Remove. (show_lines_boldness_SOURCES) (show_lines_boldness_CPPFLAGS) (show_lines_boldness_LDFLAGS) [HAVE_MAGICKXX, HAVE_TESSERACT]: New. (show_text_lines_CPPFLAGS) (show_text_lines_wo_seps_CPPFLAGS) [HAVE_MAGICKXX, HAVE_QT, HAVE_TESSERACT]: Add $(TESSERACT_CPPFLAGS). --- scribo/ChangeLog | 22 ++++++++++++++++ scribo/src/contest/DAE-2011/Makefile.am | 20 ++++++++------- scribo/src/contest/hdlac-2011/Makefile.am | 11 ++++---- scribo/src/debug/Makefile.am | 38 +++++++++++++++++++---------- 4 files changed, 64 insertions(+), 27 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 014a825..7b5ea85 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,25 @@ +2011-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Fix compilation dependencies in Scribo. + + * src/contest/DAE-2011/Makefile.am + (content_in_hdoc_dae_CPPFLAGS, content_in_doc_dae_CPPFLAGS) + * src/contest/hdlac-2011/Makefile.am + (content_in_hdoc_hdlac_CPPFLAGS): + Add $(MAGICKXX_CPPFLAGS). + * src/debug/Makefile.am + (noinst_PROGRAMS): Move show_lines_boldness... + (noinst_PROGRAMS) [HAVE_MAGICKXX, HAVE_TESSERACT]: ...here. + (show_lines_boldness_SOURCES): Remove. + (show_lines_boldness_SOURCES) + (show_lines_boldness_CPPFLAGS) + (show_lines_boldness_LDFLAGS) + [HAVE_MAGICKXX, HAVE_TESSERACT]: New. + (show_text_lines_CPPFLAGS) + (show_text_lines_wo_seps_CPPFLAGS) + [HAVE_MAGICKXX, HAVE_QT, HAVE_TESSERACT]: + Add $(TESSERACT_CPPFLAGS). + 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/toolchain/internal/toolchain_functor.hh: Add a missing diff --git a/scribo/src/contest/DAE-2011/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am index d7d6b8d..00d0009 100644 --- a/scribo/src/contest/DAE-2011/Makefile.am +++ b/scribo/src/contest/DAE-2011/Makefile.am @@ -28,19 +28,21 @@ noinst_PROGRAMS += content_in_hdoc_dae content_in_doc_dae content_in_hdoc_dae_SOURCES = content_in_hdoc_dae.cc content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + -I$(top_builddir) content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) + -lpthread \ + $(MAGICKXX_LDFLAGS) content_in_doc_dae_SOURCES = content_in_doc_dae.cc content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + -I$(top_builddir) content_in_doc_dae_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) + -lpthread \ + $(MAGICKXX_LDFLAGS) -endif HAVE_MAGICKXX \ No newline at end of file +endif HAVE_MAGICKXX diff --git a/scribo/src/contest/hdlac-2011/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am index f5ead52..7d9258a 100644 --- a/scribo/src/contest/hdlac-2011/Makefile.am +++ b/scribo/src/contest/hdlac-2011/Makefile.am @@ -28,10 +28,11 @@ noinst_PROGRAMS += content_in_hdoc_hdlac content_in_hdoc_hdlac_SOURCES = content_in_hdoc_hdlac.cc content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ + -I$(top_builddir) content_in_hdoc_hdlac_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread \ - $(MAGICKXX_LDFLAGS) + -lpthread \ + $(MAGICKXX_LDFLAGS) -endif HAVE_MAGICKXX \ No newline at end of file +endif HAVE_MAGICKXX diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 35beaf2..838974d 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -23,7 +23,6 @@ noinst_PROGRAMS = \ show_groups_bboxes_filtered \ show_info_x_height \ show_info_median_inter_characters \ - show_lines_boldness \ show_separators \ show_links_left_right_links_validation \ show_links_bbox_h_ratio \ @@ -40,7 +39,7 @@ noinst_PROGRAMS = \ show_links_single_left_dmax_ratio \ show_links_single_right \ show_links_single_right_dmax_ratio \ - show_links_single_up \ + show_links_single_up \ show_links_single_up_left_aligned \ show_links_single_up_right_aligned \ show_links_top_aligned \ @@ -57,7 +56,6 @@ show_groups_bboxes_SOURCES = show_groups_bboxes.cc show_groups_bboxes_filtered_SOURCES = show_groups_bboxes_filtered.cc show_info_x_height_SOURCES = show_info_x_height.cc show_info_median_inter_characters_SOURCES = show_info_median_inter_characters.cc -show_lines_boldness_SOURCES = show_lines_boldness.cc show_separators_SOURCES = show_separators.cc show_links_left_right_links_validation_SOURCES = show_links_left_right_links_validation.cc show_links_bbox_h_ratio_SOURCES = show_links_bbox_h_ratio.cc @@ -85,6 +83,7 @@ show_objects_small_SOURCES = show_objects_small.cc show_objects_thick_SOURCES = show_objects_thick.cc show_objects_thin_SOURCES = show_objects_thin.cc + if HAVE_MAGICKXX noinst_PROGRAMS += show_components_color @@ -101,6 +100,16 @@ if HAVE_MAGICKXX show_components_boldness_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) +if HAVE_TESSERACT + noinst_PROGRAMS += show_lines_boldness + show_lines_boldness_SOURCES = show_lines_boldness.cc + show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) + show_lines_boldness_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) +endif HAVE_TESSERACT + if HAVE_QT noinst_PROGRAMS += show_paragraph_blocks @@ -116,41 +125,44 @@ if HAVE_QT show_paragraph_blocks_LDADD = $(LDADD) \ $(QT_LIBS) - noinst_PROGRAMS += show_text_lines +if HAVE_TESSERACT + noinst_PROGRAMS += show_text_lines show_text_lines_SOURCES = show_text_lines.cc show_text_lines_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ $(QT_CPPFLAGS) -DHAVE_QT show_text_lines_CXXFLAGS = $(AM_CXXFLAGS) \ - $(QT_CXXFLAGS) + $(QT_CXXFLAGS) show_text_lines_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) \ $(QT_LDFLAGS) show_text_lines_LDADD = $(LDADD) \ $(QT_LIBS) - noinst_PROGRAMS += show_text_lines_wo_seps + noinst_PROGRAMS += show_text_lines_wo_seps show_text_lines_wo_seps_SOURCES = show_text_lines_wo_seps.cc show_text_lines_wo_seps_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + $(TESSERACT_CPPFLAGS) \ $(QT_CPPFLAGS) -DHAVE_QT show_text_lines_wo_seps_CXXFLAGS = $(AM_CXXFLAGS) \ - $(QT_CXXFLAGS) + $(QT_CXXFLAGS) show_text_lines_wo_seps_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) \ $(QT_LDFLAGS) show_text_lines_wo_seps_LDADD = $(LDADD) \ $(QT_LIBS) - +endif HAVE_TESSERACT noinst_PROGRAMS += show_stoppers show_stoppers_SOURCES = show_stoppers.cc show_stoppers_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ $(QT_CPPFLAGS) show_stoppers_CXXFLAGS = $(AM_CXXFLAGS) \ - $(QT_CXXFLAGS) + $(QT_CXXFLAGS) show_stoppers_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) \ $(QT_LDFLAGS) @@ -161,7 +173,7 @@ if HAVE_QT endif HAVE_QT - noinst_PROGRAMS += highlight_text_area + noinst_PROGRAMS += highlight_text_area highlight_text_area_SOURCES = highlight_text_area.cc highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) -- 1.7.2.5

13 years, 3 months

last-svn-commit-981-ge9095c7 Generate a valid Portfile for MacPorts support.

by Guillaume Lazzara

* Makefile.am: Add a rule to create a valid Portfile. * distrib/macports/Portfile.in: New. --- ChangeLog | 8 ++++++++ Makefile.am | 28 ++++++++++++++++++++++++++++ distrib/macports/Portfile.in | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 0 deletions(-) create mode 100644 distrib/macports/Portfile.in diff --git a/ChangeLog b/ChangeLog index f20fcec..9e0ea05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Generate a valid Portfile for MacPorts support. + + * Makefile.am: Add a rule to create a valid Portfile. + + * distrib/macports/Portfile.in: New. + 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> * lrde-scmstats.sh: Do not change permissions. diff --git a/Makefile.am b/Makefile.am index f89da9f..636f10b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,34 @@ LRDE_NODIST_FILES = \ $(distdir)/milena/tests/registration/registration.cc \ $(distdir)/milena/tests/value/stack.cc +PORTFILE=distrib/macports/Portfile + +TARBALL_GZ=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz +do_subst = sed -e 's|@packagename[@]|$(PACKAGE_TARNAME)|g' \ + -e 's|@version[@]|$(PACKAGE_VERSION)|g' \ + -e "s|@package_md5[@]|`md5sum $(TARBALL_GZ) | cut -d ' ' -f 1`|g" \ + -e "s|@package_sha1[@]|`openssl sha1 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" \ + -e "s|@package_rmd160[@]|`openssl rmd160 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" + +$(PORTFILE): dist $(top_srcdir)/distrib/macports/Portfile.in Makefile + rm -f $@ $@.tmp + rm -Rf distrib + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(mkdir_p) distrib/macports + md5=`md5sum $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz` + sha1=`openssl sha1 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz` + rmd160=`openssl rmd160 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz`; + $(do_subst) $(srcdir)/$@.in >$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = $(PORTFILE) + + +port: $(PORTFILE) + ## FIXME: Running `build-aux/build_unit_test.sh' just to update ## `milena/tests/unit_test/unit-tests.mk' is overkill: ## diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in new file mode 100644 index 0000000..129a5e8 --- /dev/null +++ b/distrib/macports/Portfile.in @@ -0,0 +1,39 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:s +# $Id$ + +PortSystem 1.0 + +name @packagename@ +version @version@ +categories devel framework graphics science +platforms darwin +license GPL-2 +maintainers Olena Team +description Software platform for efficient and generic image processing +long_description It is composed of a Generic and efficient C++ image \ + processing library, a framework for Document Image \ + Analysis and Python bindings. +homepage http://olena.lrde.epita.fr +master_sites http://www.lrde.epita.fr/dload/olena/ + +checksums md5 @package_md5@ \ + sha1 @package_sha1@ \ + rmd160 @package_rmd160@ + +depends_lib port:GraphicsMagick \ + port:tiff + +supported_archs i386 x86_64 + +variant scribo description {Add a DIA framework} { + depends_lib-append port:tesseract \ + port:qt4-mac \ + port:fop + configure.args-append --enable-scribo +} + +variant swilena description {Add Python bindings} { + configure.args-append --enable-swilena +} + +default_variants +scribo \ No newline at end of file -- 1.7.2.5

13 years, 3 months

branch unstable/scribo updated: last-svn-commit-978-g571b25c

by lazzara＠lrde.epita.fr

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 unstable/scribo has been updated via 571b25c281f3e2cace5f2a0c96f251e7a977f6e6 (commit) from 7d88a2035733a69070a2c674f7d40ba26c844674 (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 ----------------------------------------------------------------- 571b25c lrde-scmstats.sh: Do not change permissions. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ lrde-scmstats.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

last-svn-commit-978-g571b25c lrde-scmstats.sh: Do not change permissions.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ lrde-scmstats.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8370d97..f20fcec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + * lrde-scmstats.sh: Do not change permissions. + +2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + * lrde-scmstats.sh: New. 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/lrde-scmstats.sh b/lrde-scmstats.sh index b10178c..0c84c4c 100755 --- a/lrde-scmstats.sh +++ b/lrde-scmstats.sh @@ -38,5 +38,3 @@ DEST=/lrde/dload/olena/stats/ gitstats . $DEST -# Expose updated files. -chmod -R a+rX $DEST -- 1.7.2.5

13 years, 3 months

branch unstable/scribo updated: last-svn-commit-977-g7d88a20

by lazzara＠lrde.epita.fr

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 unstable/scribo has been updated discards c798e2a5acf876efe215ce219b39728bd17d213c (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (7d88a2035733a69070a2c674f7d40ba26c844674) \ O -- O -- O (c798e2a5acf876efe215ce219b39728bd17d213c) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: ChangeLog | 4 ---- lrde-scmstats.sh | 6 +----- 2 files changed, 1 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

branch unstable/scribo updated: last-svn-commit-978-gc798e2a

by lazzara＠lrde.epita.fr

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 unstable/scribo has been updated via c798e2a5acf876efe215ce219b39728bd17d213c (commit) via 7d88a2035733a69070a2c674f7d40ba26c844674 (commit) from 0a72fc36e4608dc34c8c4e8d2bfc8767f2906805 (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 ----------------------------------------------------------------- c798e2a lrde-scmstats.sh: Fix division by zero in Gitstats. 7d88a20 doc/Makefile.am: Fix devel-refman output directory. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ lrde-scmstats.sh | 6 +++++- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2011