- Olena-patches

last-svn-commit-502-g9d6e03f Add scribo-cli script.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* src/Makefile.am: Add new rules to generate scribo-cli. * src/scribo-cli.in: New. --- scribo/ChangeLog | 8 +++ scribo/src/Makefile.am | 19 +++++++ scribo/src/scribo-cli.in | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 0 deletions(-) create mode 100755 scribo/src/scribo-cli.in diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3531f05..95e0a35 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add scribo-cli script. + + * src/Makefile.am: Add new rules to generate scribo-cli. + + * src/scribo-cli.in: New. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Setup what to install with Scribo. * demo/viewer/Makefile.am: Do not install includes. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 4690f9f..ed458cd 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -84,3 +84,22 @@ if HAVE_TESSERACT endif HAVE_TESSERACT endif HAVE_MAGICKXX + + +# Generated by configure from scribo-cli.in. +dist_bin_SCRIPTS = scribo-cli + +do_subst = sed -e 's|@utilexecdir[@]|$(utilexecdir)|g' + +scribo-cli: $(srcdir)/scribo-cli.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(do_subst) $${srcdir}$@.in >$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = $(bin_SCRIPTS) + +EXTRA_DIST = scribo-cli.in diff --git a/scribo/src/scribo-cli.in b/scribo/src/scribo-cli.in new file mode 100755 index 0000000..e271810 --- /dev/null +++ b/scribo/src/scribo-cli.in @@ -0,0 +1,135 @@ +# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. +# +#!/bin/sh + +bdir="@utilexecdir@" +bin=`basename $0` + +version() +{ + cat <<EOF +SCRIBO Command LIne tool, version 1.0 +Copyright (C) 2010 LRDE/EPITA +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +EOF +} + +usage() +{ + cat <<EOF +Usage: $bin [version] [help] COMMAND [ARGS] + +List of available COMMAND argument: + + Full Toolchains + --------------- + + + * On documents + + doc-ppc Common preprocessing before looking for text. + + doc-ocr Find and recognize text. + + + + * On pictures + + pic-loc Try to localize text if there's any. + + pic-ocr Localize and try to recognize text. + + + Algorithms + ---------- + + + * Binarization + + sauvola Sauvola's algorithm. + + sauvola-ms Multi-scale Sauvola's algorithm. + + sauvola-ms-fg Extract foreground objects and run multi-scale + Sauvola's algorithm. + + sauvola-ms-split Run multi-scale Sauvola's algorithm on each color + component and merge results. + +--------------------------------------------------------------------------- +See '$bin COMMAND --help' for more information on a specific command. +EOF +} + + +run_cmd() +{ + cmd="$1"; + shift; + + case $cmd in + + doc-ppc) + $bdir/text_in_doc_preprocess $@ + ;; + + doc-ocr) + $bdir/pbm_text_in_doc $@ + ;; + + pic-loc) + $bdir/text_in_picture $@ + ;; + + pic-ocr) + $bdir/text_recognition_in_picture $@ + ;; + + *) + cmd_bin=`echo $cmd | sed -e 's/-/_/g'` + if test -f $bdir/$cmd_bin; then + $bdir/$cmd_bin $@ + else + echo "Error: Invalid command!" + usage + fi + esac +} + + +case $1 in + + version | --version) + version + ;; + + + help | --help) + + usage + ;; + + help) + + ;; + + *) + run_cmd $1 + ;; + +esac -- 1.5.6.5

1 0

last-svn-commit-501-g330d20b Setup what to install with Scribo.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* demo/viewer/Makefile.am: Do not install includes. * scribo.mk (utilexecdir): New variable. * src/Makefile.am, * src/binarization/Makefile.am: Install usefull binaries in utilexecdir. * src/contest/hdibco-2010/Makefile.am, * src/debug/Makefile.am, * src/filter/Makefile.am, * src/misc/Makefile.am, * src/postprocessing/Makefile.am, * src/preprocessing/Makefile.am, * src/primitive/extract/Makefile.am, * src/primitive/find/Makefile.am, * src/primitive/group/Makefile.am, * src/table/Makefile.am, * src/text/Makefile.am: Do not install theses binaries. --- scribo/ChangeLog | 24 +++++++++ scribo/demo/review/Makefile.am | 1 - scribo/demo/viewer/Makefile.am | 72 ++++++++++++++-------------- scribo/scribo.mk | 2 + scribo/src/Makefile.am | 10 ++-- scribo/src/binarization/Makefile.am | 66 +++++++++++++------------ scribo/src/contest/hdibco-2010/Makefile.am | 2 +- scribo/src/debug/Makefile.am | 6 +- scribo/src/filter/Makefile.am | 5 +- scribo/src/misc/Makefile.am | 5 +- scribo/src/postprocessing/Makefile.am | 2 +- scribo/src/preprocessing/Makefile.am | 61 +++++++++++------------- scribo/src/primitive/extract/Makefile.am | 5 +- scribo/src/primitive/find/Makefile.am | 5 +- scribo/src/primitive/group/Makefile.am | 2 +- scribo/src/table/Makefile.am | 7 ++- scribo/src/text/Makefile.am | 9 ++-- 17 files changed, 157 insertions(+), 127 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9379bf0..3531f05 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,29 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Setup what to install with Scribo. + + * demo/viewer/Makefile.am: Do not install includes. + + * scribo.mk (utilexecdir): New variable. + + * src/Makefile.am, + * src/binarization/Makefile.am: Install usefull binaries in + utilexecdir. + + * src/contest/hdibco-2010/Makefile.am, + * src/debug/Makefile.am, + * src/filter/Makefile.am, + * src/misc/Makefile.am, + * src/postprocessing/Makefile.am, + * src/preprocessing/Makefile.am, + * src/primitive/extract/Makefile.am, + * src/primitive/find/Makefile.am, + * src/primitive/group/Makefile.am, + * src/table/Makefile.am, + * src/text/Makefile.am: Do not install theses binaries. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of autotroll in demo/review. * demo/review/Makefile.am: Make use of autotroll. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index cd793db..323647f 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -38,5 +38,4 @@ noinst_HEADERS = src/mainwindow.hh EXTRA_DIST = \ - README \ review.qrc diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index a0112c6..eec19b9 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -14,27 +14,27 @@ include $(top_srcdir)/build-aux/autotroll.mk -bin_PROGRAMS = viewer -viewer_SOURCES = $(BUILT_SOURCES) \ - viewer.cc \ - main.cc \ - image_widget.cc \ - xml_widget.cc \ - key_widget.cc \ - property_widget.cc \ - browser_widget.cc \ - image_scene.cc \ - image_view.cc \ - dommodel.cc \ - domitem.cc \ - image_region.cc \ - help_dialog.cc \ - step_widget.cc +bin_PROGRAMS = scribo-viewer +scribo_viewer_SOURCES = $(BUILT_SOURCES) \ + viewer.cc \ + main.cc \ + image_widget.cc \ + xml_widget.cc \ + key_widget.cc \ + property_widget.cc \ + browser_widget.cc \ + image_scene.cc \ + image_view.cc \ + dommodel.cc \ + domitem.cc \ + image_region.cc \ + help_dialog.cc \ + step_widget.cc -viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) -viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 -viewer_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) -viewer_LDADD = $(QT_LIBS) $(LDADD) +scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) +scribo_viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 +scribo_viewer_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) +scribo_viewer_LDADD = $(QT_LIBS) $(LDADD) BUILT_SOURCES = viewer.moc.cc \ image_widget.moc.cc \ @@ -50,21 +50,21 @@ BUILT_SOURCES = viewer.moc.cc \ help_dialog.moc.cc \ step_widget.moc.cc -include_HEADERS = viewer.hh \ - viewer.hxx \ - image_widget.hh \ - xml_widget.hh \ - key_widget.hh \ - property_widget.hh \ - browser_widget.hh \ - image_scene.hh \ - image_view.hh \ - dommodel.hh \ - domitem.hh \ - image_region.hh \ - image_region.hxx \ - common.hh \ - help_dialog.hh \ - step_widget.hh +noinst_HEADERS = viewer.hh \ + viewer.hxx \ + image_widget.hh \ + xml_widget.hh \ + key_widget.hh \ + property_widget.hh \ + browser_widget.hh \ + image_scene.hh \ + image_view.hh \ + dommodel.hh \ + domitem.hh \ + image_region.hh \ + image_region.hxx \ + common.hh \ + help_dialog.hh \ + step_widget.hh EXTRA_DIST = README diff --git a/scribo/scribo.mk b/scribo/scribo.mk index c899631..9c11c0f 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -25,3 +25,5 @@ AM_CPPFLAGS = \ SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) + +utilexecdir = $(libexecdir)/scribo \ No newline at end of file diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index bb77740..4690f9f 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -30,12 +30,12 @@ SUBDIRS = \ text -bin_PROGRAMS = +utilexec_PROGRAMS = if HAVE_TESSERACT - bin_PROGRAMS += pbm_text_in_doc + utilexec_PROGRAMS += pbm_text_in_doc pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ @@ -50,7 +50,7 @@ endif HAVE_TESSERACT if HAVE_MAGICKXX - bin_PROGRAMS += text_in_doc_preprocess + utilexec_PROGRAMS += text_in_doc_preprocess text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) @@ -59,7 +59,7 @@ if HAVE_MAGICKXX $(MAGICKXX_LDFLAGS) - bin_PROGRAMS += text_in_picture + utilexec_PROGRAMS += text_in_picture text_in_picture_SOURCES = text_in_picture.cc text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) @@ -69,7 +69,7 @@ if HAVE_MAGICKXX if HAVE_TESSERACT - bin_PROGRAMS += text_recognition_in_picture + utilexec_PROGRAMS += text_recognition_in_picture text_recognition_in_picture_SOURCES = text_recognition_in_picture.cc text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 277125a..c0ef86a 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -17,12 +17,12 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ pgm_global_threshold_auto \ pgm_sauvola \ pgm_sauvola_ms \ ppm_sauvola \ - ppm_fg_sauvola_ms \ + ppm_sauvola_ms_fg \ ppm_sauvola_ms \ ppm_sauvola_ms_split @@ -31,57 +31,61 @@ pgm_global_threshold_auto_SOURCES = pgm_global_threshold_auto.cc pgm_sauvola_SOURCES = pgm_sauvola.cc pgm_sauvola_ms_SOURCES = pgm_sauvola_ms.cc ppm_sauvola_SOURCES = ppm_sauvola.cc -ppm_fg_sauvola_ms_SOURCES = ppm_fg_sauvola_ms.cc +ppm_sauvola_ms_fg_SOURCES = ppm_sauvola_ms_fg.cc ppm_sauvola_ms_SOURCES = ppm_sauvola_ms.cc ppm_sauvola_ms_split_SOURCES = ppm_sauvola_ms_split.cc if HAVE_MAGICKXX - bin_PROGRAMS += \ - fg_sauvola_ms \ + + noinst_PROGRAMS += \ + sauvola_debug \ + sauvola_ms_debug + + utilexec_PROGRAMS = \ sauvola \ - sauvola_debug \ sauvola_ms \ - sauvola_ms_debug \ + sauvola_ms_fg \ sauvola_ms_split - fg_sauvola_ms_SOURCES = fg_sauvola_ms.cc - fg_sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_ms_fg_SOURCES = sauvola_ms_fg.cc + sauvola_ms_fg_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - fg_sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_ms_fg_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) - sauvola_SOURCES = sauvola.cc - sauvola_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_SOURCES = sauvola.cc + sauvola_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - sauvola_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) - sauvola_debug_SOURCES = sauvola_debug.cc - sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_debug_SOURCES = sauvola_debug.cc + sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - sauvola_debug_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_debug_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) - sauvola_ms_SOURCES = sauvola_ms.cc - sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_ms_SOURCES = sauvola_ms.cc + sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) - sauvola_ms_debug_SOURCES = sauvola_ms_debug.cc - sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) -DSCRIBO_SAUVOLA_DEBUG \ + sauvola_ms_debug_SOURCES = sauvola_ms_debug.cc + sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) \ + -DSCRIBO_SAUVOLA_DEBUG \ $(MAGICKXX_CPPFLAGS) - sauvola_ms_debug_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_ms_debug_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) - sauvola_ms_split_SOURCES = sauvola_ms_split.cc - sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) \ + sauvola_ms_split_SOURCES = sauvola_ms_split.cc + sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - sauvola_ms_split_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) + sauvola_ms_split_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) endif HAVE_MAGICKXX diff --git a/scribo/src/contest/hdibco-2010/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am index a59e424..5730b26 100644 --- a/scribo/src/contest/hdibco-2010/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/scribo/tests/tests.mk -bin_PROGRAMS = sauvola_ms_hdibco +noinst_PROGRAMS = sauvola_ms_hdibco sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index f3dd4f9..d203f5c 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -17,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ show_info_x_height \ show_info_median_inter_characters \ show_links_left_right_links_validation \ @@ -75,8 +75,8 @@ show_objects_thin_SOURCES = show_objects_thin.cc if HAVE_MAGICKXX - bin_PROGRAMS += highlight_text_area - highlight_text_area_SOURCES = highlight_text_area.cc + noinst_PROGRAMS += highlight_text_area + highlight_text_area_SOURCES = highlight_text_area.cc highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \ `Magick++-config --cppflags` highlight_text_area_LDFLAGS = $(AM_LDFLAGS) \ diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index 4e2b8d1..5d5b721 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -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. # @@ -16,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ objects_large \ objects_small \ objects_thick \ diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am index 693b579..0323aaa 100644 --- a/scribo/src/misc/Makefile.am +++ b/scribo/src/misc/Makefile.am @@ -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. # @@ -16,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ dmap \ morpho \ negate \ diff --git a/scribo/src/postprocessing/Makefile.am b/scribo/src/postprocessing/Makefile.am index b21cac2..f0c588d 100644 --- a/scribo/src/postprocessing/Makefile.am +++ b/scribo/src/postprocessing/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ fill_object_holes diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 0c6e00a..ef62ed6 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -17,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ denoise_bg \ denoise_fg \ homogeneous_contrast \ @@ -32,49 +32,44 @@ unskew_SOURCES = unskew.cc if HAVE_MAGICKXX - bin_PROGRAMS += split_bg_fg - split_bg_fg_SOURCES = split_bg_fg.cc + noinst_PROGRAMS += split_bg_fg + split_bg_fg_SOURCES = split_bg_fg.cc split_bg_fg_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) + split_bg_fg_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - split_bg_fg_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - -lpthread - - bin_PROGRAMS += rotate - rotate_SOURCES = rotate.cc + noinst_PROGRAMS += rotate + rotate_SOURCES = rotate.cc rotate_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) + rotate_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - rotate_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - -lpthread - - bin_PROGRAMS += rotate_90 - rotate_90_SOURCES = rotate_90.cc + noinst_PROGRAMS += rotate_90 + rotate_90_SOURCES = rotate_90.cc rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) + rotate_90_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - rotate_90_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - -lpthread - - bin_PROGRAMS += to_pgm - to_pgm_SOURCES = to_pgm.cc - to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) + noinst_PROGRAMS += to_pgm + to_pgm_SOURCES = to_pgm.cc + to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) + to_pgm_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - to_pgm_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - -lpthread - - bin_PROGRAMS += subsample - subsample_SOURCES = subsample.cc + noinst_PROGRAMS += subsample + subsample_SOURCES = subsample.cc subsample_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) - - subsample_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - -lpthread + subsample_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread endif HAVE_MAGICKXX diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 6f20ea3..2c8188e 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -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. # @@ -17,7 +18,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ extract_discontinued_lines \ extract_discontinued_vlines \ extract_discontinued_hlines \ diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 3b5dbd2..b001f87 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -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. # @@ -17,7 +18,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ find_discontinued_lines \ find_pattern_lines \ find_single_lines \ diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index afc4f8e..37c32c7 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -17,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ group_from_double_link \ group_from_double_several_links \ group_from_several_left_links \ diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 50ea8fd..664aeb4 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -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. # @@ -16,12 +17,12 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = +noinst_PROGRAMS = # Disabled: #---------- # -#bin_PROGRAMS = \ +#noinst_PROGRAMS = \ # erase \ # extract \ # rebuild_opening \ diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index fc03ae8..db97cb8 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -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. # @@ -16,7 +17,7 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ cleantxt @@ -26,7 +27,7 @@ cleantxt_SOURCES = cleantxt.cc if HAVE_TESSERACT if HAVE_TIFF - bin_PROGRAMS += pbm_lines_recognition + noinst_PROGRAMS += pbm_lines_recognition pbm_lines_recognition_SOURCES = pbm_lines_recognition.cc pbm_lines_recognition_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ @@ -36,7 +37,7 @@ if HAVE_TIFF $(TIFF_LDFLAGS) \ -lpthread - bin_PROGRAMS += pbm_recognition + noinst_PROGRAMS += pbm_recognition pbm_recognition_SOURCES = pbm_recognition.cc pbm_recognition_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ -- 1.5.6.5

1 0

last-svn-commit-500-ge231215 Make use of autotroll in demo/review.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* demo/review/Makefile.am: Make use of autotroll. * demo/review/src/mainwindow.cc: Remove useless includes. * demo/review/src/mainwindow.hh: Update include. * demo/review/review.pro: Remove since useless. --- scribo/ChangeLog | 12 +++++++++ scribo/demo/review/Makefile.am | 45 ++++++++++++++++++++++++++++----- scribo/demo/review/review.pro | 16 ------------ scribo/demo/review/src/mainwindow.cc | 7 +---- scribo/demo/review/src/mainwindow.hh | 2 +- 5 files changed, 53 insertions(+), 29 deletions(-) delete mode 100644 scribo/demo/review/review.pro diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 119f9f0..9379bf0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of autotroll in demo/review. + + * demo/review/Makefile.am: Make use of autotroll. + + * demo/review/src/mainwindow.cc: Remove useless includes. + + * demo/review/src/mainwindow.hh: Update include. + + * demo/review/review.pro: Remove since useless. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Install Scribo headers in include/scribo. * Makefile.am: Update call to generate_dist_headers.sh. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index b51084e..cd793db 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,11 +1,42 @@ -## Process this file through Automake to create Makefile.in. +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/build-aux/autotroll.mk -.PHONY : demo +bin_PROGRAMS = scribo-review +scribo_review_SOURCES = $(BUILT_SOURCES) \ + src/main.cc \ + src/mainwindow.cc -Makefile.demo: - qmake-qt4 $(srcdir)/demo/demo.pro -o Makefile.demo +scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ + -DNDEBUG \ + -I$(srcdir) \ + -I$(builddir)/ui +scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 +scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) +scribo_review_LDADD = $(QT_LIBS) $(LDADD) -demo: Makefile.demo - make -f Makefile.demo all +BUILT_SOURCES = src/mainwindow.moc.cc \ + ui/mainwindow.ui.h + +noinst_HEADERS = src/mainwindow.hh + + + +EXTRA_DIST = \ + README \ + review.qrc diff --git a/scribo/demo/review/review.pro b/scribo/demo/review/review.pro deleted file mode 100644 index 3ee66e9..0000000 --- a/scribo/demo/review/review.pro +++ /dev/null @@ -1,16 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Jun 1 10:28:31 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src ui -INCLUDEPATH += . src ../../../ ../../../milena -DEFINES += NDEBUG - -# Input -HEADERS += src/mainwindow.hh -FORMS += ui/mainwindow.ui -SOURCES += src/main.cc src/mainwindow.cc - -RESOURCES = review.qrc diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc index f2d10a2..2f09ad7 100644 --- a/scribo/demo/review/src/mainwindow.cc +++ b/scribo/demo/review/src/mainwindow.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. // @@ -26,10 +27,6 @@ #include <QtCore> #include <QtGui> -#include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> -#include <mln/io/pbm/all.hh> - #include <src/mainwindow.hh> diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh index cb32e30..5f92d5a 100644 --- a/scribo/demo/review/src/mainwindow.hh +++ b/scribo/demo/review/src/mainwindow.hh @@ -31,7 +31,7 @@ # include <QProcess> # include <QtGui/QWidget> # include <QProgressDialog> -# include <ui_mainwindow.h> +# include <mainwindow.ui.h> namespace scribo { -- 1.5.6.5

1 0

last-svn-commit-499-g01b0be0 Install Scribo headers in include/scribo.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* Makefile.am: Update call to generate_dist_headers.sh. * headers.mk: Regen. --- scribo/ChangeLog | 8 ++++++++ scribo/Makefile.am | 4 ++-- scribo/headers.mk | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4e696ba..119f9f0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Install Scribo headers in include/scribo. + + * Makefile.am: Update call to generate_dist_headers.sh. + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/Makefile.am (EXTRA_DIST): Fix path to files. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index b18366b..741cca4 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -29,7 +29,7 @@ REGEN_SUBDIRS += tests regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # @@ -38,6 +38,6 @@ regen-am: $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers include $(srcdir)/headers.mk diff --git a/scribo/headers.mk b/scribo/headers.mk index f421f92..30256bb 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -1,6 +1,6 @@ ## Generated by `generate_dist_headers.sh', do not edit by hand. -scribodir = $(includedir)/scribo -nobase_scribo_HEADERS = \ + +nobase_include_HEADERS = \ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ @@ -201,5 +201,5 @@ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh #<<lrde -nobase_scribo_HEADERS += +nobase_include_HEADERS += #>> -- 1.5.6.5

1 0

last-svn-commit-493-g4131878 Rename examples.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* src/binarization/fg_sauvola_ms.cc, * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... * src/binarization/ppm_sauvola_ms_fg.cc, * src/binarization/sauvola_ms_fg.cc: ...this. --- scribo/ChangeLog | 10 ++++++++++ .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 3 files changed, 10 insertions(+), 0 deletions(-) rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3bff0e4..b4a2256 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename examples. + + * src/binarization/fg_sauvola_ms.cc, + * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... + + * src/binarization/ppm_sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_fg.cc: ...this. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/binarization/ppm_fg_sauvola_ms.cc b/scribo/src/binarization/ppm_sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/ppm_fg_sauvola_ms.cc rename to scribo/src/binarization/ppm_sauvola_ms_fg.cc diff --git a/scribo/src/binarization/fg_sauvola_ms.cc b/scribo/src/binarization/sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/fg_sauvola_ms.cc rename to scribo/src/binarization/sauvola_ms_fg.cc -- 1.5.6.5

1 0

last-svn-commit-492-g5e6b26d headers.mk: Regen.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/headers.mk | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f839cc5..3bff0e4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> Add a preprocessing toolchain. diff --git a/scribo/headers.mk b/scribo/headers.mk index 231742b..f421f92 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -196,6 +196,7 @@ scribo/text/merging.hh \ scribo/text/recognition.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ +scribo/toolchain/text_in_doc_preprocess.hh \ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh -- 1.5.6.5

1 0

branch distribute-scribo updated: last-svn-commit-493-gdca41a3
by lazzara＠lrde.epita.fr 25 Aug '10

25 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 distribute-scribo has been updated via dca41a34768ed67ea7a32c51742d3ae502bd12f2 (commit) from f75a6a28e9daa1d86f7988449ab8409eb4d2de3a (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 ----------------------------------------------------------------- dca41a3 tests/Makefile.am (EXTRA_DIST): Fix path to files. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-493-gdca41a3 tests/Makefile.am (EXTRA_DIST): Fix path to files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e434758..a750510 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Fix path to files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a8397ef..852b22f 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,14 +17,14 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - table_to_be_repaired.pbm \ - table_to_be_repaired2.pbm \ - table_to_be_repaired3.pbm \ - text_to_group.pbm \ - text_to_group.pgm \ - text_to_group_and_clean.pbm \ - wildly.pbm +EXTRA_DIST = \ + img/table_to_be_repaired.pbm \ + img/table_to_be_repaired2.pbm \ + img/table_to_be_repaired3.pbm \ + img/text_to_group.pbm \ + img/text_to_group.pgm \ + img/text_to_group_and_clean.pbm \ + img/wildly.pbm SUBDIRS = \ binarization \ -- 1.5.6.5

1 0

last-svn-commit-498-g8d50316 tests/Makefile.am (EXTRA_DIST): Fix path to files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f966b92..4e696ba 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Fix path to files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a8397ef..852b22f 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,14 +17,14 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - table_to_be_repaired.pbm \ - table_to_be_repaired2.pbm \ - table_to_be_repaired3.pbm \ - text_to_group.pbm \ - text_to_group.pgm \ - text_to_group_and_clean.pbm \ - wildly.pbm +EXTRA_DIST = \ + img/table_to_be_repaired.pbm \ + img/table_to_be_repaired2.pbm \ + img/table_to_be_repaired3.pbm \ + img/text_to_group.pbm \ + img/text_to_group.pgm \ + img/text_to_group_and_clean.pbm \ + img/wildly.pbm SUBDIRS = \ binarization \ -- 1.5.6.5

1 0

branch distribute-scribo updated: last-svn-commit-492-gf75a6a2
by lazzara＠lrde.epita.fr 25 Aug '10

25 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 distribute-scribo has been updated via f75a6a28e9daa1d86f7988449ab8409eb4d2de3a (commit) from 947f6e451ca08a9c55e780da8795ae2b50987af1 (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 ----------------------------------------------------------------- f75a6a2 tests/Makefile.am (EXTRA_DIST): Add new files. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0