* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 10 +++++++++- scribo/tests/unit_test/unit-tests.mk | 22 ++++++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8f5a26a..be2365e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-11-16 Guillaume Lazzara <z@lrde.epita.fr> + Regen .mk files in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-16 Guillaume Lazzara <z@lrde.epita.fr> + Compilation fixes. * scribo/binarization/sauvola_threshold_image.hh: Fix namespace diff --git a/scribo/headers.mk b/scribo/headers.mk index 30256bb..5585ccc 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,13 +5,14 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/compute_sauvola_threshold.hh \ scribo/binarization/internal/first_pass_functor.hh \ +scribo/binarization/internal/sauvola_debug.hh \ scribo/binarization/local_threshold.hh \ scribo/binarization/sauvola.hh \ scribo/binarization/sauvola_ms.hh \ scribo/binarization/sauvola_ms_split.hh \ scribo/binarization/sauvola_threshold_image.hh \ -scribo/binarization/sauvola_threshold_image_debug.hh \ scribo/canvas/integral_browsing.hh \ scribo/convert/from_qimage.hh \ scribo/core/all.hh \ @@ -21,6 +22,7 @@ scribo/core/component_set.hh \ scribo/core/concept/dmax_functor.hh \ scribo/core/concept/link_functor.hh \ scribo/core/def/lbl_type.hh \ +scribo/core/document.hh \ scribo/core/erase_objects.hh \ scribo/core/init_integral_image.hh \ scribo/core/line_info.hh \ @@ -109,6 +111,7 @@ scribo/primitive/extract/all.hh \ scribo/primitive/extract/canvas.hh \ scribo/primitive/extract/cells.hh \ scribo/primitive/extract/components.hh \ +scribo/primitive/extract/elements.hh \ scribo/primitive/extract/horizontal_separators.hh \ scribo/primitive/extract/lines_discontinued.hh \ scribo/primitive/extract/lines_h_discontinued.hh \ @@ -124,10 +127,12 @@ scribo/primitive/extract/lines_v_single.hh \ scribo/primitive/extract/lines_v_thick.hh \ scribo/primitive/extract/lines_v_thick_and_single.hh \ scribo/primitive/extract/separators.hh \ +scribo/primitive/extract/separators_nonvisible.hh \ scribo/primitive/extract/vertical_separators.hh \ scribo/primitive/group/all.hh \ scribo/primitive/group/apply.hh \ scribo/primitive/group/from_double_link.hh \ +scribo/primitive/group/from_double_link_any.hh \ scribo/primitive/group/from_graph.hh \ scribo/primitive/group/from_single_link.hh \ scribo/primitive/internal/all.hh \ @@ -165,8 +170,10 @@ scribo/primitive/link/with_single_left_link_dmax_ratio.hh \ scribo/primitive/link/with_single_right_link.hh \ scribo/primitive/link/with_single_right_link_bottom.hh \ scribo/primitive/link/with_single_right_link_dmax_ratio.hh \ +scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh \ scribo/primitive/link/with_single_right_link_top.hh \ scribo/primitive/link/with_single_up_link.hh \ +scribo/primitive/merge/components.hh \ scribo/primitive/regroup/from_single_left_link.hh \ scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh \ scribo/primitive/remove/separators.hh \ @@ -197,6 +204,7 @@ scribo/text/recognition.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ scribo/toolchain/text_in_doc_preprocess.hh \ +scribo/toolchain/text_in_picture.hh \ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 57c3c38..bd8b787 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -48,13 +48,14 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ +scribo_binarization_internal_compute_sauvola_threshold \ scribo_binarization_internal_first_pass_functor \ +scribo_binarization_internal_sauvola_debug \ scribo_binarization_local_threshold \ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ scribo_binarization_sauvola_ms_split \ scribo_binarization_sauvola_threshold_image \ -scribo_binarization_sauvola_threshold_image_debug \ scribo_canvas_integral_browsing \ scribo_core_all \ scribo_core_central_sites \ @@ -63,6 +64,7 @@ scribo_core_component_set \ scribo_core_concept_dmax_functor \ scribo_core_concept_link_functor \ scribo_core_def_lbl_type \ +scribo_core_document \ scribo_core_erase_objects \ scribo_core_init_integral_image \ scribo_core_line_info \ @@ -151,6 +153,7 @@ scribo_primitive_extract_all \ scribo_primitive_extract_canvas \ scribo_primitive_extract_cells \ scribo_primitive_extract_components \ +scribo_primitive_extract_elements \ scribo_primitive_extract_horizontal_separators \ scribo_primitive_extract_lines_discontinued \ scribo_primitive_extract_lines_h_discontinued \ @@ -166,10 +169,12 @@ scribo_primitive_extract_lines_v_single \ scribo_primitive_extract_lines_v_thick \ scribo_primitive_extract_lines_v_thick_and_single \ scribo_primitive_extract_separators \ +scribo_primitive_extract_separators_nonvisible \ scribo_primitive_extract_vertical_separators \ scribo_primitive_group_all \ scribo_primitive_group_apply \ scribo_primitive_group_from_double_link \ +scribo_primitive_group_from_double_link_any \ scribo_primitive_group_from_graph \ scribo_primitive_group_from_single_link \ scribo_primitive_internal_all \ @@ -203,8 +208,10 @@ 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_dmax_ratio_aligned \ scribo_primitive_link_with_single_right_link_top \ scribo_primitive_link_with_single_up_link \ +scribo_primitive_merge_components \ scribo_primitive_regroup_from_single_left_link \ scribo_primitive_regroup_from_single_left_link_wrt_h_ratio \ scribo_primitive_remove_separators \ @@ -231,6 +238,8 @@ scribo_text_clean_inplace \ scribo_text_extract_lines \ scribo_text_look_like_text_lines \ scribo_text_merging \ +scribo_toolchain_text_in_doc_preprocess \ +scribo_toolchain_text_in_picture \ scribo_upsampling_bs2x \ scribo_upsampling_eagle @@ -238,13 +247,14 @@ scribo_all_SOURCES = scribo_all.cc scribo_binarization_all_SOURCES = scribo_binarization_all.cc scribo_binarization_global_threshold_SOURCES = scribo_binarization_global_threshold.cc scribo_binarization_global_threshold_auto_SOURCES = scribo_binarization_global_threshold_auto.cc +scribo_binarization_internal_compute_sauvola_threshold_SOURCES = scribo_binarization_internal_compute_sauvola_threshold.cc scribo_binarization_internal_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc +scribo_binarization_internal_sauvola_debug_SOURCES = scribo_binarization_internal_sauvola_debug.cc scribo_binarization_local_threshold_SOURCES = scribo_binarization_local_threshold.cc scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_split.cc scribo_binarization_sauvola_threshold_image_SOURCES = scribo_binarization_sauvola_threshold_image.cc -scribo_binarization_sauvola_threshold_image_debug_SOURCES = scribo_binarization_sauvola_threshold_image_debug.cc scribo_canvas_integral_browsing_SOURCES = scribo_canvas_integral_browsing.cc scribo_core_all_SOURCES = scribo_core_all.cc scribo_core_central_sites_SOURCES = scribo_core_central_sites.cc @@ -253,6 +263,7 @@ scribo_core_component_set_SOURCES = scribo_core_component_set.cc scribo_core_concept_dmax_functor_SOURCES = scribo_core_concept_dmax_functor.cc scribo_core_concept_link_functor_SOURCES = scribo_core_concept_link_functor.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_init_integral_image_SOURCES = scribo_core_init_integral_image.cc scribo_core_line_info_SOURCES = scribo_core_line_info.cc @@ -341,6 +352,7 @@ 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 scribo_primitive_extract_components_SOURCES = scribo_primitive_extract_components.cc +scribo_primitive_extract_elements_SOURCES = scribo_primitive_extract_elements.cc scribo_primitive_extract_horizontal_separators_SOURCES = scribo_primitive_extract_horizontal_separators.cc scribo_primitive_extract_lines_discontinued_SOURCES = scribo_primitive_extract_lines_discontinued.cc scribo_primitive_extract_lines_h_discontinued_SOURCES = scribo_primitive_extract_lines_h_discontinued.cc @@ -356,10 +368,12 @@ scribo_primitive_extract_lines_v_single_SOURCES = scribo_primitive_extract_lines 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_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 scribo_primitive_group_all_SOURCES = scribo_primitive_group_all.cc scribo_primitive_group_apply_SOURCES = scribo_primitive_group_apply.cc scribo_primitive_group_from_double_link_SOURCES = scribo_primitive_group_from_double_link.cc +scribo_primitive_group_from_double_link_any_SOURCES = scribo_primitive_group_from_double_link_any.cc scribo_primitive_group_from_graph_SOURCES = scribo_primitive_group_from_graph.cc scribo_primitive_group_from_single_link_SOURCES = scribo_primitive_group_from_single_link.cc scribo_primitive_internal_all_SOURCES = scribo_primitive_internal_all.cc @@ -393,8 +407,10 @@ scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitiv 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_dmax_ratio_aligned_SOURCES = scribo_primitive_link_with_single_right_link_dmax_ratio_aligned.cc scribo_primitive_link_with_single_right_link_top_SOURCES = scribo_primitive_link_with_single_right_link_top.cc scribo_primitive_link_with_single_up_link_SOURCES = scribo_primitive_link_with_single_up_link.cc +scribo_primitive_merge_components_SOURCES = scribo_primitive_merge_components.cc scribo_primitive_regroup_from_single_left_link_SOURCES = scribo_primitive_regroup_from_single_left_link.cc scribo_primitive_regroup_from_single_left_link_wrt_h_ratio_SOURCES = scribo_primitive_regroup_from_single_left_link_wrt_h_ratio.cc scribo_primitive_remove_separators_SOURCES = scribo_primitive_remove_separators.cc @@ -421,6 +437,8 @@ scribo_text_clean_inplace_SOURCES = scribo_text_clean_inplace.cc scribo_text_extract_lines_SOURCES = scribo_text_extract_lines.cc scribo_text_look_like_text_lines_SOURCES = scribo_text_look_like_text_lines.cc scribo_text_merging_SOURCES = scribo_text_merging.cc +scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc +scribo_toolchain_text_in_picture_SOURCES = scribo_toolchain_text_in_picture.cc scribo_upsampling_bs2x_SOURCES = scribo_upsampling_bs2x.cc scribo_upsampling_eagle_SOURCES = scribo_upsampling_eagle.cc -- 1.5.6.5