* src/Makefile.am: Disable tests and remove deprecated ones. * src/preprocessing/Makefile.am: Use MAGICKXX_* flags. --- scribo/ChangeLog | 12 +++++++++- scribo/src/Makefile.am | 9 +++---- scribo/src/preprocessing/Makefile.am | 42 ++++++++++++++++++--------------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1ce0459..7197f41 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,8 +1,18 @@ 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> - Cleanup and improve text recognition. + Cleanup Makefiles. + + * src/Makefile.am: Disable tests and remove deprecated ones. + * src/preprocessing/Makefile.am: Use MAGICKXX_* flags. + +2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup and improve text recognition. + + * src/text_recognition_in_picture.cc: Use new routines. Cleanup + useless comments. Use a height ratio filter to improve OCR + results. 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index a7dd7bc..b1a29e8 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -26,14 +26,13 @@ SUBDIRS = \ misc \ postprocessing \ preprocessing \ - table \ text -bin_PROGRAMS = \ - pbm_lines_in_doc +# Disabled for the moment: +# table -pbm_lines_in_doc_SOURCES = pbm_lines_in_doc.cc +bin_PROGRAMS = if HAVE_TESSERACT @@ -46,7 +45,7 @@ if HAVE_TESSERACT $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ -lpthread -# -lhpdf + pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc endif HAVE_TESSERACT diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8b99bf2..5dabcac 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -22,46 +22,50 @@ bin_PROGRAMS = \ denoise_fg \ homogeneous_contrast \ preprocess \ - split_bg_fg \ unskew denoise_bg_SOURCES = denoise_bg.cc denoise_fg_SOURCES = denoise_fg.cc homogeneous_contrast_SOURCES = homogeneous_contrast.cc preprocess_SOURCES = preprocess.cc -split_bg_fg_SOURCES = split_bg_fg.cc unskew_SOURCES = unskew.cc if HAVE_MAGICKXX + bin_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 + bin_PROGRAMS += rotate_90 rotate_90_SOURCES = rotate_90.cc rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - `Magick++-config --cppflags` + $(MAGICKXX_CPPFLAGS) - rotate_90_LDFLAGS = $(AM_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - -lpthread `Magick++-config --libs` + rotate_90_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - bin_PROGRAMS += to_pgm + bin_PROGRAMS += to_pgm to_pgm_SOURCES = to_pgm.cc to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - `Magick++-config --cppflags` + $(MAGICKXX_CPPFLAGS) - to_pgm_LDFLAGS = $(AM_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - -lpthread `Magick++-config --libs` + to_pgm_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread - bin_PROGRAMS += subsample + bin_PROGRAMS += subsample subsample_SOURCES = subsample.cc subsample_CPPFLAGS = $(AM_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - `Magick++-config --cppflags` + $(MAGICKXX_CPPFLAGS) - subsample_LDFLAGS = $(AM_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - -lpthread `Magick++-config --libs` + subsample_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread endif HAVE_MAGICKXX -- 1.5.6.5