[Olena-patches] last-svn-commit-422-g74dd34a Disable programs still using object_image instead of component_set.

* scribo/src/Makefile.am, * scribo/src/debug/Makefile.am, * scribo/src/filter/Makefile.am, * scribo/src/preprocessing/Makefile.am, * scribo/src/primitive/extract/Makefile.am, * scribo/src/primitive/find/Makefile.am, * scribo/src/primitive/group/Makefile.am, * scribo/src/table/Makefile.am, * scribo/src/text/Makefile.am: Here. --- scribo/ChangeLog | 15 +++++ scribo/src/Makefile.am | 9 ++- scribo/src/debug/Makefile.am | 96 +++++++++++++++--------------- scribo/src/filter/Makefile.am | 29 +++++---- scribo/src/preprocessing/Makefile.am | 25 ++++---- scribo/src/primitive/extract/Makefile.am | 27 +++++---- scribo/src/primitive/find/Makefile.am | 25 ++++---- scribo/src/primitive/group/Makefile.am | 37 ++++++------ scribo/src/table/Makefile.am | 22 ++++---- scribo/src/text/Makefile.am | 11 ++- 10 files changed, 164 insertions(+), 132 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd3f45d..066501b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + + Disable programs still using object_image instead of component_set. + + * scribo/src/Makefile.am, + * scribo/src/debug/Makefile.am, + * scribo/src/filter/Makefile.am, + * scribo/src/preprocessing/Makefile.am, + * scribo/src/primitive/extract/Makefile.am, + * scribo/src/primitive/find/Makefile.am, + * scribo/src/primitive/group/Makefile.am, + * scribo/src/table/Makefile.am, + * scribo/src/text/Makefile.am: + Here. + 2010-07-06 Guillaume Lazzara <z(a)lrde.epita.fr> Compilation related fixes in Scribo. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index a7dd7bc..5389fad 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -29,11 +29,14 @@ SUBDIRS = \ table \ text -bin_PROGRAMS = \ - pbm_lines_in_doc +bin_PROGRAMS = +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## pbm_lines_in_doc -pbm_lines_in_doc_SOURCES = pbm_lines_in_doc.cc + +## pbm_lines_in_doc_SOURCES = pbm_lines_in_doc.cc if HAVE_TESSERACT diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index f3dd4f9..0e3e82f 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -17,61 +17,63 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - show_info_x_height \ +bin_PROGRAMS = \ + show_info_x_height \ show_info_median_inter_characters \ - show_links_left_right_links_validation \ - show_links_bbox_h_ratio \ - show_links_bbox_overlap \ - show_links_bottom_aligned \ - show_links_center_aligned \ - show_links_non_h_aligned \ - show_links_several_right \ - show_links_several_right_overlap \ - show_links_single_down \ - show_links_single_down_left_aligned \ - show_links_single_down_right_aligned \ - show_links_single_left \ - show_links_single_left_dmax_ratio \ - show_links_single_right \ - show_links_single_right_dmax_ratio \ - show_links_single_up \ - show_links_single_up_left_aligned \ - show_links_single_up_right_aligned \ - show_links_top_aligned \ - show_objects_large \ - show_objects_large_small \ - show_objects_small \ - show_objects_thick \ - show_objects_thin + show_links_left_right_links_validation \ + show_links_bbox_h_ratio \ + show_links_bottom_aligned \ + show_links_top_aligned +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## show_links_bbox_overlap \ +## show_links_center_aligned \ +## show_links_non_h_aligned \ +## show_links_several_right \ +## show_links_several_right_overlap \ +## show_links_single_down \ +## show_links_single_down_left_aligned \ +## show_links_single_down_right_aligned \ +## show_links_single_left \ +## show_links_single_left_dmax_ratio \ +## show_links_single_right \ +## show_links_single_right_dmax_ratio \ +## show_links_single_up \ +## show_links_single_up_left_aligned \ +## show_links_single_up_right_aligned \ +## show_objects_large \ +## show_objects_large_small \ +## show_objects_small \ +## show_objects_thick \ +## show_objects_thin show_info_x_height_SOURCES = show_info_x_height.cc show_info_median_inter_characters_SOURCES = show_info_median_inter_characters.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 -show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc +## show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc show_links_bottom_aligned_SOURCES = show_links_bottom_aligned.cc -show_links_center_aligned_SOURCES = show_links_center_aligned.cc -show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc -show_links_several_right_SOURCES = show_links_several_right.cc -show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc -show_links_single_down_SOURCES = show_links_single_down.cc -show_links_single_down_left_aligned_SOURCES = show_links_single_down_left_aligned.cc -show_links_single_down_right_aligned_SOURCES = show_links_single_down_right_aligned.cc -show_links_single_left_SOURCES = show_links_single_left.cc -show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc -show_links_single_right_SOURCES = show_links_single_right.cc -show_links_single_right_dmax_ratio_SOURCES = show_links_single_right_dmax_ratio.cc -show_links_single_up_SOURCES = show_links_single_up.cc -show_links_single_up_left_aligned_SOURCES = show_links_single_up_left_aligned.cc -show_links_single_up_right_aligned_SOURCES = show_links_single_up_right_aligned.cc +## show_links_center_aligned_SOURCES = show_links_center_aligned.cc +## show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc +## show_links_several_right_SOURCES = show_links_several_right.cc +## show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc +## show_links_single_down_SOURCES = show_links_single_down.cc +## show_links_single_down_left_aligned_SOURCES = show_links_single_down_left_aligned.cc +## show_links_single_down_right_aligned_SOURCES = show_links_single_down_right_aligned.cc +## show_links_single_left_SOURCES = show_links_single_left.cc +## show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc +## show_links_single_right_SOURCES = show_links_single_right.cc +## show_links_single_right_dmax_ratio_SOURCES = show_links_single_right_dmax_ratio.cc +## show_links_single_up_SOURCES = show_links_single_up.cc +## show_links_single_up_left_aligned_SOURCES = show_links_single_up_left_aligned.cc +## show_links_single_up_right_aligned_SOURCES = show_links_single_up_right_aligned.cc show_links_top_aligned_SOURCES = show_links_top_aligned.cc -show_objects_large_SOURCES = show_objects_large.cc -show_objects_large_small_SOURCES = show_objects_large_small.cc -show_objects_small_SOURCES = show_objects_small.cc -show_objects_thick_SOURCES = show_objects_thick.cc -show_objects_thin_SOURCES = show_objects_thin.cc +## show_objects_large_SOURCES = show_objects_large.cc +## show_objects_large_small_SOURCES = show_objects_large_small.cc +## 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 @@ -80,6 +82,6 @@ if HAVE_MAGICKXX highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \ `Magick++-config --cppflags` highlight_text_area_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread `Magick++-config --libs` + -lpthread `Magick++-config --libs` endif HAVE_MAGICKXX diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index 4e2b8d1..f85fcf1 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -1,4 +1,4 @@ -# 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,17 +16,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - objects_large \ - objects_small \ - objects_thick \ - objects_thin \ - objects_with_holes \ - objects_with_holes_pgm +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## objects_large \ +## objects_small \ +## objects_thick \ +## objects_thin \ +## objects_with_holes \ +## objects_with_holes_pgm -objects_large_SOURCES = objects_large.cc -objects_small_SOURCES = objects_small.cc -objects_thick_SOURCES = objects_thick.cc -objects_thin_SOURCES = objects_thin.cc -objects_with_holes_SOURCES = objects_with_holes.cc -objects_with_holes_pgm_SOURCES = objects_with_holes_pgm.cc +## objects_large_SOURCES = objects_large.cc +## objects_small_SOURCES = objects_small.cc +## objects_thick_SOURCES = objects_thick.cc +## objects_thin_SOURCES = objects_thin.cc +## objects_with_holes_SOURCES = objects_with_holes.cc +## objects_with_holes_pgm_SOURCES = objects_with_holes_pgm.cc diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8b99bf2..d04d08b 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -17,20 +17,23 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - denoise_bg \ - denoise_fg \ - homogeneous_contrast \ - preprocess \ - split_bg_fg \ - unskew +bin_PROGRAMS = \ + denoise_bg \ + denoise_fg \ + homogeneous_contrast \ + split_bg_fg + +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## preprocess \ +## unskew denoise_bg_SOURCES = denoise_bg.cc denoise_fg_SOURCES = denoise_fg.cc homogeneous_contrast_SOURCES = homogeneous_contrast.cc -preprocess_SOURCES = preprocess.cc +## preprocess_SOURCES = preprocess.cc split_bg_fg_SOURCES = split_bg_fg.cc -unskew_SOURCES = unskew.cc +## unskew_SOURCES = unskew.cc if HAVE_MAGICKXX @@ -51,8 +54,8 @@ if HAVE_MAGICKXX `Magick++-config --cppflags` to_pgm_LDFLAGS = $(AM_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - -lpthread `Magick++-config --libs` + $(TESSERACT_LDFLAGS) \ + -lpthread `Magick++-config --libs` bin_PROGRAMS += subsample subsample_SOURCES = subsample.cc diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 6f20ea3..17cdbf6 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -1,4 +1,4 @@ -# 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,17 +17,20 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - extract_discontinued_lines \ - extract_discontinued_vlines \ - extract_discontinued_hlines \ - extract_thick_vlines \ - extract_thick_hlines \ +bin_PROGRAMS = \ lines_pattern -extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc -extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc -extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc -extract_thick_vlines_SOURCES = extract_thick_vlines.cc -extract_thick_hlines_SOURCES = extract_thick_hlines.cc +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## extract_discontinued_lines \ +## extract_discontinued_vlines \ +## extract_discontinued_hlines \ +## extract_thick_vlines \ +## extract_thick_hlines + +## extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc +## extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc +## extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc +## extract_thick_vlines_SOURCES = extract_thick_vlines.cc +## extract_thick_hlines_SOURCES = extract_thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 3b5dbd2..15ba99f 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -1,4 +1,4 @@ -# 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,15 +17,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - find_discontinued_lines \ - find_pattern_lines \ - find_single_lines \ - find_thick_lines \ - find_thick_and_single_lines +bin_PROGRAMS = \ + find_pattern_lines -find_discontinued_lines_SOURCES = find_discontinued_lines.cc +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## find_discontinued_lines \ +## find_thick_lines \ +## find_single_lines \ +## find_thick_and_single_lines + +## find_discontinued_lines_SOURCES = find_discontinued_lines.cc find_pattern_lines_SOURCES = find_pattern_lines.cc -find_single_lines_SOURCES = find_single_lines.cc -find_thick_lines_SOURCES = find_thick_lines.cc -find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc +## find_single_lines_SOURCES = find_single_lines.cc +## find_thick_lines_SOURCES = find_thick_lines.cc +## find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index 92a81fc..aaf97d9 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -1,4 +1,4 @@ -# 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,23 +16,22 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - group_from_double_link \ - group_from_double_link_filter_non_aligned \ - group_from_double_several_links \ - group_from_graph \ - group_from_several_graph \ - group_from_several_left_links \ - group_from_single_link +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## group_from_double_link \ +## group_from_double_link_filter_non_aligned \ +## group_from_double_several_links \ +## group_from_graph \ +## group_from_rag \ +## group_from_several_graph \ +## group_from_several_left_links \ +## group_from_single_link -group_from_double_link_SOURCES = group_from_double_link.cc -group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc -group_from_double_several_links_SOURCES = group_from_double_several_links.cc -group_from_graph_SOURCES = group_from_graph.cc -group_from_several_graph_SOURCES = group_from_several_graph.cc -group_from_several_left_links_SOURCES = group_from_several_left_links.cc -group_from_single_link_SOURCES = group_from_single_link.cc - -## FIXME: Does not compile. -## bin_PROGRAMS += group_from_rag +## group_from_double_link_SOURCES = group_from_double_link.cc +## group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc +## group_from_double_several_links_SOURCES = group_from_double_several_links.cc +## group_from_graph_SOURCES = group_from_graph.cc +## group_from_several_graph_SOURCES = group_from_several_graph.cc +## group_from_several_left_links_SOURCES = group_from_several_left_links.cc +## group_from_single_link_SOURCES = group_from_single_link.cc ## group_from_rag_SOURCES = group_from_rag.cc diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..fc9fcf5 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -1,4 +1,4 @@ -# 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,14 +16,14 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - erase \ - extract \ - rebuild_opening \ - rebuild_rank +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## erase \ +## extract \ +## rebuild_opening \ +## rebuild_rank - -erase_SOURCES = erase.cc -extract_SOURCES = extract.cc -rebuild_opening_SOURCES = rebuild_opening.cc -rebuild_rank_SOURCES = rebuild_rank.cc +## erase_SOURCES = erase.cc +## extract_SOURCES = extract.cc +## rebuild_opening_SOURCES = rebuild_opening.cc +## rebuild_rank_SOURCES = rebuild_rank.cc diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index fc03ae8..6c41c2b 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -1,4 +1,4 @@ -# 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,11 +16,14 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - cleantxt +bin_PROGRAMS = +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## cleantxt -cleantxt_SOURCES = cleantxt.cc + +## cleantxt_SOURCES = cleantxt.cc if HAVE_TESSERACT -- 1.5.6.5