* headers.mk, tests/unit_test/unit-tests.mk: Here. --- scribo/ChangeLog | 6 +++ scribo/headers.mk | 36 ++++++++++++++++++++- scribo/tests/unit_test/unit-tests.mk | 58 ++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4fed85c..33307f4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2010-03-02 Roland Levillain <roland@lrde.epita.fr> + + Regen SCRIBO's Makefile helpers. + + * headers.mk, tests/unit_test/unit-tests.mk: Here. + 2009-11-03 Guillaume Lazzara <z@lrde.epita.fr> Add a new example in Scribo. diff --git a/scribo/headers.mk b/scribo/headers.mk index 15d9b2a..4127a31 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -2,21 +2,29 @@ scribodir = $(includedir)/scribo nobase_scribo_HEADERS = \ ./all.hh \ +./binarization/binarize.hh \ ./binarization/sauvola.hh \ +./binarization/sauvola_threshold.hh \ ./binarization/simple.hh \ ./core/all.hh \ ./core/central_sites.hh \ +./core/concept/link_functor.hh \ ./core/erase_objects.hh \ +./core/internal/link_functor_base.hh \ ./core/macros.hh \ ./core/object_groups.hh \ ./core/object_image.hh \ ./core/object_links.hh \ +./debug/alignment_decision_image.hh \ ./debug/all.hh \ ./debug/decision_image.hh \ +./debug/links_decision_image.hh \ ./debug/save_bboxes_image.hh \ ./debug/save_label_image.hh \ ./debug/save_linked_bboxes_image.hh \ +./debug/save_object_diff.hh \ ./debug/save_table_image.hh \ +./debug/several_links_decision_image.hh \ ./debug/usage.hh \ ./demo/src/mainwindow.hh \ ./draw/all.hh \ @@ -24,9 +32,9 @@ nobase_scribo_HEADERS = \ ./draw/bounding_boxes.hh \ ./estim/object_groups_v_thickness.hh \ ./filter/all.hh \ -./filter/common/object_groups_photo.hh \ -./filter/common/object_links_photo.hh \ ./filter/common/objects_photo.hh \ +./filter/internal/compute.hh \ +./filter/object_groups_size_ratio.hh \ ./filter/object_groups_small.hh \ ./filter/object_groups_v_thickness.hh \ ./filter/object_links_bbox_h_ratio.hh \ @@ -34,14 +42,21 @@ nobase_scribo_HEADERS = \ ./filter/object_links_bbox_ratio.hh \ ./filter/object_links_bbox_w_ratio.hh \ ./filter/object_links_bottom_aligned.hh \ +./filter/object_links_center_aligned.hh \ ./filter/object_links_non_aligned.hh \ ./filter/object_links_non_aligned_simple.hh \ ./filter/object_links_non_h_aligned.hh \ ./filter/object_links_non_v_aligned.hh \ +./filter/object_links_top_aligned.hh \ +./filter/objects_h_thick.hh \ +./filter/objects_h_thin.hh \ ./filter/objects_large.hh \ +./filter/objects_size_ratio.hh \ ./filter/objects_small.hh \ ./filter/objects_thick.hh \ ./filter/objects_thin.hh \ +./filter/objects_v_thick.hh \ +./filter/objects_v_thin.hh \ ./fun/v2b/objects_small_filter.hh \ ./make/all.hh \ ./make/debug_filename.hh \ @@ -80,18 +95,35 @@ nobase_scribo_HEADERS = \ ./primitive/internal/find_root.hh \ ./primitive/internal/have_link_valid.hh \ ./primitive/internal/init_link_array.hh \ +./primitive/internal/is_invalid_link.hh \ ./primitive/internal/is_link_valid.hh \ ./primitive/internal/update_graph_link.hh \ ./primitive/internal/update_link_array.hh \ ./primitive/link/all.hh \ +./primitive/link/compute.hh \ +./primitive/link/compute_several.hh \ +./primitive/link/internal/anchors_3.hh \ +./primitive/link/internal/find_link.hh \ +./primitive/link/internal/find_several_links.hh \ +./primitive/link/internal/link_center_dmax_base.hh \ +./primitive/link/internal/link_center_dmax_ratio_base.hh \ +./primitive/link/internal/link_functor_base.hh \ +./primitive/link/internal/link_ms_dmax_base.hh \ +./primitive/link/internal/link_ms_dmax_ratio_base.hh \ ./primitive/link/merge_double_link.hh \ ./primitive/link/with_graph.hh \ ./primitive/link/with_rag.hh \ ./primitive/link/with_several_graphes.hh \ ./primitive/link/with_several_left_links.hh \ +./primitive/link/with_several_right_closest_links.hh \ ./primitive/link/with_several_right_links.hh \ +./primitive/link/with_several_right_links_overlap.hh \ ./primitive/link/with_single_left_link.hh \ +./primitive/link/with_single_left_link_dmax_ratio.hh \ ./primitive/link/with_single_right_link.hh \ +./primitive/link/with_single_right_link_bottom.hh \ +./primitive/link/with_single_right_link_dmax_ratio.hh \ +./primitive/link/with_single_right_link_top.hh \ ./table/align_lines_horizontaly.hh \ ./table/align_lines_verticaly.hh \ ./table/all.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 63998b0..2467334 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -2,21 +2,29 @@ check_PROGRAMS = \ scribo_all \ +scribo_binarization_binarize \ scribo_binarization_sauvola \ +scribo_binarization_sauvola_threshold \ scribo_binarization_simple \ scribo_core_all \ scribo_core_central_sites \ +scribo_core_concept_link_functor \ scribo_core_erase_objects \ +scribo_core_internal_link_functor_base \ scribo_core_macros \ scribo_core_object_groups \ scribo_core_object_image \ scribo_core_object_links \ +scribo_debug_alignment_decision_image \ scribo_debug_all \ scribo_debug_decision_image \ +scribo_debug_links_decision_image \ scribo_debug_save_bboxes_image \ scribo_debug_save_label_image \ scribo_debug_save_linked_bboxes_image \ +scribo_debug_save_object_diff \ scribo_debug_save_table_image \ +scribo_debug_several_links_decision_image \ scribo_debug_usage \ scribo_draw_all \ scribo_draw_bounding_box_links \ @@ -24,6 +32,7 @@ scribo_draw_bounding_boxes \ scribo_estim_object_groups_v_thickness \ scribo_filter_all \ scribo_filter_common_objects_photo \ +scribo_filter_internal_compute \ scribo_filter_object_groups_size_ratio \ scribo_filter_object_groups_small \ scribo_filter_object_groups_v_thickness \ @@ -32,16 +41,20 @@ scribo_filter_object_links_bbox_overlap \ scribo_filter_object_links_bbox_ratio \ scribo_filter_object_links_bbox_w_ratio \ scribo_filter_object_links_bottom_aligned \ +scribo_filter_object_links_center_aligned \ scribo_filter_object_links_non_aligned \ scribo_filter_object_links_non_aligned_simple \ scribo_filter_object_links_non_h_aligned \ scribo_filter_object_links_non_v_aligned \ +scribo_filter_object_links_top_aligned \ +scribo_filter_objects_h_thick \ scribo_filter_objects_h_thin \ scribo_filter_objects_large \ scribo_filter_objects_size_ratio \ scribo_filter_objects_small \ scribo_filter_objects_thick \ scribo_filter_objects_thin \ +scribo_filter_objects_v_thick \ scribo_filter_objects_v_thin \ scribo_fun_v2b_objects_small_filter \ scribo_make_all \ @@ -86,14 +99,30 @@ scribo_primitive_internal_is_link_valid \ scribo_primitive_internal_update_graph_link \ scribo_primitive_internal_update_link_array \ scribo_primitive_link_all \ +scribo_primitive_link_compute \ +scribo_primitive_link_compute_several \ +scribo_primitive_link_internal_anchors_3 \ +scribo_primitive_link_internal_find_link \ +scribo_primitive_link_internal_find_several_links \ +scribo_primitive_link_internal_link_center_dmax_base \ +scribo_primitive_link_internal_link_center_dmax_ratio_base \ +scribo_primitive_link_internal_link_functor_base \ +scribo_primitive_link_internal_link_ms_dmax_base \ +scribo_primitive_link_internal_link_ms_dmax_ratio_base \ scribo_primitive_link_merge_double_link \ scribo_primitive_link_with_graph \ scribo_primitive_link_with_rag \ scribo_primitive_link_with_several_graphes \ scribo_primitive_link_with_several_left_links \ +scribo_primitive_link_with_several_right_closest_links \ scribo_primitive_link_with_several_right_links \ +scribo_primitive_link_with_several_right_links_overlap \ scribo_primitive_link_with_single_left_link \ +scribo_primitive_link_with_single_left_link_dmax_ratio \ scribo_primitive_link_with_single_right_link \ +scribo_primitive_link_with_single_right_link_bottom \ +scribo_primitive_link_with_single_right_link_dmax_ratio \ +scribo_primitive_link_with_single_right_link_top \ scribo_table_align_lines_horizontaly \ scribo_table_align_lines_verticaly \ scribo_table_all \ @@ -115,21 +144,29 @@ scribo_util_all \ scribo_util_text scribo_all_SOURCES = scribo_all.cc +scribo_binarization_binarize_SOURCES = scribo_binarization_binarize.cc scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc +scribo_binarization_sauvola_threshold_SOURCES = scribo_binarization_sauvola_threshold.cc scribo_binarization_simple_SOURCES = scribo_binarization_simple.cc scribo_core_all_SOURCES = scribo_core_all.cc scribo_core_central_sites_SOURCES = scribo_core_central_sites.cc +scribo_core_concept_link_functor_SOURCES = scribo_core_concept_link_functor.cc scribo_core_erase_objects_SOURCES = scribo_core_erase_objects.cc +scribo_core_internal_link_functor_base_SOURCES = scribo_core_internal_link_functor_base.cc scribo_core_macros_SOURCES = scribo_core_macros.cc scribo_core_object_groups_SOURCES = scribo_core_object_groups.cc scribo_core_object_image_SOURCES = scribo_core_object_image.cc scribo_core_object_links_SOURCES = scribo_core_object_links.cc +scribo_debug_alignment_decision_image_SOURCES = scribo_debug_alignment_decision_image.cc scribo_debug_all_SOURCES = scribo_debug_all.cc scribo_debug_decision_image_SOURCES = scribo_debug_decision_image.cc +scribo_debug_links_decision_image_SOURCES = scribo_debug_links_decision_image.cc scribo_debug_save_bboxes_image_SOURCES = scribo_debug_save_bboxes_image.cc scribo_debug_save_label_image_SOURCES = scribo_debug_save_label_image.cc scribo_debug_save_linked_bboxes_image_SOURCES = scribo_debug_save_linked_bboxes_image.cc +scribo_debug_save_object_diff_SOURCES = scribo_debug_save_object_diff.cc scribo_debug_save_table_image_SOURCES = scribo_debug_save_table_image.cc +scribo_debug_several_links_decision_image_SOURCES = scribo_debug_several_links_decision_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 @@ -137,6 +174,7 @@ scribo_draw_bounding_boxes_SOURCES = scribo_draw_bounding_boxes.cc scribo_estim_object_groups_v_thickness_SOURCES = scribo_estim_object_groups_v_thickness.cc scribo_filter_all_SOURCES = scribo_filter_all.cc scribo_filter_common_objects_photo_SOURCES = scribo_filter_common_objects_photo.cc +scribo_filter_internal_compute_SOURCES = scribo_filter_internal_compute.cc scribo_filter_object_groups_size_ratio_SOURCES = scribo_filter_object_groups_size_ratio.cc scribo_filter_object_groups_small_SOURCES = scribo_filter_object_groups_small.cc scribo_filter_object_groups_v_thickness_SOURCES = scribo_filter_object_groups_v_thickness.cc @@ -145,16 +183,20 @@ scribo_filter_object_links_bbox_overlap_SOURCES = scribo_filter_object_links_bbo scribo_filter_object_links_bbox_ratio_SOURCES = scribo_filter_object_links_bbox_ratio.cc scribo_filter_object_links_bbox_w_ratio_SOURCES = scribo_filter_object_links_bbox_w_ratio.cc scribo_filter_object_links_bottom_aligned_SOURCES = scribo_filter_object_links_bottom_aligned.cc +scribo_filter_object_links_center_aligned_SOURCES = scribo_filter_object_links_center_aligned.cc scribo_filter_object_links_non_aligned_SOURCES = scribo_filter_object_links_non_aligned.cc scribo_filter_object_links_non_aligned_simple_SOURCES = scribo_filter_object_links_non_aligned_simple.cc scribo_filter_object_links_non_h_aligned_SOURCES = scribo_filter_object_links_non_h_aligned.cc scribo_filter_object_links_non_v_aligned_SOURCES = scribo_filter_object_links_non_v_aligned.cc +scribo_filter_object_links_top_aligned_SOURCES = scribo_filter_object_links_top_aligned.cc +scribo_filter_objects_h_thick_SOURCES = scribo_filter_objects_h_thick.cc scribo_filter_objects_h_thin_SOURCES = scribo_filter_objects_h_thin.cc scribo_filter_objects_large_SOURCES = scribo_filter_objects_large.cc scribo_filter_objects_size_ratio_SOURCES = scribo_filter_objects_size_ratio.cc scribo_filter_objects_small_SOURCES = scribo_filter_objects_small.cc scribo_filter_objects_thick_SOURCES = scribo_filter_objects_thick.cc scribo_filter_objects_thin_SOURCES = scribo_filter_objects_thin.cc +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_fun_v2b_objects_small_filter_SOURCES = scribo_fun_v2b_objects_small_filter.cc scribo_make_all_SOURCES = scribo_make_all.cc @@ -199,14 +241,30 @@ scribo_primitive_internal_is_link_valid_SOURCES = scribo_primitive_internal_is_l scribo_primitive_internal_update_graph_link_SOURCES = scribo_primitive_internal_update_graph_link.cc scribo_primitive_internal_update_link_array_SOURCES = scribo_primitive_internal_update_link_array.cc scribo_primitive_link_all_SOURCES = scribo_primitive_link_all.cc +scribo_primitive_link_compute_SOURCES = scribo_primitive_link_compute.cc +scribo_primitive_link_compute_several_SOURCES = scribo_primitive_link_compute_several.cc +scribo_primitive_link_internal_anchors_3_SOURCES = scribo_primitive_link_internal_anchors_3.cc +scribo_primitive_link_internal_find_link_SOURCES = scribo_primitive_link_internal_find_link.cc +scribo_primitive_link_internal_find_several_links_SOURCES = scribo_primitive_link_internal_find_several_links.cc +scribo_primitive_link_internal_link_center_dmax_base_SOURCES = scribo_primitive_link_internal_link_center_dmax_base.cc +scribo_primitive_link_internal_link_center_dmax_ratio_base_SOURCES = scribo_primitive_link_internal_link_center_dmax_ratio_base.cc +scribo_primitive_link_internal_link_functor_base_SOURCES = scribo_primitive_link_internal_link_functor_base.cc +scribo_primitive_link_internal_link_ms_dmax_base_SOURCES = scribo_primitive_link_internal_link_ms_dmax_base.cc +scribo_primitive_link_internal_link_ms_dmax_ratio_base_SOURCES = scribo_primitive_link_internal_link_ms_dmax_ratio_base.cc scribo_primitive_link_merge_double_link_SOURCES = scribo_primitive_link_merge_double_link.cc scribo_primitive_link_with_graph_SOURCES = scribo_primitive_link_with_graph.cc scribo_primitive_link_with_rag_SOURCES = scribo_primitive_link_with_rag.cc scribo_primitive_link_with_several_graphes_SOURCES = scribo_primitive_link_with_several_graphes.cc scribo_primitive_link_with_several_left_links_SOURCES = scribo_primitive_link_with_several_left_links.cc +scribo_primitive_link_with_several_right_closest_links_SOURCES = scribo_primitive_link_with_several_right_closest_links.cc scribo_primitive_link_with_several_right_links_SOURCES = scribo_primitive_link_with_several_right_links.cc +scribo_primitive_link_with_several_right_links_overlap_SOURCES = scribo_primitive_link_with_several_right_links_overlap.cc scribo_primitive_link_with_single_left_link_SOURCES = scribo_primitive_link_with_single_left_link.cc +scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio.cc scribo_primitive_link_with_single_right_link_SOURCES = scribo_primitive_link_with_single_right_link.cc +scribo_primitive_link_with_single_right_link_bottom_SOURCES = scribo_primitive_link_with_single_right_link_bottom.cc +scribo_primitive_link_with_single_right_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_right_link_dmax_ratio.cc +scribo_primitive_link_with_single_right_link_top_SOURCES = scribo_primitive_link_with_single_right_link_top.cc scribo_table_align_lines_horizontaly_SOURCES = scribo_table_align_lines_horizontaly.cc scribo_table_align_lines_verticaly_SOURCES = scribo_table_align_lines_verticaly.cc scribo_table_all_SOURCES = scribo_table_all.cc -- 1.5.6.5