Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-450-g3c2ce9b Update READMEs.

by Guillaume Lazzara

* README, * src/README: Add few details about the content. --- scribo/ChangeLog | 7 +++++++ scribo/README | 17 +++++++++-------- scribo/src/README | 28 +++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6d12aad..da50444 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Update READMEs. + + * README, + * src/README: Add few details about the content. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Update Scribo include paths. * Makefile.am, diff --git a/scribo/README b/scribo/README index b8b7ca2..8506c66 100644 --- a/scribo/README +++ b/scribo/README @@ -17,10 +17,12 @@ along with Olena. If not, see <http://www.gnu.org/licenses/>. The complete GNU General Public License Notice can also be found in the 'COPYING' file in the root directory. +---------------------------------------------------------------------- -====================== - Introduction to Olena -====================== + +======================= + Introduction to Scribo +======================= Scribo aims to provide tools for Document Image Analysis (DIA). @@ -43,9 +45,8 @@ demo/ Sample GUI used to display text localization in picture results. -src/ - text_in_article_pbm - Retrieve text from a document. +scribo/ + The C++ headers of Scribo. - text_in_picture_fast - Localize text in pictures. \ No newline at end of file +src/ + Various small tools related to DIA. See src/README. \ No newline at end of file diff --git a/scribo/src/README b/scribo/src/README index db346ca..582168d 100644 --- a/scribo/src/README +++ b/scribo/src/README @@ -1,3 +1,25 @@ +Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) + +This file is part of Scribo. + +Scribo 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. + +Scribo 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/>. + +The complete GNU General Public License Notice can also be found in +the 'COPYING' file in the root directory. + +---------------------------------------------------------------------- + + In this directory, you can find several small tools. Here is a description of some of them: @@ -10,4 +32,8 @@ Here is a description of some of them: to extract its text. text_in_picture: Localize text in pictures (Do NOT extract and - recognize text) \ No newline at end of file + recognize text) + + text_recognition_in_picture: Localize, extract and try to + recognize text in pictures + (experimental). \ No newline at end of file -- 1.5.6.5

14 years, 10 months

last-svn-commit-449-gd34c8dd Update Scribo include paths.

by Guillaume Lazzara

* Makefile.am, * tests/unit_test/Makefile.am: Fix path of generated header list. * src/text_in_picture.cc, * src/text_recognition_in_picture.cc, * tests/filter/objects_with_holes.cc, * tests/filter/small_and_large_bboxes.cc, * tests/preprocessing/crop.cc, * tests/preprocessing/crop_without_localization.cc, * tests/preprocessing/deskew.cc, * tests/preprocessing/rotate_90.cc, * tests/table/extract_lines_with_rank.cc, * tests/table/repair_lines.cc, * tests/toolchain/nepomuk/text_extraction.cc: Fix path to data.hh. * demo/demat/demat.pro, * demo/wizard/wizard.pro, * scribo.mk, * tests/tests.mk: Set correct path to Scribo includes. * headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 425 +++++++++++--------- scribo/Makefile.am | 4 +- scribo/demo/demat/demat.pro | 2 +- scribo/demo/wizard/wizard.pro | 2 +- scribo/headers.mk | 344 +++++++++------- scribo/scribo.mk | 6 +- scribo/src/text_in_picture.cc | 6 +- scribo/src/text_recognition_in_picture.cc | 4 +- scribo/tests/filter/objects_with_holes.cc | 2 +- scribo/tests/filter/small_and_large_bboxes.cc | 2 +- scribo/tests/preprocessing/crop.cc | 5 +- .../preprocessing/crop_without_localization.cc | 5 +- scribo/tests/preprocessing/deskew.cc | 4 +- scribo/tests/preprocessing/rotate_90.cc | 2 +- scribo/tests/table/extract_lines_with_rank.cc | 5 +- scribo/tests/table/repair_lines.cc | 5 +- scribo/tests/tests.mk | 9 +- scribo/tests/toolchain/nepomuk/text_extraction.cc | 2 +- scribo/tests/unit_test/Makefile.am | 10 +- 19 files changed, 471 insertions(+), 373 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cd86691..6d12aad 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,7 +1,232 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Update Scribo include paths. + + * Makefile.am, + * tests/unit_test/Makefile.am: Fix path of generated header list. + + * src/text_in_picture.cc, + * src/text_recognition_in_picture.cc, + * tests/filter/objects_with_holes.cc, + * tests/filter/small_and_large_bboxes.cc, + * tests/preprocessing/crop.cc, + * tests/preprocessing/crop_without_localization.cc, + * tests/preprocessing/deskew.cc, + * tests/preprocessing/rotate_90.cc, + * tests/table/extract_lines_with_rank.cc, + * tests/table/repair_lines.cc, + * tests/toolchain/nepomuk/text_extraction.cc: Fix path to data.hh. + + * demo/demat/demat.pro, + * demo/wizard/wizard.pro, + * scribo.mk, + * tests/tests.mk: Set correct path to Scribo includes. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Move Scribo includes in a specific directory. + * all.hh, + * binarization/all.hh, + * binarization/global_threshold.hh, + * binarization/global_threshold_auto.hh, + * binarization/internal/first_pass_functor.hh, + * binarization/local_threshold.hh, + * binarization/sauvola.hh, + * binarization/sauvola_ms.hh, + * binarization/sauvola_ms_split.hh, + * binarization/sauvola_threshold_image.hh, + * binarization/sauvola_threshold_image_debug.hh, + * canvas/integral_browsing.hh, + * convert/from_qimage.hh, + * core/all.hh, + * core/central_sites.hh, + * core/component_info.hh, + * core/component_set.hh, + * core/concept/dmax_functor.hh, + * core/concept/link_functor.hh, + * core/def/lbl_type.hh, + * core/erase_objects.hh, + * core/init_integral_image.hh, + * core/line_info.hh, + * core/line_set.hh, + * core/macros.hh, + * core/object_groups.hh, + * core/object_links.hh, + * core/tag/anchor.hh, + * core/tag/component.hh, + * core/tag/line.hh, + * debug/alignment_decision_image.hh, + * debug/all.hh, + * debug/bboxes_enlarged_image.hh, + * debug/char_space_image.hh, + * debug/decision_image.hh, + * debug/highlight_text_area.hh, + * debug/line_info_image.hh, + * debug/links_decision_image.hh, + * debug/looks_like_a_text_line_image.hh, + * debug/mean_and_base_lines_image.hh, + * debug/save_bboxes_image.hh, + * debug/save_comp_diff.hh, + * debug/save_label_image.hh, + * debug/save_linked_bboxes_image.hh, + * debug/save_table_image.hh, + * debug/several_links_decision_image.hh, + * debug/text_areas_image.hh, + * debug/usage.hh, + * draw/all.hh, + * draw/bounding_box_links.hh, + * draw/bounding_boxes.hh, + * draw/groups_bboxes.hh, + * estim/object_groups_v_thickness.hh, + * filter/all.hh, + * filter/common/objects_photo.hh, + * filter/internal/alignment_angle.hh, + * filter/internal/component_aligned.hh, + * filter/internal/compute.hh, + * filter/object_groups_size_ratio.hh, + * filter/object_groups_small.hh, + * filter/object_groups_v_thickness.hh, + * filter/object_groups_with_holes.hh, + * filter/object_links_bbox_h_ratio.hh, + * filter/object_links_bbox_overlap.hh, + * 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_left_aligned.hh, + * filter/object_links_non_aligned_simple.hh, + * filter/object_links_right_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, + * filter/objects_with_holes.hh, + * fun/v2b/label_to_bool.hh, + * fun/v2b/objects_large_filter.hh, + * fun/v2b/objects_small_filter.hh, + * io/text_boxes/save.hh, + * io/xml/save.hh, + * make/all.hh, + * make/debug_filename.hh, + * make/influence_zone_graph.hh, + * postprocessing/all.hh, + * postprocessing/fill_object_holes.hh, + * preprocessing/all.hh, + * preprocessing/crop.hh, + * preprocessing/crop_without_localization.hh, + * preprocessing/denoise.hh, + * preprocessing/denoise_bg.hh, + * preprocessing/denoise_fg.hh, + * preprocessing/deskew.hh, + * preprocessing/deskew_crop.hh, + * preprocessing/homogeneous_contrast.hh, + * preprocessing/rotate_90.hh, + * preprocessing/split_bg_fg.hh, + * primitive/all.hh, + * primitive/extract/all.hh, + * primitive/extract/canvas.hh, + * primitive/extract/cells.hh, + * primitive/extract/components.hh, + * primitive/extract/horizontal_separators.hh, + * primitive/extract/lines_discontinued.hh, + * primitive/extract/lines_h_discontinued.hh, + * primitive/extract/lines_h_pattern.hh, + * primitive/extract/lines_h_single.hh, + * primitive/extract/lines_h_thick.hh, + * primitive/extract/lines_h_thick_and_single.hh, + * primitive/extract/lines_pattern.hh, + * primitive/extract/lines_thick.hh, + * primitive/extract/lines_v_discontinued.hh, + * primitive/extract/lines_v_pattern.hh, + * primitive/extract/lines_v_single.hh, + * primitive/extract/lines_v_thick.hh, + * primitive/extract/lines_v_thick_and_single.hh, + * primitive/extract/separators.hh, + * primitive/extract/vertical_separators.hh, + * primitive/group/all.hh, + * primitive/group/apply.hh, + * primitive/group/from_double_link.hh, + * primitive/group/from_graph.hh, + * primitive/group/from_single_link.hh, + * primitive/internal/all.hh, + * primitive/internal/find_graph_link.hh, + * primitive/internal/find_root.hh, + * primitive/internal/have_link_valid.hh, + * primitive/internal/is_link_valid.hh, + * primitive/internal/rd.hh, + * primitive/internal/update_graph_link.hh, + * primitive/link/all.hh, + * primitive/link/compute.hh, + * primitive/link/compute_several.hh, + * primitive/link/internal/compute_anchor.hh, + * primitive/link/internal/dmax_default.hh, + * primitive/link/internal/dmax_functor_base.hh, + * primitive/link/internal/dmax_width_and_height.hh, + * primitive/link/internal/dmax_width_only.hh, + * primitive/link/internal/find_link.hh, + * primitive/link/internal/find_several_links.hh, + * primitive/link/internal/link_functor_base.hh, + * primitive/link/internal/link_several_dmax_base.hh, + * primitive/link/internal/link_single_dmax_base.hh, + * primitive/link/internal/link_single_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_down_link.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, + * primitive/link/with_single_up_link.hh, + * primitive/regroup/from_single_left_link.hh, + * primitive/regroup/from_single_left_link_wrt_h_ratio.hh, + * primitive/remove/separators.hh, + * subsampling/bilinear.hh, + * subsampling/integral.hh, + * subsampling/integral_single_image.hh, + * table/align_lines_horizontaly.hh, + * table/align_lines_verticaly.hh, + * table/all.hh, + * table/connect_horizontal_lines.hh, + * table/connect_vertical_lines.hh, + * table/erase.hh, + * table/extract.hh, + * table/internal/align_lines.hh, + * table/internal/all.hh, + * table/internal/connect_lines.hh, + * table/internal/repair_lines.hh, + * table/rebuild.hh, + * table/repair_horizontal_lines.hh, + * table/repair_vertical_lines.hh, + * text/all.hh, + * text/clean.hh, + * text/clean_inplace.hh, + * text/extract_lines.hh, + * text/look_like_text_lines.hh, + * text/merging.hh, + * text/recognition.hh, + * toolchain/nepomuk/text_extraction.hh, + * toolchain/text_in_doc.hh, + * upsampling/bs2x.hh, + * upsampling/eagle.hh: Move... + * scribo/all.hh, * scribo/binarization/all.hh, * scribo/binarization/global_threshold.hh, @@ -198,205 +423,7 @@ * scribo/toolchain/nepomuk/text_extraction.hh, * scribo/toolchain/text_in_doc.hh, * scribo/upsampling/bs2x.hh, - * scribo/upsampling/eagle.hh: Move... - - * scribo/scribo/all.hh, - * scribo/scribo/binarization/all.hh, - * scribo/scribo/binarization/global_threshold.hh, - * scribo/scribo/binarization/global_threshold_auto.hh, - * scribo/scribo/binarization/internal/first_pass_functor.hh, - * scribo/scribo/binarization/local_threshold.hh, - * scribo/scribo/binarization/sauvola.hh, - * scribo/scribo/binarization/sauvola_ms.hh, - * scribo/scribo/binarization/sauvola_ms_split.hh, - * scribo/scribo/binarization/sauvola_threshold_image.hh, - * scribo/scribo/binarization/sauvola_threshold_image_debug.hh, - * scribo/scribo/canvas/integral_browsing.hh, - * scribo/scribo/convert/from_qimage.hh, - * scribo/scribo/core/all.hh, - * scribo/scribo/core/central_sites.hh, - * scribo/scribo/core/component_info.hh, - * scribo/scribo/core/component_set.hh, - * scribo/scribo/core/concept/dmax_functor.hh, - * scribo/scribo/core/concept/link_functor.hh, - * scribo/scribo/core/def/lbl_type.hh, - * scribo/scribo/core/erase_objects.hh, - * scribo/scribo/core/init_integral_image.hh, - * scribo/scribo/core/line_info.hh, - * scribo/scribo/core/line_set.hh, - * scribo/scribo/core/macros.hh, - * scribo/scribo/core/object_groups.hh, - * scribo/scribo/core/object_links.hh, - * scribo/scribo/core/tag/anchor.hh, - * scribo/scribo/core/tag/component.hh, - * scribo/scribo/core/tag/line.hh, - * scribo/scribo/debug/alignment_decision_image.hh, - * scribo/scribo/debug/all.hh, - * scribo/scribo/debug/bboxes_enlarged_image.hh, - * scribo/scribo/debug/char_space_image.hh, - * scribo/scribo/debug/decision_image.hh, - * scribo/scribo/debug/highlight_text_area.hh, - * scribo/scribo/debug/line_info_image.hh, - * scribo/scribo/debug/links_decision_image.hh, - * scribo/scribo/debug/looks_like_a_text_line_image.hh, - * scribo/scribo/debug/mean_and_base_lines_image.hh, - * scribo/scribo/debug/save_bboxes_image.hh, - * scribo/scribo/debug/save_comp_diff.hh, - * scribo/scribo/debug/save_label_image.hh, - * scribo/scribo/debug/save_linked_bboxes_image.hh, - * scribo/scribo/debug/save_table_image.hh, - * scribo/scribo/debug/several_links_decision_image.hh, - * scribo/scribo/debug/text_areas_image.hh, - * scribo/scribo/debug/usage.hh, - * scribo/scribo/draw/all.hh, - * scribo/scribo/draw/bounding_box_links.hh, - * scribo/scribo/draw/bounding_boxes.hh, - * scribo/scribo/draw/groups_bboxes.hh, - * scribo/scribo/estim/object_groups_v_thickness.hh, - * scribo/scribo/filter/all.hh, - * scribo/scribo/filter/common/objects_photo.hh, - * scribo/scribo/filter/internal/alignment_angle.hh, - * scribo/scribo/filter/internal/component_aligned.hh, - * scribo/scribo/filter/internal/compute.hh, - * scribo/scribo/filter/object_groups_size_ratio.hh, - * scribo/scribo/filter/object_groups_small.hh, - * scribo/scribo/filter/object_groups_v_thickness.hh, - * scribo/scribo/filter/object_groups_with_holes.hh, - * scribo/scribo/filter/object_links_bbox_h_ratio.hh, - * scribo/scribo/filter/object_links_bbox_overlap.hh, - * scribo/scribo/filter/object_links_bbox_ratio.hh, - * scribo/scribo/filter/object_links_bbox_w_ratio.hh, - * scribo/scribo/filter/object_links_bottom_aligned.hh, - * scribo/scribo/filter/object_links_center_aligned.hh, - * scribo/scribo/filter/object_links_left_aligned.hh, - * scribo/scribo/filter/object_links_non_aligned_simple.hh, - * scribo/scribo/filter/object_links_right_aligned.hh, - * scribo/scribo/filter/object_links_top_aligned.hh, - * scribo/scribo/filter/objects_h_thick.hh, - * scribo/scribo/filter/objects_h_thin.hh, - * scribo/scribo/filter/objects_large.hh, - * scribo/scribo/filter/objects_size_ratio.hh, - * scribo/scribo/filter/objects_small.hh, - * scribo/scribo/filter/objects_thick.hh, - * scribo/scribo/filter/objects_thin.hh, - * scribo/scribo/filter/objects_v_thick.hh, - * scribo/scribo/filter/objects_v_thin.hh, - * scribo/scribo/filter/objects_with_holes.hh, - * scribo/scribo/fun/v2b/label_to_bool.hh, - * scribo/scribo/fun/v2b/objects_large_filter.hh, - * scribo/scribo/fun/v2b/objects_small_filter.hh, - * scribo/scribo/io/text_boxes/save.hh, - * scribo/scribo/io/xml/save.hh, - * scribo/scribo/make/all.hh, - * scribo/scribo/make/debug_filename.hh, - * scribo/scribo/make/influence_zone_graph.hh, - * scribo/scribo/postprocessing/all.hh, - * scribo/scribo/postprocessing/fill_object_holes.hh, - * scribo/scribo/preprocessing/all.hh, - * scribo/scribo/preprocessing/crop.hh, - * scribo/scribo/preprocessing/crop_without_localization.hh, - * scribo/scribo/preprocessing/denoise.hh, - * scribo/scribo/preprocessing/denoise_bg.hh, - * scribo/scribo/preprocessing/denoise_fg.hh, - * scribo/scribo/preprocessing/deskew.hh, - * scribo/scribo/preprocessing/deskew_crop.hh, - * scribo/scribo/preprocessing/homogeneous_contrast.hh, - * scribo/scribo/preprocessing/rotate_90.hh, - * scribo/scribo/preprocessing/split_bg_fg.hh, - * scribo/scribo/primitive/all.hh, - * scribo/scribo/primitive/extract/all.hh, - * scribo/scribo/primitive/extract/canvas.hh, - * scribo/scribo/primitive/extract/cells.hh, - * scribo/scribo/primitive/extract/components.hh, - * scribo/scribo/primitive/extract/horizontal_separators.hh, - * scribo/scribo/primitive/extract/lines_discontinued.hh, - * scribo/scribo/primitive/extract/lines_h_discontinued.hh, - * scribo/scribo/primitive/extract/lines_h_pattern.hh, - * scribo/scribo/primitive/extract/lines_h_single.hh, - * scribo/scribo/primitive/extract/lines_h_thick.hh, - * scribo/scribo/primitive/extract/lines_h_thick_and_single.hh, - * scribo/scribo/primitive/extract/lines_pattern.hh, - * scribo/scribo/primitive/extract/lines_thick.hh, - * scribo/scribo/primitive/extract/lines_v_discontinued.hh, - * scribo/scribo/primitive/extract/lines_v_pattern.hh, - * scribo/scribo/primitive/extract/lines_v_single.hh, - * scribo/scribo/primitive/extract/lines_v_thick.hh, - * scribo/scribo/primitive/extract/lines_v_thick_and_single.hh, - * scribo/scribo/primitive/extract/separators.hh, - * scribo/scribo/primitive/extract/vertical_separators.hh, - * scribo/scribo/primitive/group/all.hh, - * scribo/scribo/primitive/group/apply.hh, - * scribo/scribo/primitive/group/from_double_link.hh, - * scribo/scribo/primitive/group/from_graph.hh, - * scribo/scribo/primitive/group/from_single_link.hh, - * scribo/scribo/primitive/internal/all.hh, - * scribo/scribo/primitive/internal/find_graph_link.hh, - * scribo/scribo/primitive/internal/find_root.hh, - * scribo/scribo/primitive/internal/have_link_valid.hh, - * scribo/scribo/primitive/internal/is_link_valid.hh, - * scribo/scribo/primitive/internal/rd.hh, - * scribo/scribo/primitive/internal/update_graph_link.hh, - * scribo/scribo/primitive/link/all.hh, - * scribo/scribo/primitive/link/compute.hh, - * scribo/scribo/primitive/link/compute_several.hh, - * scribo/scribo/primitive/link/internal/compute_anchor.hh, - * scribo/scribo/primitive/link/internal/dmax_default.hh, - * scribo/scribo/primitive/link/internal/dmax_functor_base.hh, - * scribo/scribo/primitive/link/internal/dmax_width_and_height.hh, - * scribo/scribo/primitive/link/internal/dmax_width_only.hh, - * scribo/scribo/primitive/link/internal/find_link.hh, - * scribo/scribo/primitive/link/internal/find_several_links.hh, - * scribo/scribo/primitive/link/internal/link_functor_base.hh, - * scribo/scribo/primitive/link/internal/link_several_dmax_base.hh, - * scribo/scribo/primitive/link/internal/link_single_dmax_base.hh, - * scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh, - * scribo/scribo/primitive/link/merge_double_link.hh, - * scribo/scribo/primitive/link/with_graph.hh, - * scribo/scribo/primitive/link/with_rag.hh, - * scribo/scribo/primitive/link/with_several_graphes.hh, - * scribo/scribo/primitive/link/with_several_left_links.hh, - * scribo/scribo/primitive/link/with_several_right_closest_links.hh, - * scribo/scribo/primitive/link/with_several_right_links.hh, - * scribo/scribo/primitive/link/with_several_right_links_overlap.hh, - * scribo/scribo/primitive/link/with_single_down_link.hh, - * scribo/scribo/primitive/link/with_single_left_link.hh, - * scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh, - * scribo/scribo/primitive/link/with_single_right_link.hh, - * scribo/scribo/primitive/link/with_single_right_link_bottom.hh, - * scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh, - * scribo/scribo/primitive/link/with_single_right_link_top.hh, - * scribo/scribo/primitive/link/with_single_up_link.hh, - * scribo/scribo/primitive/regroup/from_single_left_link.hh, - * scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, - * scribo/scribo/primitive/remove/separators.hh, - * scribo/scribo/subsampling/bilinear.hh, - * scribo/scribo/subsampling/integral.hh, - * scribo/scribo/subsampling/integral_single_image.hh, - * scribo/scribo/table/align_lines_horizontaly.hh, - * scribo/scribo/table/align_lines_verticaly.hh, - * scribo/scribo/table/all.hh, - * scribo/scribo/table/connect_horizontal_lines.hh, - * scribo/scribo/table/connect_vertical_lines.hh, - * scribo/scribo/table/erase.hh, - * scribo/scribo/table/extract.hh, - * scribo/scribo/table/internal/align_lines.hh, - * scribo/scribo/table/internal/all.hh, - * scribo/scribo/table/internal/connect_lines.hh, - * scribo/scribo/table/internal/repair_lines.hh, - * scribo/scribo/table/rebuild.hh, - * scribo/scribo/table/repair_horizontal_lines.hh, - * scribo/scribo/table/repair_vertical_lines.hh, - * scribo/scribo/text/all.hh, - * scribo/scribo/text/clean.hh, - * scribo/scribo/text/clean_inplace.hh, - * scribo/scribo/text/extract_lines.hh, - * scribo/scribo/text/look_like_text_lines.hh, - * scribo/scribo/text/merging.hh, - * scribo/scribo/text/recognition.hh, - * scribo/scribo/toolchain/nepomuk/text_extraction.hh, - * scribo/scribo/toolchain/text_in_doc.hh, - * scribo/scribo/upsampling/bs2x.hh, - * scribo/scribo/upsampling/eagle.hh: ... here. + * scribo/upsampling/eagle.hh: ... here. 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 38c84a7..b18366b 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 \ - . headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers scribo scribo # 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 \ - . headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers scribo scribo include $(srcdir)/headers.mk diff --git a/scribo/demo/demat/demat.pro b/scribo/demo/demat/demat.pro index 92fbe74..ef07aef 100644 --- a/scribo/demo/demat/demat.pro +++ b/scribo/demo/demat/demat.pro @@ -6,7 +6,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src -INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN) +INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN)/scribo QMAKE_CXXFLAGS += -g -O0 diff --git a/scribo/demo/wizard/wizard.pro b/scribo/demo/wizard/wizard.pro index 9dd5296..e517b4a 100644 --- a/scribo/demo/wizard/wizard.pro +++ b/scribo/demo/wizard/wizard.pro @@ -6,7 +6,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src -INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN) +INCLUDEPATH += . ../ ../shared $(OLN)/milena $(OLN)/scribo DEFINES += NDEBUG MLN_INCLUDE_ONLY diff --git a/scribo/headers.mk b/scribo/headers.mk index 4127a31..ce8700a 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -1,149 +1,207 @@ ## Generated by `generate_dist_headers.sh', do not edit by hand. 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 \ -./draw/bounding_box_links.hh \ -./draw/bounding_boxes.hh \ -./estim/object_groups_v_thickness.hh \ -./filter/all.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 \ -./filter/object_links_bbox_overlap.hh \ -./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 \ -./make/influence_zone_graph.hh \ -./make/text.hh \ -./preprocessing/all.hh \ -./preprocessing/split_bg_fg.hh \ -./preprocessing/unskew.hh \ -./primitive/all.hh \ -./primitive/extract/all.hh \ -./primitive/extract/canvas.hh \ -./primitive/extract/cells.hh \ -./primitive/extract/lines_discontinued.hh \ -./primitive/extract/lines_h_discontinued.hh \ -./primitive/extract/lines_h_pattern.hh \ -./primitive/extract/lines_h_single.hh \ -./primitive/extract/lines_h_thick.hh \ -./primitive/extract/lines_h_thick_and_single.hh \ -./primitive/extract/lines_pattern.hh \ -./primitive/extract/lines_thick.hh \ -./primitive/extract/lines_v_discontinued.hh \ -./primitive/extract/lines_v_pattern.hh \ -./primitive/extract/lines_v_single.hh \ -./primitive/extract/lines_v_thick.hh \ -./primitive/extract/lines_v_thick_and_single.hh \ -./primitive/extract/objects.hh \ -./primitive/group/all.hh \ -./primitive/group/apply.hh \ -./primitive/group/from_double_link.hh \ -./primitive/group/from_graph.hh \ -./primitive/group/from_single_link.hh \ -./primitive/internal/all.hh \ -./primitive/internal/find_graph_link.hh \ -./primitive/internal/find_left_link.hh \ -./primitive/internal/find_right_link.hh \ -./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 \ -./table/connect_horizontal_lines.hh \ -./table/connect_vertical_lines.hh \ -./table/erase.hh \ -./table/extract.hh \ -./table/internal/align_lines.hh \ -./table/internal/all.hh \ -./table/internal/connect_lines.hh \ -./table/internal/repair_lines.hh \ -./table/rebuild.hh \ -./table/repair_horizontal_lines.hh \ -./table/repair_vertical_lines.hh \ -./text/all.hh \ -./text/clean.hh \ -./text/extract_lines.hh \ -./text/recognition.hh \ -./util/all.hh \ -./util/text.hh +scribo/all.hh \ +scribo/binarization/all.hh \ +scribo/binarization/global_threshold.hh \ +scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/first_pass_functor.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 \ +scribo/core/central_sites.hh \ +scribo/core/component_info.hh \ +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/erase_objects.hh \ +scribo/core/init_integral_image.hh \ +scribo/core/line_info.hh \ +scribo/core/line_set.hh \ +scribo/core/macros.hh \ +scribo/core/object_groups.hh \ +scribo/core/object_links.hh \ +scribo/core/tag/anchor.hh \ +scribo/core/tag/component.hh \ +scribo/core/tag/line.hh \ +scribo/debug/alignment_decision_image.hh \ +scribo/debug/all.hh \ +scribo/debug/bboxes_enlarged_image.hh \ +scribo/debug/char_space_image.hh \ +scribo/debug/decision_image.hh \ +scribo/debug/highlight_text_area.hh \ +scribo/debug/line_info_image.hh \ +scribo/debug/links_decision_image.hh \ +scribo/debug/looks_like_a_text_line_image.hh \ +scribo/debug/mean_and_base_lines_image.hh \ +scribo/debug/save_bboxes_image.hh \ +scribo/debug/save_comp_diff.hh \ +scribo/debug/save_label_image.hh \ +scribo/debug/save_linked_bboxes_image.hh \ +scribo/debug/save_table_image.hh \ +scribo/debug/several_links_decision_image.hh \ +scribo/debug/text_areas_image.hh \ +scribo/debug/usage.hh \ +scribo/draw/all.hh \ +scribo/draw/bounding_box_links.hh \ +scribo/draw/bounding_boxes.hh \ +scribo/draw/groups_bboxes.hh \ +scribo/estim/object_groups_v_thickness.hh \ +scribo/filter/all.hh \ +scribo/filter/common/objects_photo.hh \ +scribo/filter/internal/alignment_angle.hh \ +scribo/filter/internal/component_aligned.hh \ +scribo/filter/internal/compute.hh \ +scribo/filter/object_groups_size_ratio.hh \ +scribo/filter/object_groups_small.hh \ +scribo/filter/object_groups_v_thickness.hh \ +scribo/filter/object_groups_with_holes.hh \ +scribo/filter/object_links_bbox_h_ratio.hh \ +scribo/filter/object_links_bbox_overlap.hh \ +scribo/filter/object_links_bbox_ratio.hh \ +scribo/filter/object_links_bbox_w_ratio.hh \ +scribo/filter/object_links_bottom_aligned.hh \ +scribo/filter/object_links_center_aligned.hh \ +scribo/filter/object_links_left_aligned.hh \ +scribo/filter/object_links_non_aligned_simple.hh \ +scribo/filter/object_links_right_aligned.hh \ +scribo/filter/object_links_top_aligned.hh \ +scribo/filter/objects_h_thick.hh \ +scribo/filter/objects_h_thin.hh \ +scribo/filter/objects_large.hh \ +scribo/filter/objects_size_ratio.hh \ +scribo/filter/objects_small.hh \ +scribo/filter/objects_thick.hh \ +scribo/filter/objects_thin.hh \ +scribo/filter/objects_v_thick.hh \ +scribo/filter/objects_v_thin.hh \ +scribo/filter/objects_with_holes.hh \ +scribo/fun/v2b/label_to_bool.hh \ +scribo/fun/v2b/objects_large_filter.hh \ +scribo/fun/v2b/objects_small_filter.hh \ +scribo/io/text_boxes/save.hh \ +scribo/io/xml/save.hh \ +scribo/make/all.hh \ +scribo/make/debug_filename.hh \ +scribo/make/influence_zone_graph.hh \ +scribo/postprocessing/all.hh \ +scribo/postprocessing/fill_object_holes.hh \ +scribo/preprocessing/all.hh \ +scribo/preprocessing/crop.hh \ +scribo/preprocessing/crop_without_localization.hh \ +scribo/preprocessing/denoise.hh \ +scribo/preprocessing/denoise_bg.hh \ +scribo/preprocessing/denoise_fg.hh \ +scribo/preprocessing/deskew.hh \ +scribo/preprocessing/deskew_crop.hh \ +scribo/preprocessing/homogeneous_contrast.hh \ +scribo/preprocessing/rotate_90.hh \ +scribo/preprocessing/split_bg_fg.hh \ +scribo/primitive/all.hh \ +scribo/primitive/extract/all.hh \ +scribo/primitive/extract/canvas.hh \ +scribo/primitive/extract/cells.hh \ +scribo/primitive/extract/components.hh \ +scribo/primitive/extract/horizontal_separators.hh \ +scribo/primitive/extract/lines_discontinued.hh \ +scribo/primitive/extract/lines_h_discontinued.hh \ +scribo/primitive/extract/lines_h_pattern.hh \ +scribo/primitive/extract/lines_h_single.hh \ +scribo/primitive/extract/lines_h_thick.hh \ +scribo/primitive/extract/lines_h_thick_and_single.hh \ +scribo/primitive/extract/lines_pattern.hh \ +scribo/primitive/extract/lines_thick.hh \ +scribo/primitive/extract/lines_v_discontinued.hh \ +scribo/primitive/extract/lines_v_pattern.hh \ +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/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/group/from_single_link_robust.hh \ +scribo/primitive/internal/all.hh \ +scribo/primitive/internal/find_graph_link.hh \ +scribo/primitive/internal/find_root.hh \ +scribo/primitive/internal/find_root_robust.hh \ +scribo/primitive/internal/have_link_valid.hh \ +scribo/primitive/internal/is_link_valid.hh \ +scribo/primitive/internal/rd.hh \ +scribo/primitive/internal/update_graph_link.hh \ +scribo/primitive/link/all.hh \ +scribo/primitive/link/compute.hh \ +scribo/primitive/link/compute_several.hh \ +scribo/primitive/link/internal/compute_anchor.hh \ +scribo/primitive/link/internal/dmax_default.hh \ +scribo/primitive/link/internal/dmax_functor_base.hh \ +scribo/primitive/link/internal/dmax_width_and_height.hh \ +scribo/primitive/link/internal/dmax_width_only.hh \ +scribo/primitive/link/internal/find_link.hh \ +scribo/primitive/link/internal/find_several_links.hh \ +scribo/primitive/link/internal/link_functor_base.hh \ +scribo/primitive/link/internal/link_several_dmax_base.hh \ +scribo/primitive/link/internal/link_single_dmax_base.hh \ +scribo/primitive/link/internal/link_single_dmax_ratio_base.hh \ +scribo/primitive/link/merge_double_link.hh \ +scribo/primitive/link/with_graph.hh \ +scribo/primitive/link/with_rag.hh \ +scribo/primitive/link/with_several_graphes.hh \ +scribo/primitive/link/with_several_left_links.hh \ +scribo/primitive/link/with_several_right_closest_links.hh \ +scribo/primitive/link/with_several_right_links.hh \ +scribo/primitive/link/with_several_right_links_overlap.hh \ +scribo/primitive/link/with_single_down_link.hh \ +scribo/primitive/link/with_single_left_link.hh \ +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/regroup/from_single_left_link.hh \ +scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh \ +scribo/primitive/remove/separators.hh \ +scribo/subsampling/bilinear.hh \ +scribo/subsampling/integral.hh \ +scribo/subsampling/integral_single_image.hh \ +scribo/table/align_lines_horizontaly.hh \ +scribo/table/align_lines_verticaly.hh \ +scribo/table/all.hh \ +scribo/table/connect_horizontal_lines.hh \ +scribo/table/connect_vertical_lines.hh \ +scribo/table/erase.hh \ +scribo/table/extract.hh \ +scribo/table/internal/align_lines.hh \ +scribo/table/internal/all.hh \ +scribo/table/internal/connect_lines.hh \ +scribo/table/internal/repair_lines.hh \ +scribo/table/rebuild.hh \ +scribo/table/repair_horizontal_lines.hh \ +scribo/table/repair_vertical_lines.hh \ +scribo/text/all.hh \ +scribo/text/clean.hh \ +scribo/text/clean_inplace.hh \ +scribo/text/extract_lines.hh \ +scribo/text/look_like_text_lines.hh \ +scribo/text/merging.hh \ +scribo/text/recognition.hh \ +scribo/toolchain/nepomuk/text_extraction.hh \ +scribo/toolchain/text_in_doc.hh \ +scribo/upsampling/bs2x.hh \ +scribo/upsampling/eagle.hh #<<lrde nobase_scribo_HEADERS += diff --git a/scribo/scribo.mk b/scribo/scribo.mk index c08bbec..c899631 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -17,7 +17,11 @@ # Add path to Scribo's headers -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = \ + -I$(top_srcdir)/scribo \ + -I$(top_builddir)/scribo\ + -I$(top_srcdir)/milena \ + -I$(top_builddir)/milena SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index e7b8328..8f530db 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -103,9 +103,9 @@ #include <mln/core/var.hh> -#include <scribo/src/afp/components.hh> -#include <scribo/src/afp/link.hh> -#include <scribo/src/afp/regroup.hh> +#include <src/afp/components.hh> +#include <src/afp/link.hh> +#include <src/afp/regroup.hh> const char *args_desc[][2] = { diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index b69411e..acf8fec 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -105,8 +105,8 @@ #include <mln/core/var.hh> -#include <scribo/src/afp/components.hh> -#include <scribo/src/afp/link.hh> +#include <src/afp/components.hh> +#include <src/afp/link.hh> #include <scribo/core/line_set.hh> #include <scribo/text/recognition.hh> diff --git a/scribo/tests/filter/objects_with_holes.cc b/scribo/tests/filter/objects_with_holes.cc index ca852a9..c556513 100644 --- a/scribo/tests/filter/objects_with_holes.cc +++ b/scribo/tests/filter/objects_with_holes.cc @@ -35,7 +35,7 @@ #include <scribo/filter/objects_with_holes.hh> #include <scribo/primitive/extract/components.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) { diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/filter/small_and_large_bboxes.cc index 653a8ca..20ddd12 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/filter/small_and_large_bboxes.cc @@ -42,7 +42,7 @@ #include <scribo/debug/save_bboxes_image.hh> #include <scribo/debug/save_linked_bboxes_image.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char* argv[]) { diff --git a/scribo/tests/preprocessing/crop.cc b/scribo/tests/preprocessing/crop.cc index be36064..458151b 100644 --- a/scribo/tests/preprocessing/crop.cc +++ b/scribo/tests/preprocessing/crop.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. // @@ -27,7 +28,7 @@ #include <mln/data/compare.hh> #include <scribo/preprocessing/crop.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) { diff --git a/scribo/tests/preprocessing/crop_without_localization.cc b/scribo/tests/preprocessing/crop_without_localization.cc index 0487ef3..c66e15a 100644 --- a/scribo/tests/preprocessing/crop_without_localization.cc +++ b/scribo/tests/preprocessing/crop_without_localization.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. // @@ -29,7 +30,7 @@ #include <mln/debug/println.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) { diff --git a/scribo/tests/preprocessing/deskew.cc b/scribo/tests/preprocessing/deskew.cc index 5b55889..922152b 100644 --- a/scribo/tests/preprocessing/deskew.cc +++ b/scribo/tests/preprocessing/deskew.cc @@ -26,7 +26,7 @@ /// \file /// -/// \fixme Add a better test..... +/// #include <mln/core/image/image2d.hh> #include <mln/io/pgm/all.hh> @@ -35,7 +35,7 @@ #include <scribo/preprocessing/deskew.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) { diff --git a/scribo/tests/preprocessing/rotate_90.cc b/scribo/tests/preprocessing/rotate_90.cc index 0c2286a..5118eb0 100644 --- a/scribo/tests/preprocessing/rotate_90.cc +++ b/scribo/tests/preprocessing/rotate_90.cc @@ -29,7 +29,7 @@ #include <mln/make/image.hh> #include <scribo/preprocessing/rotate_90.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) diff --git a/scribo/tests/table/extract_lines_with_rank.cc b/scribo/tests/table/extract_lines_with_rank.cc index 29d35b4..120346c 100644 --- a/scribo/tests/table/extract_lines_with_rank.cc +++ b/scribo/tests/table/extract_lines_with_rank.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. // @@ -41,7 +42,7 @@ #include <scribo/primitive/extract/lines_h_discontinued.hh> #include <scribo/primitive/extract/lines_v_discontinued.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) diff --git a/scribo/tests/table/repair_lines.cc b/scribo/tests/table/repair_lines.cc index addbb10..fba2785 100644 --- a/scribo/tests/table/repair_lines.cc +++ b/scribo/tests/table/repair_lines.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. // @@ -37,7 +38,7 @@ #include <scribo/table/repair_horizontal_lines.hh> #include <scribo/debug/save_table_image.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main(int argc, char *argv[]) { diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index 48a1009..d95e4d2 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -14,7 +15,11 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = \ + -I$(top_srcdir)/scribo \ + -I$(top_builddir)/scribo\ + -I$(top_srcdir)/milena \ + -I$(top_builddir)/milena SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/tests/toolchain/nepomuk/text_extraction.cc index c1b51ea..027ad99 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/tests/toolchain/nepomuk/text_extraction.cc @@ -31,7 +31,7 @@ #include <QtCore> #include <scribo/toolchain/nepomuk/text_extraction.hh> -#include <scribo/tests/data.hh> +#include "tests/data.hh" int main() { diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 86721e8..b150824 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -29,7 +30,7 @@ include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: cd $(top_srcdir) \ && ./build-aux/build_unit_test.sh \ - scribo \ + scribo/scribo \ scribo/tests/unit_test \ scribo/tests/unit_test/disabled_tests \ scribo @@ -40,17 +41,16 @@ regen-am: # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -$(srcdir)/unit-tests.mk: build_unit_test.sh disabled_tests $(COND_TESTS) +$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS) cd $(top_srcdir) \ && ./build-aux/build_unit_test.sh \ - scribo \ + scribo/scribo \ scribo/tests/unit_test \ scribo/tests/unit_test/disabled_tests \ scribo include $(srcdir)/unit-tests.mk - MAINTAINERCLEANFILES = $(srcdir)/scribo_*.cc TESTS = $(check_PROGRAMS) -- 1.5.6.5

14 years, 10 months

last-svn-commit-448-gd5c383a Move Scribo includes in a specific directory.

by Guillaume Lazzara

* scribo/all.hh, * scribo/binarization/all.hh, * scribo/binarization/global_threshold.hh, * scribo/binarization/global_threshold_auto.hh, * scribo/binarization/internal/first_pass_functor.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, * scribo/core/central_sites.hh, * scribo/core/component_info.hh, * 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/erase_objects.hh, * scribo/core/init_integral_image.hh, * scribo/core/line_info.hh, * scribo/core/line_set.hh, * scribo/core/macros.hh, * scribo/core/object_groups.hh, * scribo/core/object_links.hh, * scribo/core/tag/anchor.hh, * scribo/core/tag/component.hh, * scribo/core/tag/line.hh, * scribo/debug/alignment_decision_image.hh, * scribo/debug/all.hh, * scribo/debug/bboxes_enlarged_image.hh, * scribo/debug/char_space_image.hh, * scribo/debug/decision_image.hh, * scribo/debug/highlight_text_area.hh, * scribo/debug/line_info_image.hh, * scribo/debug/links_decision_image.hh, * scribo/debug/looks_like_a_text_line_image.hh, * scribo/debug/mean_and_base_lines_image.hh, * scribo/debug/save_bboxes_image.hh, * scribo/debug/save_comp_diff.hh, * scribo/debug/save_label_image.hh, * scribo/debug/save_linked_bboxes_image.hh, * scribo/debug/save_table_image.hh, * scribo/debug/several_links_decision_image.hh, * scribo/debug/text_areas_image.hh, * scribo/debug/usage.hh, * scribo/draw/all.hh, * scribo/draw/bounding_box_links.hh, * scribo/draw/bounding_boxes.hh, * scribo/draw/groups_bboxes.hh, * scribo/estim/object_groups_v_thickness.hh, * scribo/filter/all.hh, * scribo/filter/common/objects_photo.hh, * scribo/filter/internal/alignment_angle.hh, * scribo/filter/internal/component_aligned.hh, * scribo/filter/internal/compute.hh, * scribo/filter/object_groups_size_ratio.hh, * scribo/filter/object_groups_small.hh, * scribo/filter/object_groups_v_thickness.hh, * scribo/filter/object_groups_with_holes.hh, * scribo/filter/object_links_bbox_h_ratio.hh, * scribo/filter/object_links_bbox_overlap.hh, * scribo/filter/object_links_bbox_ratio.hh, * scribo/filter/object_links_bbox_w_ratio.hh, * scribo/filter/object_links_bottom_aligned.hh, * scribo/filter/object_links_center_aligned.hh, * scribo/filter/object_links_left_aligned.hh, * scribo/filter/object_links_non_aligned_simple.hh, * scribo/filter/object_links_right_aligned.hh, * scribo/filter/object_links_top_aligned.hh, * scribo/filter/objects_h_thick.hh, * scribo/filter/objects_h_thin.hh, * scribo/filter/objects_large.hh, * scribo/filter/objects_size_ratio.hh, * scribo/filter/objects_small.hh, * scribo/filter/objects_thick.hh, * scribo/filter/objects_thin.hh, * scribo/filter/objects_v_thick.hh, * scribo/filter/objects_v_thin.hh, * scribo/filter/objects_with_holes.hh, * scribo/fun/v2b/label_to_bool.hh, * scribo/fun/v2b/objects_large_filter.hh, * scribo/fun/v2b/objects_small_filter.hh, * scribo/io/text_boxes/save.hh, * scribo/io/xml/save.hh, * scribo/make/all.hh, * scribo/make/debug_filename.hh, * scribo/make/influence_zone_graph.hh, * scribo/postprocessing/all.hh, * scribo/postprocessing/fill_object_holes.hh, * scribo/preprocessing/all.hh, * scribo/preprocessing/crop.hh, * scribo/preprocessing/crop_without_localization.hh, * scribo/preprocessing/denoise.hh, * scribo/preprocessing/denoise_bg.hh, * scribo/preprocessing/denoise_fg.hh, * scribo/preprocessing/deskew.hh, * scribo/preprocessing/deskew_crop.hh, * scribo/preprocessing/homogeneous_contrast.hh, * scribo/preprocessing/rotate_90.hh, * scribo/preprocessing/split_bg_fg.hh, * scribo/primitive/all.hh, * scribo/primitive/extract/all.hh, * scribo/primitive/extract/canvas.hh, * scribo/primitive/extract/cells.hh, * scribo/primitive/extract/components.hh, * scribo/primitive/extract/horizontal_separators.hh, * scribo/primitive/extract/lines_discontinued.hh, * scribo/primitive/extract/lines_h_discontinued.hh, * scribo/primitive/extract/lines_h_pattern.hh, * scribo/primitive/extract/lines_h_single.hh, * scribo/primitive/extract/lines_h_thick.hh, * scribo/primitive/extract/lines_h_thick_and_single.hh, * scribo/primitive/extract/lines_pattern.hh, * scribo/primitive/extract/lines_thick.hh, * scribo/primitive/extract/lines_v_discontinued.hh, * scribo/primitive/extract/lines_v_pattern.hh, * 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/vertical_separators.hh, * scribo/primitive/group/all.hh, * scribo/primitive/group/apply.hh, * scribo/primitive/group/from_double_link.hh, * scribo/primitive/group/from_graph.hh, * scribo/primitive/group/from_single_link.hh, * scribo/primitive/internal/all.hh, * scribo/primitive/internal/find_graph_link.hh, * scribo/primitive/internal/find_root.hh, * scribo/primitive/internal/have_link_valid.hh, * scribo/primitive/internal/is_link_valid.hh, * scribo/primitive/internal/rd.hh, * scribo/primitive/internal/update_graph_link.hh, * scribo/primitive/link/all.hh, * scribo/primitive/link/compute.hh, * scribo/primitive/link/compute_several.hh, * scribo/primitive/link/internal/compute_anchor.hh, * scribo/primitive/link/internal/dmax_default.hh, * scribo/primitive/link/internal/dmax_functor_base.hh, * scribo/primitive/link/internal/dmax_width_and_height.hh, * scribo/primitive/link/internal/dmax_width_only.hh, * scribo/primitive/link/internal/find_link.hh, * scribo/primitive/link/internal/find_several_links.hh, * scribo/primitive/link/internal/link_functor_base.hh, * scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh, * scribo/primitive/link/merge_double_link.hh, * scribo/primitive/link/with_graph.hh, * scribo/primitive/link/with_rag.hh, * scribo/primitive/link/with_several_graphes.hh, * scribo/primitive/link/with_several_left_links.hh, * scribo/primitive/link/with_several_right_closest_links.hh, * scribo/primitive/link/with_several_right_links.hh, * scribo/primitive/link/with_several_right_links_overlap.hh, * scribo/primitive/link/with_single_down_link.hh, * scribo/primitive/link/with_single_left_link.hh, * 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_top.hh, * scribo/primitive/link/with_single_up_link.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, * scribo/subsampling/bilinear.hh, * scribo/subsampling/integral.hh, * scribo/subsampling/integral_single_image.hh, * scribo/table/align_lines_horizontaly.hh, * scribo/table/align_lines_verticaly.hh, * scribo/table/all.hh, * scribo/table/connect_horizontal_lines.hh, * scribo/table/connect_vertical_lines.hh, * scribo/table/erase.hh, * scribo/table/extract.hh, * scribo/table/internal/align_lines.hh, * scribo/table/internal/all.hh, * scribo/table/internal/connect_lines.hh, * scribo/table/internal/repair_lines.hh, * scribo/table/rebuild.hh, * scribo/table/repair_horizontal_lines.hh, * scribo/table/repair_vertical_lines.hh, * scribo/text/all.hh, * scribo/text/clean.hh, * scribo/text/clean_inplace.hh, * scribo/text/extract_lines.hh, * scribo/text/look_like_text_lines.hh, * scribo/text/merging.hh, * scribo/text/recognition.hh, * scribo/toolchain/nepomuk/text_extraction.hh, * scribo/toolchain/text_in_doc.hh, * scribo/upsampling/bs2x.hh, * scribo/upsampling/eagle.hh: Move... * scribo/scribo/all.hh, * scribo/scribo/binarization/all.hh, * scribo/scribo/binarization/global_threshold.hh, * scribo/scribo/binarization/global_threshold_auto.hh, * scribo/scribo/binarization/internal/first_pass_functor.hh, * scribo/scribo/binarization/local_threshold.hh, * scribo/scribo/binarization/sauvola.hh, * scribo/scribo/binarization/sauvola_ms.hh, * scribo/scribo/binarization/sauvola_ms_split.hh, * scribo/scribo/binarization/sauvola_threshold_image.hh, * scribo/scribo/binarization/sauvola_threshold_image_debug.hh, * scribo/scribo/canvas/integral_browsing.hh, * scribo/scribo/convert/from_qimage.hh, * scribo/scribo/core/all.hh, * scribo/scribo/core/central_sites.hh, * scribo/scribo/core/component_info.hh, * scribo/scribo/core/component_set.hh, * scribo/scribo/core/concept/dmax_functor.hh, * scribo/scribo/core/concept/link_functor.hh, * scribo/scribo/core/def/lbl_type.hh, * scribo/scribo/core/erase_objects.hh, * scribo/scribo/core/init_integral_image.hh, * scribo/scribo/core/line_info.hh, * scribo/scribo/core/line_set.hh, * scribo/scribo/core/macros.hh, * scribo/scribo/core/object_groups.hh, * scribo/scribo/core/object_links.hh, * scribo/scribo/core/tag/anchor.hh, * scribo/scribo/core/tag/component.hh, * scribo/scribo/core/tag/line.hh, * scribo/scribo/debug/alignment_decision_image.hh, * scribo/scribo/debug/all.hh, * scribo/scribo/debug/bboxes_enlarged_image.hh, * scribo/scribo/debug/char_space_image.hh, * scribo/scribo/debug/decision_image.hh, * scribo/scribo/debug/highlight_text_area.hh, * scribo/scribo/debug/line_info_image.hh, * scribo/scribo/debug/links_decision_image.hh, * scribo/scribo/debug/looks_like_a_text_line_image.hh, * scribo/scribo/debug/mean_and_base_lines_image.hh, * scribo/scribo/debug/save_bboxes_image.hh, * scribo/scribo/debug/save_comp_diff.hh, * scribo/scribo/debug/save_label_image.hh, * scribo/scribo/debug/save_linked_bboxes_image.hh, * scribo/scribo/debug/save_table_image.hh, * scribo/scribo/debug/several_links_decision_image.hh, * scribo/scribo/debug/text_areas_image.hh, * scribo/scribo/debug/usage.hh, * scribo/scribo/draw/all.hh, * scribo/scribo/draw/bounding_box_links.hh, * scribo/scribo/draw/bounding_boxes.hh, * scribo/scribo/draw/groups_bboxes.hh, * scribo/scribo/estim/object_groups_v_thickness.hh, * scribo/scribo/filter/all.hh, * scribo/scribo/filter/common/objects_photo.hh, * scribo/scribo/filter/internal/alignment_angle.hh, * scribo/scribo/filter/internal/component_aligned.hh, * scribo/scribo/filter/internal/compute.hh, * scribo/scribo/filter/object_groups_size_ratio.hh, * scribo/scribo/filter/object_groups_small.hh, * scribo/scribo/filter/object_groups_v_thickness.hh, * scribo/scribo/filter/object_groups_with_holes.hh, * scribo/scribo/filter/object_links_bbox_h_ratio.hh, * scribo/scribo/filter/object_links_bbox_overlap.hh, * scribo/scribo/filter/object_links_bbox_ratio.hh, * scribo/scribo/filter/object_links_bbox_w_ratio.hh, * scribo/scribo/filter/object_links_bottom_aligned.hh, * scribo/scribo/filter/object_links_center_aligned.hh, * scribo/scribo/filter/object_links_left_aligned.hh, * scribo/scribo/filter/object_links_non_aligned_simple.hh, * scribo/scribo/filter/object_links_right_aligned.hh, * scribo/scribo/filter/object_links_top_aligned.hh, * scribo/scribo/filter/objects_h_thick.hh, * scribo/scribo/filter/objects_h_thin.hh, * scribo/scribo/filter/objects_large.hh, * scribo/scribo/filter/objects_size_ratio.hh, * scribo/scribo/filter/objects_small.hh, * scribo/scribo/filter/objects_thick.hh, * scribo/scribo/filter/objects_thin.hh, * scribo/scribo/filter/objects_v_thick.hh, * scribo/scribo/filter/objects_v_thin.hh, * scribo/scribo/filter/objects_with_holes.hh, * scribo/scribo/fun/v2b/label_to_bool.hh, * scribo/scribo/fun/v2b/objects_large_filter.hh, * scribo/scribo/fun/v2b/objects_small_filter.hh, * scribo/scribo/io/text_boxes/save.hh, * scribo/scribo/io/xml/save.hh, * scribo/scribo/make/all.hh, * scribo/scribo/make/debug_filename.hh, * scribo/scribo/make/influence_zone_graph.hh, * scribo/scribo/postprocessing/all.hh, * scribo/scribo/postprocessing/fill_object_holes.hh, * scribo/scribo/preprocessing/all.hh, * scribo/scribo/preprocessing/crop.hh, * scribo/scribo/preprocessing/crop_without_localization.hh, * scribo/scribo/preprocessing/denoise.hh, * scribo/scribo/preprocessing/denoise_bg.hh, * scribo/scribo/preprocessing/denoise_fg.hh, * scribo/scribo/preprocessing/deskew.hh, * scribo/scribo/preprocessing/deskew_crop.hh, * scribo/scribo/preprocessing/homogeneous_contrast.hh, * scribo/scribo/preprocessing/rotate_90.hh, * scribo/scribo/preprocessing/split_bg_fg.hh, * scribo/scribo/primitive/all.hh, * scribo/scribo/primitive/extract/all.hh, * scribo/scribo/primitive/extract/canvas.hh, * scribo/scribo/primitive/extract/cells.hh, * scribo/scribo/primitive/extract/components.hh, * scribo/scribo/primitive/extract/horizontal_separators.hh, * scribo/scribo/primitive/extract/lines_discontinued.hh, * scribo/scribo/primitive/extract/lines_h_discontinued.hh, * scribo/scribo/primitive/extract/lines_h_pattern.hh, * scribo/scribo/primitive/extract/lines_h_single.hh, * scribo/scribo/primitive/extract/lines_h_thick.hh, * scribo/scribo/primitive/extract/lines_h_thick_and_single.hh, * scribo/scribo/primitive/extract/lines_pattern.hh, * scribo/scribo/primitive/extract/lines_thick.hh, * scribo/scribo/primitive/extract/lines_v_discontinued.hh, * scribo/scribo/primitive/extract/lines_v_pattern.hh, * scribo/scribo/primitive/extract/lines_v_single.hh, * scribo/scribo/primitive/extract/lines_v_thick.hh, * scribo/scribo/primitive/extract/lines_v_thick_and_single.hh, * scribo/scribo/primitive/extract/separators.hh, * scribo/scribo/primitive/extract/vertical_separators.hh, * scribo/scribo/primitive/group/all.hh, * scribo/scribo/primitive/group/apply.hh, * scribo/scribo/primitive/group/from_double_link.hh, * scribo/scribo/primitive/group/from_graph.hh, * scribo/scribo/primitive/group/from_single_link.hh, * scribo/scribo/primitive/internal/all.hh, * scribo/scribo/primitive/internal/find_graph_link.hh, * scribo/scribo/primitive/internal/find_root.hh, * scribo/scribo/primitive/internal/have_link_valid.hh, * scribo/scribo/primitive/internal/is_link_valid.hh, * scribo/scribo/primitive/internal/rd.hh, * scribo/scribo/primitive/internal/update_graph_link.hh, * scribo/scribo/primitive/link/all.hh, * scribo/scribo/primitive/link/compute.hh, * scribo/scribo/primitive/link/compute_several.hh, * scribo/scribo/primitive/link/internal/compute_anchor.hh, * scribo/scribo/primitive/link/internal/dmax_default.hh, * scribo/scribo/primitive/link/internal/dmax_functor_base.hh, * scribo/scribo/primitive/link/internal/dmax_width_and_height.hh, * scribo/scribo/primitive/link/internal/dmax_width_only.hh, * scribo/scribo/primitive/link/internal/find_link.hh, * scribo/scribo/primitive/link/internal/find_several_links.hh, * scribo/scribo/primitive/link/internal/link_functor_base.hh, * scribo/scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/scribo/primitive/link/internal/link_single_dmax_base.hh, * scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh, * scribo/scribo/primitive/link/merge_double_link.hh, * scribo/scribo/primitive/link/with_graph.hh, * scribo/scribo/primitive/link/with_rag.hh, * scribo/scribo/primitive/link/with_several_graphes.hh, * scribo/scribo/primitive/link/with_several_left_links.hh, * scribo/scribo/primitive/link/with_several_right_closest_links.hh, * scribo/scribo/primitive/link/with_several_right_links.hh, * scribo/scribo/primitive/link/with_several_right_links_overlap.hh, * scribo/scribo/primitive/link/with_single_down_link.hh, * scribo/scribo/primitive/link/with_single_left_link.hh, * scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh, * scribo/scribo/primitive/link/with_single_right_link.hh, * scribo/scribo/primitive/link/with_single_right_link_bottom.hh, * scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh, * scribo/scribo/primitive/link/with_single_right_link_top.hh, * scribo/scribo/primitive/link/with_single_up_link.hh, * scribo/scribo/primitive/regroup/from_single_left_link.hh, * scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, * scribo/scribo/primitive/remove/separators.hh, * scribo/scribo/subsampling/bilinear.hh, * scribo/scribo/subsampling/integral.hh, * scribo/scribo/subsampling/integral_single_image.hh, * scribo/scribo/table/align_lines_horizontaly.hh, * scribo/scribo/table/align_lines_verticaly.hh, * scribo/scribo/table/all.hh, * scribo/scribo/table/connect_horizontal_lines.hh, * scribo/scribo/table/connect_vertical_lines.hh, * scribo/scribo/table/erase.hh, * scribo/scribo/table/extract.hh, * scribo/scribo/table/internal/align_lines.hh, * scribo/scribo/table/internal/all.hh, * scribo/scribo/table/internal/connect_lines.hh, * scribo/scribo/table/internal/repair_lines.hh, * scribo/scribo/table/rebuild.hh, * scribo/scribo/table/repair_horizontal_lines.hh, * scribo/scribo/table/repair_vertical_lines.hh, * scribo/scribo/text/all.hh, * scribo/scribo/text/clean.hh, * scribo/scribo/text/clean_inplace.hh, * scribo/scribo/text/extract_lines.hh, * scribo/scribo/text/look_like_text_lines.hh, * scribo/scribo/text/merging.hh, * scribo/scribo/text/recognition.hh, * scribo/scribo/toolchain/nepomuk/text_extraction.hh, * scribo/scribo/toolchain/text_in_doc.hh, * scribo/scribo/upsampling/bs2x.hh, * scribo/scribo/upsampling/eagle.hh: ... here. --- scribo/ChangeLog | 400 ++++++++++++++++++++ scribo/{ => scribo}/all.hh | 0 scribo/{ => scribo}/binarization/all.hh | 0 .../{ => scribo}/binarization/global_threshold.hh | 0 .../binarization/global_threshold_auto.hh | 0 .../binarization/internal/first_pass_functor.hh | 0 .../{ => scribo}/binarization/local_threshold.hh | 0 scribo/{ => scribo}/binarization/sauvola.hh | 0 scribo/{ => scribo}/binarization/sauvola_ms.hh | 0 .../{ => scribo}/binarization/sauvola_ms_split.hh | 0 .../binarization/sauvola_threshold_image.hh | 0 .../binarization/sauvola_threshold_image_debug.hh | 0 scribo/{ => scribo}/canvas/integral_browsing.hh | 0 scribo/{ => scribo}/convert/from_qimage.hh | 0 scribo/{ => scribo}/core/all.hh | 0 scribo/{ => scribo}/core/central_sites.hh | 0 scribo/{ => scribo}/core/component_info.hh | 0 scribo/{ => scribo}/core/component_set.hh | 0 scribo/{ => scribo}/core/concept/dmax_functor.hh | 0 scribo/{ => scribo}/core/concept/link_functor.hh | 0 scribo/{ => scribo}/core/def/lbl_type.hh | 0 scribo/{ => scribo}/core/erase_objects.hh | 0 scribo/{ => scribo}/core/init_integral_image.hh | 0 scribo/{ => scribo}/core/line_info.hh | 0 scribo/{ => scribo}/core/line_set.hh | 0 scribo/{ => scribo}/core/macros.hh | 0 scribo/{ => scribo}/core/object_groups.hh | 0 scribo/{ => scribo}/core/object_links.hh | 0 scribo/{ => scribo}/core/tag/anchor.hh | 0 scribo/{ => scribo}/core/tag/component.hh | 0 scribo/{ => scribo}/core/tag/line.hh | 0 .../{ => scribo}/debug/alignment_decision_image.hh | 0 scribo/{ => scribo}/debug/all.hh | 0 scribo/{ => scribo}/debug/bboxes_enlarged_image.hh | 0 scribo/{ => scribo}/debug/char_space_image.hh | 0 scribo/{ => scribo}/debug/decision_image.hh | 0 scribo/{ => scribo}/debug/highlight_text_area.hh | 0 scribo/{ => scribo}/debug/line_info_image.hh | 0 scribo/{ => scribo}/debug/links_decision_image.hh | 0 .../debug/looks_like_a_text_line_image.hh | 0 .../debug/mean_and_base_lines_image.hh | 0 scribo/{ => scribo}/debug/save_bboxes_image.hh | 0 scribo/{ => scribo}/debug/save_comp_diff.hh | 0 scribo/{ => scribo}/debug/save_label_image.hh | 0 .../{ => scribo}/debug/save_linked_bboxes_image.hh | 0 scribo/{ => scribo}/debug/save_table_image.hh | 0 .../debug/several_links_decision_image.hh | 0 scribo/{ => scribo}/debug/text_areas_image.hh | 0 scribo/{ => scribo}/debug/usage.hh | 0 scribo/{ => scribo}/draw/all.hh | 0 scribo/{ => scribo}/draw/bounding_box_links.hh | 0 scribo/{ => scribo}/draw/bounding_boxes.hh | 0 scribo/{ => scribo}/draw/groups_bboxes.hh | 0 .../estim/object_groups_v_thickness.hh | 0 scribo/{ => scribo}/filter/all.hh | 0 scribo/{ => scribo}/filter/common/objects_photo.hh | 0 .../filter/internal/alignment_angle.hh | 0 .../filter/internal/component_aligned.hh | 0 scribo/{ => scribo}/filter/internal/compute.hh | 0 .../filter/object_groups_size_ratio.hh | 0 scribo/{ => scribo}/filter/object_groups_small.hh | 0 .../filter/object_groups_v_thickness.hh | 0 .../filter/object_groups_with_holes.hh | 0 .../filter/object_links_bbox_h_ratio.hh | 0 .../filter/object_links_bbox_overlap.hh | 0 .../{ => scribo}/filter/object_links_bbox_ratio.hh | 0 .../filter/object_links_bbox_w_ratio.hh | 0 .../filter/object_links_bottom_aligned.hh | 0 .../filter/object_links_center_aligned.hh | 0 .../filter/object_links_left_aligned.hh | 0 .../filter/object_links_non_aligned_simple.hh | 0 .../filter/object_links_right_aligned.hh | 0 .../filter/object_links_top_aligned.hh | 0 scribo/{ => scribo}/filter/objects_h_thick.hh | 0 scribo/{ => scribo}/filter/objects_h_thin.hh | 0 scribo/{ => scribo}/filter/objects_large.hh | 0 scribo/{ => scribo}/filter/objects_size_ratio.hh | 0 scribo/{ => scribo}/filter/objects_small.hh | 0 scribo/{ => scribo}/filter/objects_thick.hh | 0 scribo/{ => scribo}/filter/objects_thin.hh | 0 scribo/{ => scribo}/filter/objects_v_thick.hh | 0 scribo/{ => scribo}/filter/objects_v_thin.hh | 0 scribo/{ => scribo}/filter/objects_with_holes.hh | 0 scribo/{ => scribo}/fun/v2b/label_to_bool.hh | 0 .../{ => scribo}/fun/v2b/objects_large_filter.hh | 0 .../{ => scribo}/fun/v2b/objects_small_filter.hh | 0 scribo/{ => scribo}/io/text_boxes/save.hh | 0 scribo/{ => scribo}/io/xml/save.hh | 0 scribo/{ => scribo}/make/all.hh | 0 scribo/{ => scribo}/make/debug_filename.hh | 0 scribo/{ => scribo}/make/influence_zone_graph.hh | 0 scribo/{ => scribo}/postprocessing/all.hh | 0 .../postprocessing/fill_object_holes.hh | 0 scribo/{ => scribo}/preprocessing/all.hh | 0 scribo/{ => scribo}/preprocessing/crop.hh | 0 .../preprocessing/crop_without_localization.hh | 0 scribo/{ => scribo}/preprocessing/denoise.hh | 0 scribo/{ => scribo}/preprocessing/denoise_bg.hh | 0 scribo/{ => scribo}/preprocessing/denoise_fg.hh | 0 scribo/{ => scribo}/preprocessing/deskew.hh | 0 scribo/{ => scribo}/preprocessing/deskew_crop.hh | 0 .../preprocessing/homogeneous_contrast.hh | 0 scribo/{ => scribo}/preprocessing/rotate_90.hh | 0 scribo/{ => scribo}/preprocessing/split_bg_fg.hh | 0 scribo/{ => scribo}/primitive/all.hh | 0 scribo/{ => scribo}/primitive/extract/all.hh | 0 scribo/{ => scribo}/primitive/extract/canvas.hh | 0 scribo/{ => scribo}/primitive/extract/cells.hh | 0 .../{ => scribo}/primitive/extract/components.hh | 0 .../primitive/extract/horizontal_separators.hh | 0 .../primitive/extract/lines_discontinued.hh | 0 .../primitive/extract/lines_h_discontinued.hh | 0 .../primitive/extract/lines_h_pattern.hh | 0 .../primitive/extract/lines_h_single.hh | 0 .../primitive/extract/lines_h_thick.hh | 0 .../primitive/extract/lines_h_thick_and_single.hh | 0 .../primitive/extract/lines_pattern.hh | 0 .../{ => scribo}/primitive/extract/lines_thick.hh | 0 .../primitive/extract/lines_v_discontinued.hh | 0 .../primitive/extract/lines_v_pattern.hh | 0 .../primitive/extract/lines_v_single.hh | 0 .../primitive/extract/lines_v_thick.hh | 0 .../primitive/extract/lines_v_thick_and_single.hh | 0 .../{ => scribo}/primitive/extract/separators.hh | 0 .../primitive/extract/vertical_separators.hh | 0 scribo/{ => scribo}/primitive/group/all.hh | 0 scribo/{ => scribo}/primitive/group/apply.hh | 0 .../primitive/group/from_double_link.hh | 0 scribo/{ => scribo}/primitive/group/from_graph.hh | 0 .../primitive/group/from_single_link.hh | 0 scribo/{ => scribo}/primitive/internal/all.hh | 0 .../primitive/internal/find_graph_link.hh | 0 .../{ => scribo}/primitive/internal/find_root.hh | 0 .../primitive/internal/have_link_valid.hh | 0 .../primitive/internal/is_link_valid.hh | 0 scribo/{ => scribo}/primitive/internal/rd.hh | 0 .../primitive/internal/update_graph_link.hh | 0 scribo/{ => scribo}/primitive/link/all.hh | 0 scribo/{ => scribo}/primitive/link/compute.hh | 0 .../{ => scribo}/primitive/link/compute_several.hh | 0 .../primitive/link/internal/compute_anchor.hh | 0 .../primitive/link/internal/dmax_default.hh | 0 .../primitive/link/internal/dmax_functor_base.hh | 0 .../link/internal/dmax_width_and_height.hh | 0 .../primitive/link/internal/dmax_width_only.hh | 0 .../primitive/link/internal/find_link.hh | 0 .../primitive/link/internal/find_several_links.hh | 0 .../primitive/link/internal/link_functor_base.hh | 0 .../link/internal/link_several_dmax_base.hh | 0 .../link/internal/link_single_dmax_base.hh | 0 .../link/internal/link_single_dmax_ratio_base.hh | 0 .../primitive/link/merge_double_link.hh | 0 scribo/{ => scribo}/primitive/link/with_graph.hh | 0 scribo/{ => scribo}/primitive/link/with_rag.hh | 0 .../primitive/link/with_several_graphes.hh | 0 .../primitive/link/with_several_left_links.hh | 0 .../link/with_several_right_closest_links.hh | 0 .../primitive/link/with_several_right_links.hh | 0 .../link/with_several_right_links_overlap.hh | 0 .../primitive/link/with_single_down_link.hh | 0 .../primitive/link/with_single_left_link.hh | 0 .../link/with_single_left_link_dmax_ratio.hh | 0 .../primitive/link/with_single_right_link.hh | 0 .../link/with_single_right_link_bottom.hh | 0 .../link/with_single_right_link_dmax_ratio.hh | 0 .../primitive/link/with_single_right_link_top.hh | 0 .../primitive/link/with_single_up_link.hh | 0 .../primitive/regroup/from_single_left_link.hh | 0 .../regroup/from_single_left_link_wrt_h_ratio.hh | 0 scribo/{ => scribo}/primitive/remove/separators.hh | 0 scribo/{ => scribo}/subsampling/bilinear.hh | 0 scribo/{ => scribo}/subsampling/integral.hh | 0 .../subsampling/integral_single_image.hh | 0 .../{ => scribo}/table/align_lines_horizontaly.hh | 0 scribo/{ => scribo}/table/align_lines_verticaly.hh | 0 scribo/{ => scribo}/table/all.hh | 0 .../{ => scribo}/table/connect_horizontal_lines.hh | 0 .../{ => scribo}/table/connect_vertical_lines.hh | 0 scribo/{ => scribo}/table/erase.hh | 0 scribo/{ => scribo}/table/extract.hh | 0 scribo/{ => scribo}/table/internal/align_lines.hh | 0 scribo/{ => scribo}/table/internal/all.hh | 0 .../{ => scribo}/table/internal/connect_lines.hh | 0 scribo/{ => scribo}/table/internal/repair_lines.hh | 0 scribo/{ => scribo}/table/rebuild.hh | 0 .../{ => scribo}/table/repair_horizontal_lines.hh | 0 scribo/{ => scribo}/table/repair_vertical_lines.hh | 0 scribo/{ => scribo}/text/all.hh | 0 scribo/{ => scribo}/text/clean.hh | 0 scribo/{ => scribo}/text/clean_inplace.hh | 0 scribo/{ => scribo}/text/extract_lines.hh | 0 scribo/{ => scribo}/text/look_like_text_lines.hh | 0 scribo/{ => scribo}/text/merging.hh | 0 scribo/{ => scribo}/text/recognition.hh | 0 .../toolchain/nepomuk/text_extraction.hh | 0 scribo/{ => scribo}/toolchain/text_in_doc.hh | 0 scribo/{ => scribo}/upsampling/bs2x.hh | 0 scribo/{ => scribo}/upsampling/eagle.hh | 0 198 files changed, 400 insertions(+), 0 deletions(-) rename scribo/{ => scribo}/all.hh (100%) rename scribo/{ => scribo}/binarization/all.hh (100%) rename scribo/{ => scribo}/binarization/global_threshold.hh (100%) rename scribo/{ => scribo}/binarization/global_threshold_auto.hh (100%) rename scribo/{ => scribo}/binarization/internal/first_pass_functor.hh (100%) rename scribo/{ => scribo}/binarization/local_threshold.hh (100%) rename scribo/{ => scribo}/binarization/sauvola.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_ms.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_ms_split.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_threshold_image.hh (100%) rename scribo/{ => scribo}/binarization/sauvola_threshold_image_debug.hh (100%) rename scribo/{ => scribo}/canvas/integral_browsing.hh (100%) rename scribo/{ => scribo}/convert/from_qimage.hh (100%) rename scribo/{ => scribo}/core/all.hh (100%) rename scribo/{ => scribo}/core/central_sites.hh (100%) rename scribo/{ => scribo}/core/component_info.hh (100%) rename scribo/{ => scribo}/core/component_set.hh (100%) rename scribo/{ => scribo}/core/concept/dmax_functor.hh (100%) rename scribo/{ => scribo}/core/concept/link_functor.hh (100%) rename scribo/{ => scribo}/core/def/lbl_type.hh (100%) rename scribo/{ => scribo}/core/erase_objects.hh (100%) rename scribo/{ => scribo}/core/init_integral_image.hh (100%) rename scribo/{ => scribo}/core/line_info.hh (100%) rename scribo/{ => scribo}/core/line_set.hh (100%) rename scribo/{ => scribo}/core/macros.hh (100%) rename scribo/{ => scribo}/core/object_groups.hh (100%) rename scribo/{ => scribo}/core/object_links.hh (100%) rename scribo/{ => scribo}/core/tag/anchor.hh (100%) rename scribo/{ => scribo}/core/tag/component.hh (100%) rename scribo/{ => scribo}/core/tag/line.hh (100%) rename scribo/{ => scribo}/debug/alignment_decision_image.hh (100%) rename scribo/{ => scribo}/debug/all.hh (100%) rename scribo/{ => scribo}/debug/bboxes_enlarged_image.hh (100%) rename scribo/{ => scribo}/debug/char_space_image.hh (100%) rename scribo/{ => scribo}/debug/decision_image.hh (100%) rename scribo/{ => scribo}/debug/highlight_text_area.hh (100%) rename scribo/{ => scribo}/debug/line_info_image.hh (100%) rename scribo/{ => scribo}/debug/links_decision_image.hh (100%) rename scribo/{ => scribo}/debug/looks_like_a_text_line_image.hh (100%) rename scribo/{ => scribo}/debug/mean_and_base_lines_image.hh (100%) rename scribo/{ => scribo}/debug/save_bboxes_image.hh (100%) rename scribo/{ => scribo}/debug/save_comp_diff.hh (100%) rename scribo/{ => scribo}/debug/save_label_image.hh (100%) rename scribo/{ => scribo}/debug/save_linked_bboxes_image.hh (100%) rename scribo/{ => scribo}/debug/save_table_image.hh (100%) rename scribo/{ => scribo}/debug/several_links_decision_image.hh (100%) rename scribo/{ => scribo}/debug/text_areas_image.hh (100%) rename scribo/{ => scribo}/debug/usage.hh (100%) rename scribo/{ => scribo}/draw/all.hh (100%) rename scribo/{ => scribo}/draw/bounding_box_links.hh (100%) rename scribo/{ => scribo}/draw/bounding_boxes.hh (100%) rename scribo/{ => scribo}/draw/groups_bboxes.hh (100%) rename scribo/{ => scribo}/estim/object_groups_v_thickness.hh (100%) rename scribo/{ => scribo}/filter/all.hh (100%) rename scribo/{ => scribo}/filter/common/objects_photo.hh (100%) rename scribo/{ => scribo}/filter/internal/alignment_angle.hh (100%) rename scribo/{ => scribo}/filter/internal/component_aligned.hh (100%) rename scribo/{ => scribo}/filter/internal/compute.hh (100%) rename scribo/{ => scribo}/filter/object_groups_size_ratio.hh (100%) rename scribo/{ => scribo}/filter/object_groups_small.hh (100%) rename scribo/{ => scribo}/filter/object_groups_v_thickness.hh (100%) rename scribo/{ => scribo}/filter/object_groups_with_holes.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_h_ratio.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_overlap.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_ratio.hh (100%) rename scribo/{ => scribo}/filter/object_links_bbox_w_ratio.hh (100%) rename scribo/{ => scribo}/filter/object_links_bottom_aligned.hh (100%) rename scribo/{ => scribo}/filter/object_links_center_aligned.hh (100%) rename scribo/{ => scribo}/filter/object_links_left_aligned.hh (100%) rename scribo/{ => scribo}/filter/object_links_non_aligned_simple.hh (100%) rename scribo/{ => scribo}/filter/object_links_right_aligned.hh (100%) rename scribo/{ => scribo}/filter/object_links_top_aligned.hh (100%) rename scribo/{ => scribo}/filter/objects_h_thick.hh (100%) rename scribo/{ => scribo}/filter/objects_h_thin.hh (100%) rename scribo/{ => scribo}/filter/objects_large.hh (100%) rename scribo/{ => scribo}/filter/objects_size_ratio.hh (100%) rename scribo/{ => scribo}/filter/objects_small.hh (100%) rename scribo/{ => scribo}/filter/objects_thick.hh (100%) rename scribo/{ => scribo}/filter/objects_thin.hh (100%) rename scribo/{ => scribo}/filter/objects_v_thick.hh (100%) rename scribo/{ => scribo}/filter/objects_v_thin.hh (100%) rename scribo/{ => scribo}/filter/objects_with_holes.hh (100%) rename scribo/{ => scribo}/fun/v2b/label_to_bool.hh (100%) rename scribo/{ => scribo}/fun/v2b/objects_large_filter.hh (100%) rename scribo/{ => scribo}/fun/v2b/objects_small_filter.hh (100%) rename scribo/{ => scribo}/io/text_boxes/save.hh (100%) rename scribo/{ => scribo}/io/xml/save.hh (100%) rename scribo/{ => scribo}/make/all.hh (100%) rename scribo/{ => scribo}/make/debug_filename.hh (100%) rename scribo/{ => scribo}/make/influence_zone_graph.hh (100%) rename scribo/{ => scribo}/postprocessing/all.hh (100%) rename scribo/{ => scribo}/postprocessing/fill_object_holes.hh (100%) rename scribo/{ => scribo}/preprocessing/all.hh (100%) rename scribo/{ => scribo}/preprocessing/crop.hh (100%) rename scribo/{ => scribo}/preprocessing/crop_without_localization.hh (100%) rename scribo/{ => scribo}/preprocessing/denoise.hh (100%) rename scribo/{ => scribo}/preprocessing/denoise_bg.hh (100%) rename scribo/{ => scribo}/preprocessing/denoise_fg.hh (100%) rename scribo/{ => scribo}/preprocessing/deskew.hh (100%) rename scribo/{ => scribo}/preprocessing/deskew_crop.hh (100%) rename scribo/{ => scribo}/preprocessing/homogeneous_contrast.hh (100%) rename scribo/{ => scribo}/preprocessing/rotate_90.hh (100%) rename scribo/{ => scribo}/preprocessing/split_bg_fg.hh (100%) rename scribo/{ => scribo}/primitive/all.hh (100%) rename scribo/{ => scribo}/primitive/extract/all.hh (100%) rename scribo/{ => scribo}/primitive/extract/canvas.hh (100%) rename scribo/{ => scribo}/primitive/extract/cells.hh (100%) rename scribo/{ => scribo}/primitive/extract/components.hh (100%) rename scribo/{ => scribo}/primitive/extract/horizontal_separators.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_pattern.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_single.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_thick.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_h_thick_and_single.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_pattern.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_thick.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_discontinued.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_pattern.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_single.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_thick.hh (100%) rename scribo/{ => scribo}/primitive/extract/lines_v_thick_and_single.hh (100%) rename scribo/{ => scribo}/primitive/extract/separators.hh (100%) rename scribo/{ => scribo}/primitive/extract/vertical_separators.hh (100%) rename scribo/{ => scribo}/primitive/group/all.hh (100%) rename scribo/{ => scribo}/primitive/group/apply.hh (100%) rename scribo/{ => scribo}/primitive/group/from_double_link.hh (100%) rename scribo/{ => scribo}/primitive/group/from_graph.hh (100%) rename scribo/{ => scribo}/primitive/group/from_single_link.hh (100%) rename scribo/{ => scribo}/primitive/internal/all.hh (100%) rename scribo/{ => scribo}/primitive/internal/find_graph_link.hh (100%) rename scribo/{ => scribo}/primitive/internal/find_root.hh (100%) rename scribo/{ => scribo}/primitive/internal/have_link_valid.hh (100%) rename scribo/{ => scribo}/primitive/internal/is_link_valid.hh (100%) rename scribo/{ => scribo}/primitive/internal/rd.hh (100%) rename scribo/{ => scribo}/primitive/internal/update_graph_link.hh (100%) rename scribo/{ => scribo}/primitive/link/all.hh (100%) rename scribo/{ => scribo}/primitive/link/compute.hh (100%) rename scribo/{ => scribo}/primitive/link/compute_several.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/compute_anchor.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/dmax_default.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/dmax_functor_base.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/dmax_width_and_height.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/dmax_width_only.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/find_link.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/find_several_links.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/link_functor_base.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/link_several_dmax_base.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/link_single_dmax_base.hh (100%) rename scribo/{ => scribo}/primitive/link/internal/link_single_dmax_ratio_base.hh (100%) rename scribo/{ => scribo}/primitive/link/merge_double_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_graph.hh (100%) rename scribo/{ => scribo}/primitive/link/with_rag.hh (100%) rename scribo/{ => scribo}/primitive/link/with_several_graphes.hh (100%) rename scribo/{ => scribo}/primitive/link/with_several_left_links.hh (100%) rename scribo/{ => scribo}/primitive/link/with_several_right_closest_links.hh (100%) rename scribo/{ => scribo}/primitive/link/with_several_right_links.hh (100%) rename scribo/{ => scribo}/primitive/link/with_several_right_links_overlap.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_down_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_left_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_left_link_dmax_ratio.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_bottom.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_dmax_ratio.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_right_link_top.hh (100%) rename scribo/{ => scribo}/primitive/link/with_single_up_link.hh (100%) rename scribo/{ => scribo}/primitive/regroup/from_single_left_link.hh (100%) rename scribo/{ => scribo}/primitive/regroup/from_single_left_link_wrt_h_ratio.hh (100%) rename scribo/{ => scribo}/primitive/remove/separators.hh (100%) rename scribo/{ => scribo}/subsampling/bilinear.hh (100%) rename scribo/{ => scribo}/subsampling/integral.hh (100%) rename scribo/{ => scribo}/subsampling/integral_single_image.hh (100%) rename scribo/{ => scribo}/table/align_lines_horizontaly.hh (100%) rename scribo/{ => scribo}/table/align_lines_verticaly.hh (100%) rename scribo/{ => scribo}/table/all.hh (100%) rename scribo/{ => scribo}/table/connect_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/connect_vertical_lines.hh (100%) rename scribo/{ => scribo}/table/erase.hh (100%) rename scribo/{ => scribo}/table/extract.hh (100%) rename scribo/{ => scribo}/table/internal/align_lines.hh (100%) rename scribo/{ => scribo}/table/internal/all.hh (100%) rename scribo/{ => scribo}/table/internal/connect_lines.hh (100%) rename scribo/{ => scribo}/table/internal/repair_lines.hh (100%) rename scribo/{ => scribo}/table/rebuild.hh (100%) rename scribo/{ => scribo}/table/repair_horizontal_lines.hh (100%) rename scribo/{ => scribo}/table/repair_vertical_lines.hh (100%) rename scribo/{ => scribo}/text/all.hh (100%) rename scribo/{ => scribo}/text/clean.hh (100%) rename scribo/{ => scribo}/text/clean_inplace.hh (100%) rename scribo/{ => scribo}/text/extract_lines.hh (100%) rename scribo/{ => scribo}/text/look_like_text_lines.hh (100%) rename scribo/{ => scribo}/text/merging.hh (100%) rename scribo/{ => scribo}/text/recognition.hh (100%) rename scribo/{ => scribo}/toolchain/nepomuk/text_extraction.hh (100%) rename scribo/{ => scribo}/toolchain/text_in_doc.hh (100%) rename scribo/{ => scribo}/upsampling/bs2x.hh (100%) rename scribo/{ => scribo}/upsampling/eagle.hh (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ddd39df..cd86691 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,405 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Move Scribo includes in a specific directory. + + * scribo/all.hh, + * scribo/binarization/all.hh, + * scribo/binarization/global_threshold.hh, + * scribo/binarization/global_threshold_auto.hh, + * scribo/binarization/internal/first_pass_functor.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, + * scribo/core/central_sites.hh, + * scribo/core/component_info.hh, + * 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/erase_objects.hh, + * scribo/core/init_integral_image.hh, + * scribo/core/line_info.hh, + * scribo/core/line_set.hh, + * scribo/core/macros.hh, + * scribo/core/object_groups.hh, + * scribo/core/object_links.hh, + * scribo/core/tag/anchor.hh, + * scribo/core/tag/component.hh, + * scribo/core/tag/line.hh, + * scribo/debug/alignment_decision_image.hh, + * scribo/debug/all.hh, + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/char_space_image.hh, + * scribo/debug/decision_image.hh, + * scribo/debug/highlight_text_area.hh, + * scribo/debug/line_info_image.hh, + * scribo/debug/links_decision_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_bboxes_image.hh, + * scribo/debug/save_comp_diff.hh, + * scribo/debug/save_label_image.hh, + * scribo/debug/save_linked_bboxes_image.hh, + * scribo/debug/save_table_image.hh, + * scribo/debug/several_links_decision_image.hh, + * scribo/debug/text_areas_image.hh, + * scribo/debug/usage.hh, + * scribo/draw/all.hh, + * scribo/draw/bounding_box_links.hh, + * scribo/draw/bounding_boxes.hh, + * scribo/draw/groups_bboxes.hh, + * scribo/estim/object_groups_v_thickness.hh, + * scribo/filter/all.hh, + * scribo/filter/common/objects_photo.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/filter/internal/component_aligned.hh, + * scribo/filter/internal/compute.hh, + * scribo/filter/object_groups_size_ratio.hh, + * scribo/filter/object_groups_small.hh, + * scribo/filter/object_groups_v_thickness.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/object_links_bbox_h_ratio.hh, + * scribo/filter/object_links_bbox_overlap.hh, + * scribo/filter/object_links_bbox_ratio.hh, + * scribo/filter/object_links_bbox_w_ratio.hh, + * scribo/filter/object_links_bottom_aligned.hh, + * scribo/filter/object_links_center_aligned.hh, + * scribo/filter/object_links_left_aligned.hh, + * scribo/filter/object_links_non_aligned_simple.hh, + * scribo/filter/object_links_right_aligned.hh, + * scribo/filter/object_links_top_aligned.hh, + * scribo/filter/objects_h_thick.hh, + * scribo/filter/objects_h_thin.hh, + * scribo/filter/objects_large.hh, + * scribo/filter/objects_size_ratio.hh, + * scribo/filter/objects_small.hh, + * scribo/filter/objects_thick.hh, + * scribo/filter/objects_thin.hh, + * scribo/filter/objects_v_thick.hh, + * scribo/filter/objects_v_thin.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/fun/v2b/label_to_bool.hh, + * scribo/fun/v2b/objects_large_filter.hh, + * scribo/fun/v2b/objects_small_filter.hh, + * scribo/io/text_boxes/save.hh, + * scribo/io/xml/save.hh, + * scribo/make/all.hh, + * scribo/make/debug_filename.hh, + * scribo/make/influence_zone_graph.hh, + * scribo/postprocessing/all.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/preprocessing/all.hh, + * scribo/preprocessing/crop.hh, + * scribo/preprocessing/crop_without_localization.hh, + * scribo/preprocessing/denoise.hh, + * scribo/preprocessing/denoise_bg.hh, + * scribo/preprocessing/denoise_fg.hh, + * scribo/preprocessing/deskew.hh, + * scribo/preprocessing/deskew_crop.hh, + * scribo/preprocessing/homogeneous_contrast.hh, + * scribo/preprocessing/rotate_90.hh, + * scribo/preprocessing/split_bg_fg.hh, + * scribo/primitive/all.hh, + * scribo/primitive/extract/all.hh, + * scribo/primitive/extract/canvas.hh, + * scribo/primitive/extract/cells.hh, + * scribo/primitive/extract/components.hh, + * scribo/primitive/extract/horizontal_separators.hh, + * scribo/primitive/extract/lines_discontinued.hh, + * scribo/primitive/extract/lines_h_discontinued.hh, + * scribo/primitive/extract/lines_h_pattern.hh, + * scribo/primitive/extract/lines_h_single.hh, + * scribo/primitive/extract/lines_h_thick.hh, + * scribo/primitive/extract/lines_h_thick_and_single.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/primitive/extract/lines_thick.hh, + * scribo/primitive/extract/lines_v_discontinued.hh, + * scribo/primitive/extract/lines_v_pattern.hh, + * 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/vertical_separators.hh, + * scribo/primitive/group/all.hh, + * scribo/primitive/group/apply.hh, + * scribo/primitive/group/from_double_link.hh, + * scribo/primitive/group/from_graph.hh, + * scribo/primitive/group/from_single_link.hh, + * scribo/primitive/internal/all.hh, + * scribo/primitive/internal/find_graph_link.hh, + * scribo/primitive/internal/find_root.hh, + * scribo/primitive/internal/have_link_valid.hh, + * scribo/primitive/internal/is_link_valid.hh, + * scribo/primitive/internal/rd.hh, + * scribo/primitive/internal/update_graph_link.hh, + * scribo/primitive/link/all.hh, + * scribo/primitive/link/compute.hh, + * scribo/primitive/link/compute_several.hh, + * scribo/primitive/link/internal/compute_anchor.hh, + * scribo/primitive/link/internal/dmax_default.hh, + * scribo/primitive/link/internal/dmax_functor_base.hh, + * scribo/primitive/link/internal/dmax_width_and_height.hh, + * scribo/primitive/link/internal/dmax_width_only.hh, + * scribo/primitive/link/internal/find_link.hh, + * scribo/primitive/link/internal/find_several_links.hh, + * scribo/primitive/link/internal/link_functor_base.hh, + * scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_ratio_base.hh, + * scribo/primitive/link/merge_double_link.hh, + * scribo/primitive/link/with_graph.hh, + * scribo/primitive/link/with_rag.hh, + * scribo/primitive/link/with_several_graphes.hh, + * scribo/primitive/link/with_several_left_links.hh, + * scribo/primitive/link/with_several_right_closest_links.hh, + * scribo/primitive/link/with_several_right_links.hh, + * scribo/primitive/link/with_several_right_links_overlap.hh, + * scribo/primitive/link/with_single_down_link.hh, + * scribo/primitive/link/with_single_left_link.hh, + * 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_top.hh, + * scribo/primitive/link/with_single_up_link.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, + * scribo/subsampling/bilinear.hh, + * scribo/subsampling/integral.hh, + * scribo/subsampling/integral_single_image.hh, + * scribo/table/align_lines_horizontaly.hh, + * scribo/table/align_lines_verticaly.hh, + * scribo/table/all.hh, + * scribo/table/connect_horizontal_lines.hh, + * scribo/table/connect_vertical_lines.hh, + * scribo/table/erase.hh, + * scribo/table/extract.hh, + * scribo/table/internal/align_lines.hh, + * scribo/table/internal/all.hh, + * scribo/table/internal/connect_lines.hh, + * scribo/table/internal/repair_lines.hh, + * scribo/table/rebuild.hh, + * scribo/table/repair_horizontal_lines.hh, + * scribo/table/repair_vertical_lines.hh, + * scribo/text/all.hh, + * scribo/text/clean.hh, + * scribo/text/clean_inplace.hh, + * scribo/text/extract_lines.hh, + * scribo/text/look_like_text_lines.hh, + * scribo/text/merging.hh, + * scribo/text/recognition.hh, + * scribo/toolchain/nepomuk/text_extraction.hh, + * scribo/toolchain/text_in_doc.hh, + * scribo/upsampling/bs2x.hh, + * scribo/upsampling/eagle.hh: Move... + + * scribo/scribo/all.hh, + * scribo/scribo/binarization/all.hh, + * scribo/scribo/binarization/global_threshold.hh, + * scribo/scribo/binarization/global_threshold_auto.hh, + * scribo/scribo/binarization/internal/first_pass_functor.hh, + * scribo/scribo/binarization/local_threshold.hh, + * scribo/scribo/binarization/sauvola.hh, + * scribo/scribo/binarization/sauvola_ms.hh, + * scribo/scribo/binarization/sauvola_ms_split.hh, + * scribo/scribo/binarization/sauvola_threshold_image.hh, + * scribo/scribo/binarization/sauvola_threshold_image_debug.hh, + * scribo/scribo/canvas/integral_browsing.hh, + * scribo/scribo/convert/from_qimage.hh, + * scribo/scribo/core/all.hh, + * scribo/scribo/core/central_sites.hh, + * scribo/scribo/core/component_info.hh, + * scribo/scribo/core/component_set.hh, + * scribo/scribo/core/concept/dmax_functor.hh, + * scribo/scribo/core/concept/link_functor.hh, + * scribo/scribo/core/def/lbl_type.hh, + * scribo/scribo/core/erase_objects.hh, + * scribo/scribo/core/init_integral_image.hh, + * scribo/scribo/core/line_info.hh, + * scribo/scribo/core/line_set.hh, + * scribo/scribo/core/macros.hh, + * scribo/scribo/core/object_groups.hh, + * scribo/scribo/core/object_links.hh, + * scribo/scribo/core/tag/anchor.hh, + * scribo/scribo/core/tag/component.hh, + * scribo/scribo/core/tag/line.hh, + * scribo/scribo/debug/alignment_decision_image.hh, + * scribo/scribo/debug/all.hh, + * scribo/scribo/debug/bboxes_enlarged_image.hh, + * scribo/scribo/debug/char_space_image.hh, + * scribo/scribo/debug/decision_image.hh, + * scribo/scribo/debug/highlight_text_area.hh, + * scribo/scribo/debug/line_info_image.hh, + * scribo/scribo/debug/links_decision_image.hh, + * scribo/scribo/debug/looks_like_a_text_line_image.hh, + * scribo/scribo/debug/mean_and_base_lines_image.hh, + * scribo/scribo/debug/save_bboxes_image.hh, + * scribo/scribo/debug/save_comp_diff.hh, + * scribo/scribo/debug/save_label_image.hh, + * scribo/scribo/debug/save_linked_bboxes_image.hh, + * scribo/scribo/debug/save_table_image.hh, + * scribo/scribo/debug/several_links_decision_image.hh, + * scribo/scribo/debug/text_areas_image.hh, + * scribo/scribo/debug/usage.hh, + * scribo/scribo/draw/all.hh, + * scribo/scribo/draw/bounding_box_links.hh, + * scribo/scribo/draw/bounding_boxes.hh, + * scribo/scribo/draw/groups_bboxes.hh, + * scribo/scribo/estim/object_groups_v_thickness.hh, + * scribo/scribo/filter/all.hh, + * scribo/scribo/filter/common/objects_photo.hh, + * scribo/scribo/filter/internal/alignment_angle.hh, + * scribo/scribo/filter/internal/component_aligned.hh, + * scribo/scribo/filter/internal/compute.hh, + * scribo/scribo/filter/object_groups_size_ratio.hh, + * scribo/scribo/filter/object_groups_small.hh, + * scribo/scribo/filter/object_groups_v_thickness.hh, + * scribo/scribo/filter/object_groups_with_holes.hh, + * scribo/scribo/filter/object_links_bbox_h_ratio.hh, + * scribo/scribo/filter/object_links_bbox_overlap.hh, + * scribo/scribo/filter/object_links_bbox_ratio.hh, + * scribo/scribo/filter/object_links_bbox_w_ratio.hh, + * scribo/scribo/filter/object_links_bottom_aligned.hh, + * scribo/scribo/filter/object_links_center_aligned.hh, + * scribo/scribo/filter/object_links_left_aligned.hh, + * scribo/scribo/filter/object_links_non_aligned_simple.hh, + * scribo/scribo/filter/object_links_right_aligned.hh, + * scribo/scribo/filter/object_links_top_aligned.hh, + * scribo/scribo/filter/objects_h_thick.hh, + * scribo/scribo/filter/objects_h_thin.hh, + * scribo/scribo/filter/objects_large.hh, + * scribo/scribo/filter/objects_size_ratio.hh, + * scribo/scribo/filter/objects_small.hh, + * scribo/scribo/filter/objects_thick.hh, + * scribo/scribo/filter/objects_thin.hh, + * scribo/scribo/filter/objects_v_thick.hh, + * scribo/scribo/filter/objects_v_thin.hh, + * scribo/scribo/filter/objects_with_holes.hh, + * scribo/scribo/fun/v2b/label_to_bool.hh, + * scribo/scribo/fun/v2b/objects_large_filter.hh, + * scribo/scribo/fun/v2b/objects_small_filter.hh, + * scribo/scribo/io/text_boxes/save.hh, + * scribo/scribo/io/xml/save.hh, + * scribo/scribo/make/all.hh, + * scribo/scribo/make/debug_filename.hh, + * scribo/scribo/make/influence_zone_graph.hh, + * scribo/scribo/postprocessing/all.hh, + * scribo/scribo/postprocessing/fill_object_holes.hh, + * scribo/scribo/preprocessing/all.hh, + * scribo/scribo/preprocessing/crop.hh, + * scribo/scribo/preprocessing/crop_without_localization.hh, + * scribo/scribo/preprocessing/denoise.hh, + * scribo/scribo/preprocessing/denoise_bg.hh, + * scribo/scribo/preprocessing/denoise_fg.hh, + * scribo/scribo/preprocessing/deskew.hh, + * scribo/scribo/preprocessing/deskew_crop.hh, + * scribo/scribo/preprocessing/homogeneous_contrast.hh, + * scribo/scribo/preprocessing/rotate_90.hh, + * scribo/scribo/preprocessing/split_bg_fg.hh, + * scribo/scribo/primitive/all.hh, + * scribo/scribo/primitive/extract/all.hh, + * scribo/scribo/primitive/extract/canvas.hh, + * scribo/scribo/primitive/extract/cells.hh, + * scribo/scribo/primitive/extract/components.hh, + * scribo/scribo/primitive/extract/horizontal_separators.hh, + * scribo/scribo/primitive/extract/lines_discontinued.hh, + * scribo/scribo/primitive/extract/lines_h_discontinued.hh, + * scribo/scribo/primitive/extract/lines_h_pattern.hh, + * scribo/scribo/primitive/extract/lines_h_single.hh, + * scribo/scribo/primitive/extract/lines_h_thick.hh, + * scribo/scribo/primitive/extract/lines_h_thick_and_single.hh, + * scribo/scribo/primitive/extract/lines_pattern.hh, + * scribo/scribo/primitive/extract/lines_thick.hh, + * scribo/scribo/primitive/extract/lines_v_discontinued.hh, + * scribo/scribo/primitive/extract/lines_v_pattern.hh, + * scribo/scribo/primitive/extract/lines_v_single.hh, + * scribo/scribo/primitive/extract/lines_v_thick.hh, + * scribo/scribo/primitive/extract/lines_v_thick_and_single.hh, + * scribo/scribo/primitive/extract/separators.hh, + * scribo/scribo/primitive/extract/vertical_separators.hh, + * scribo/scribo/primitive/group/all.hh, + * scribo/scribo/primitive/group/apply.hh, + * scribo/scribo/primitive/group/from_double_link.hh, + * scribo/scribo/primitive/group/from_graph.hh, + * scribo/scribo/primitive/group/from_single_link.hh, + * scribo/scribo/primitive/internal/all.hh, + * scribo/scribo/primitive/internal/find_graph_link.hh, + * scribo/scribo/primitive/internal/find_root.hh, + * scribo/scribo/primitive/internal/have_link_valid.hh, + * scribo/scribo/primitive/internal/is_link_valid.hh, + * scribo/scribo/primitive/internal/rd.hh, + * scribo/scribo/primitive/internal/update_graph_link.hh, + * scribo/scribo/primitive/link/all.hh, + * scribo/scribo/primitive/link/compute.hh, + * scribo/scribo/primitive/link/compute_several.hh, + * scribo/scribo/primitive/link/internal/compute_anchor.hh, + * scribo/scribo/primitive/link/internal/dmax_default.hh, + * scribo/scribo/primitive/link/internal/dmax_functor_base.hh, + * scribo/scribo/primitive/link/internal/dmax_width_and_height.hh, + * scribo/scribo/primitive/link/internal/dmax_width_only.hh, + * scribo/scribo/primitive/link/internal/find_link.hh, + * scribo/scribo/primitive/link/internal/find_several_links.hh, + * scribo/scribo/primitive/link/internal/link_functor_base.hh, + * scribo/scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/scribo/primitive/link/internal/link_single_dmax_base.hh, + * scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh, + * scribo/scribo/primitive/link/merge_double_link.hh, + * scribo/scribo/primitive/link/with_graph.hh, + * scribo/scribo/primitive/link/with_rag.hh, + * scribo/scribo/primitive/link/with_several_graphes.hh, + * scribo/scribo/primitive/link/with_several_left_links.hh, + * scribo/scribo/primitive/link/with_several_right_closest_links.hh, + * scribo/scribo/primitive/link/with_several_right_links.hh, + * scribo/scribo/primitive/link/with_several_right_links_overlap.hh, + * scribo/scribo/primitive/link/with_single_down_link.hh, + * scribo/scribo/primitive/link/with_single_left_link.hh, + * scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh, + * scribo/scribo/primitive/link/with_single_right_link.hh, + * scribo/scribo/primitive/link/with_single_right_link_bottom.hh, + * scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh, + * scribo/scribo/primitive/link/with_single_right_link_top.hh, + * scribo/scribo/primitive/link/with_single_up_link.hh, + * scribo/scribo/primitive/regroup/from_single_left_link.hh, + * scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, + * scribo/scribo/primitive/remove/separators.hh, + * scribo/scribo/subsampling/bilinear.hh, + * scribo/scribo/subsampling/integral.hh, + * scribo/scribo/subsampling/integral_single_image.hh, + * scribo/scribo/table/align_lines_horizontaly.hh, + * scribo/scribo/table/align_lines_verticaly.hh, + * scribo/scribo/table/all.hh, + * scribo/scribo/table/connect_horizontal_lines.hh, + * scribo/scribo/table/connect_vertical_lines.hh, + * scribo/scribo/table/erase.hh, + * scribo/scribo/table/extract.hh, + * scribo/scribo/table/internal/align_lines.hh, + * scribo/scribo/table/internal/all.hh, + * scribo/scribo/table/internal/connect_lines.hh, + * scribo/scribo/table/internal/repair_lines.hh, + * scribo/scribo/table/rebuild.hh, + * scribo/scribo/table/repair_horizontal_lines.hh, + * scribo/scribo/table/repair_vertical_lines.hh, + * scribo/scribo/text/all.hh, + * scribo/scribo/text/clean.hh, + * scribo/scribo/text/clean_inplace.hh, + * scribo/scribo/text/extract_lines.hh, + * scribo/scribo/text/look_like_text_lines.hh, + * scribo/scribo/text/merging.hh, + * scribo/scribo/text/recognition.hh, + * scribo/scribo/toolchain/nepomuk/text_extraction.hh, + * scribo/scribo/toolchain/text_in_doc.hh, + * scribo/scribo/upsampling/bs2x.hh, + * scribo/scribo/upsampling/eagle.hh: ... here. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Setup conditional unit-tests in Scribo. * tests/tests.mk: Add specific flags for external dependencies. diff --git a/scribo/all.hh b/scribo/scribo/all.hh similarity index 100% rename from scribo/all.hh rename to scribo/scribo/all.hh diff --git a/scribo/binarization/all.hh b/scribo/scribo/binarization/all.hh similarity index 100% rename from scribo/binarization/all.hh rename to scribo/scribo/binarization/all.hh diff --git a/scribo/binarization/global_threshold.hh b/scribo/scribo/binarization/global_threshold.hh similarity index 100% rename from scribo/binarization/global_threshold.hh rename to scribo/scribo/binarization/global_threshold.hh diff --git a/scribo/binarization/global_threshold_auto.hh b/scribo/scribo/binarization/global_threshold_auto.hh similarity index 100% rename from scribo/binarization/global_threshold_auto.hh rename to scribo/scribo/binarization/global_threshold_auto.hh diff --git a/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh similarity index 100% rename from scribo/binarization/internal/first_pass_functor.hh rename to scribo/scribo/binarization/internal/first_pass_functor.hh diff --git a/scribo/binarization/local_threshold.hh b/scribo/scribo/binarization/local_threshold.hh similarity index 100% rename from scribo/binarization/local_threshold.hh rename to scribo/scribo/binarization/local_threshold.hh diff --git a/scribo/binarization/sauvola.hh b/scribo/scribo/binarization/sauvola.hh similarity index 100% rename from scribo/binarization/sauvola.hh rename to scribo/scribo/binarization/sauvola.hh diff --git a/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh similarity index 100% rename from scribo/binarization/sauvola_ms.hh rename to scribo/scribo/binarization/sauvola_ms.hh diff --git a/scribo/binarization/sauvola_ms_split.hh b/scribo/scribo/binarization/sauvola_ms_split.hh similarity index 100% rename from scribo/binarization/sauvola_ms_split.hh rename to scribo/scribo/binarization/sauvola_ms_split.hh diff --git a/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh similarity index 100% rename from scribo/binarization/sauvola_threshold_image.hh rename to scribo/scribo/binarization/sauvola_threshold_image.hh diff --git a/scribo/binarization/sauvola_threshold_image_debug.hh b/scribo/scribo/binarization/sauvola_threshold_image_debug.hh similarity index 100% rename from scribo/binarization/sauvola_threshold_image_debug.hh rename to scribo/scribo/binarization/sauvola_threshold_image_debug.hh diff --git a/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh similarity index 100% rename from scribo/canvas/integral_browsing.hh rename to scribo/scribo/canvas/integral_browsing.hh diff --git a/scribo/convert/from_qimage.hh b/scribo/scribo/convert/from_qimage.hh similarity index 100% rename from scribo/convert/from_qimage.hh rename to scribo/scribo/convert/from_qimage.hh diff --git a/scribo/core/all.hh b/scribo/scribo/core/all.hh similarity index 100% rename from scribo/core/all.hh rename to scribo/scribo/core/all.hh diff --git a/scribo/core/central_sites.hh b/scribo/scribo/core/central_sites.hh similarity index 100% rename from scribo/core/central_sites.hh rename to scribo/scribo/core/central_sites.hh diff --git a/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh similarity index 100% rename from scribo/core/component_info.hh rename to scribo/scribo/core/component_info.hh diff --git a/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh similarity index 100% rename from scribo/core/component_set.hh rename to scribo/scribo/core/component_set.hh diff --git a/scribo/core/concept/dmax_functor.hh b/scribo/scribo/core/concept/dmax_functor.hh similarity index 100% rename from scribo/core/concept/dmax_functor.hh rename to scribo/scribo/core/concept/dmax_functor.hh diff --git a/scribo/core/concept/link_functor.hh b/scribo/scribo/core/concept/link_functor.hh similarity index 100% rename from scribo/core/concept/link_functor.hh rename to scribo/scribo/core/concept/link_functor.hh diff --git a/scribo/core/def/lbl_type.hh b/scribo/scribo/core/def/lbl_type.hh similarity index 100% rename from scribo/core/def/lbl_type.hh rename to scribo/scribo/core/def/lbl_type.hh diff --git a/scribo/core/erase_objects.hh b/scribo/scribo/core/erase_objects.hh similarity index 100% rename from scribo/core/erase_objects.hh rename to scribo/scribo/core/erase_objects.hh diff --git a/scribo/core/init_integral_image.hh b/scribo/scribo/core/init_integral_image.hh similarity index 100% rename from scribo/core/init_integral_image.hh rename to scribo/scribo/core/init_integral_image.hh diff --git a/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh similarity index 100% rename from scribo/core/line_info.hh rename to scribo/scribo/core/line_info.hh diff --git a/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh similarity index 100% rename from scribo/core/line_set.hh rename to scribo/scribo/core/line_set.hh diff --git a/scribo/core/macros.hh b/scribo/scribo/core/macros.hh similarity index 100% rename from scribo/core/macros.hh rename to scribo/scribo/core/macros.hh diff --git a/scribo/core/object_groups.hh b/scribo/scribo/core/object_groups.hh similarity index 100% rename from scribo/core/object_groups.hh rename to scribo/scribo/core/object_groups.hh diff --git a/scribo/core/object_links.hh b/scribo/scribo/core/object_links.hh similarity index 100% rename from scribo/core/object_links.hh rename to scribo/scribo/core/object_links.hh diff --git a/scribo/core/tag/anchor.hh b/scribo/scribo/core/tag/anchor.hh similarity index 100% rename from scribo/core/tag/anchor.hh rename to scribo/scribo/core/tag/anchor.hh diff --git a/scribo/core/tag/component.hh b/scribo/scribo/core/tag/component.hh similarity index 100% rename from scribo/core/tag/component.hh rename to scribo/scribo/core/tag/component.hh diff --git a/scribo/core/tag/line.hh b/scribo/scribo/core/tag/line.hh similarity index 100% rename from scribo/core/tag/line.hh rename to scribo/scribo/core/tag/line.hh diff --git a/scribo/debug/alignment_decision_image.hh b/scribo/scribo/debug/alignment_decision_image.hh similarity index 100% rename from scribo/debug/alignment_decision_image.hh rename to scribo/scribo/debug/alignment_decision_image.hh diff --git a/scribo/debug/all.hh b/scribo/scribo/debug/all.hh similarity index 100% rename from scribo/debug/all.hh rename to scribo/scribo/debug/all.hh diff --git a/scribo/debug/bboxes_enlarged_image.hh b/scribo/scribo/debug/bboxes_enlarged_image.hh similarity index 100% rename from scribo/debug/bboxes_enlarged_image.hh rename to scribo/scribo/debug/bboxes_enlarged_image.hh diff --git a/scribo/debug/char_space_image.hh b/scribo/scribo/debug/char_space_image.hh similarity index 100% rename from scribo/debug/char_space_image.hh rename to scribo/scribo/debug/char_space_image.hh diff --git a/scribo/debug/decision_image.hh b/scribo/scribo/debug/decision_image.hh similarity index 100% rename from scribo/debug/decision_image.hh rename to scribo/scribo/debug/decision_image.hh diff --git a/scribo/debug/highlight_text_area.hh b/scribo/scribo/debug/highlight_text_area.hh similarity index 100% rename from scribo/debug/highlight_text_area.hh rename to scribo/scribo/debug/highlight_text_area.hh diff --git a/scribo/debug/line_info_image.hh b/scribo/scribo/debug/line_info_image.hh similarity index 100% rename from scribo/debug/line_info_image.hh rename to scribo/scribo/debug/line_info_image.hh diff --git a/scribo/debug/links_decision_image.hh b/scribo/scribo/debug/links_decision_image.hh similarity index 100% rename from scribo/debug/links_decision_image.hh rename to scribo/scribo/debug/links_decision_image.hh diff --git a/scribo/debug/looks_like_a_text_line_image.hh b/scribo/scribo/debug/looks_like_a_text_line_image.hh similarity index 100% rename from scribo/debug/looks_like_a_text_line_image.hh rename to scribo/scribo/debug/looks_like_a_text_line_image.hh diff --git a/scribo/debug/mean_and_base_lines_image.hh b/scribo/scribo/debug/mean_and_base_lines_image.hh similarity index 100% rename from scribo/debug/mean_and_base_lines_image.hh rename to scribo/scribo/debug/mean_and_base_lines_image.hh diff --git a/scribo/debug/save_bboxes_image.hh b/scribo/scribo/debug/save_bboxes_image.hh similarity index 100% rename from scribo/debug/save_bboxes_image.hh rename to scribo/scribo/debug/save_bboxes_image.hh diff --git a/scribo/debug/save_comp_diff.hh b/scribo/scribo/debug/save_comp_diff.hh similarity index 100% rename from scribo/debug/save_comp_diff.hh rename to scribo/scribo/debug/save_comp_diff.hh diff --git a/scribo/debug/save_label_image.hh b/scribo/scribo/debug/save_label_image.hh similarity index 100% rename from scribo/debug/save_label_image.hh rename to scribo/scribo/debug/save_label_image.hh diff --git a/scribo/debug/save_linked_bboxes_image.hh b/scribo/scribo/debug/save_linked_bboxes_image.hh similarity index 100% rename from scribo/debug/save_linked_bboxes_image.hh rename to scribo/scribo/debug/save_linked_bboxes_image.hh diff --git a/scribo/debug/save_table_image.hh b/scribo/scribo/debug/save_table_image.hh similarity index 100% rename from scribo/debug/save_table_image.hh rename to scribo/scribo/debug/save_table_image.hh diff --git a/scribo/debug/several_links_decision_image.hh b/scribo/scribo/debug/several_links_decision_image.hh similarity index 100% rename from scribo/debug/several_links_decision_image.hh rename to scribo/scribo/debug/several_links_decision_image.hh diff --git a/scribo/debug/text_areas_image.hh b/scribo/scribo/debug/text_areas_image.hh similarity index 100% rename from scribo/debug/text_areas_image.hh rename to scribo/scribo/debug/text_areas_image.hh diff --git a/scribo/debug/usage.hh b/scribo/scribo/debug/usage.hh similarity index 100% rename from scribo/debug/usage.hh rename to scribo/scribo/debug/usage.hh diff --git a/scribo/draw/all.hh b/scribo/scribo/draw/all.hh similarity index 100% rename from scribo/draw/all.hh rename to scribo/scribo/draw/all.hh diff --git a/scribo/draw/bounding_box_links.hh b/scribo/scribo/draw/bounding_box_links.hh similarity index 100% rename from scribo/draw/bounding_box_links.hh rename to scribo/scribo/draw/bounding_box_links.hh diff --git a/scribo/draw/bounding_boxes.hh b/scribo/scribo/draw/bounding_boxes.hh similarity index 100% rename from scribo/draw/bounding_boxes.hh rename to scribo/scribo/draw/bounding_boxes.hh diff --git a/scribo/draw/groups_bboxes.hh b/scribo/scribo/draw/groups_bboxes.hh similarity index 100% rename from scribo/draw/groups_bboxes.hh rename to scribo/scribo/draw/groups_bboxes.hh diff --git a/scribo/estim/object_groups_v_thickness.hh b/scribo/scribo/estim/object_groups_v_thickness.hh similarity index 100% rename from scribo/estim/object_groups_v_thickness.hh rename to scribo/scribo/estim/object_groups_v_thickness.hh diff --git a/scribo/filter/all.hh b/scribo/scribo/filter/all.hh similarity index 100% rename from scribo/filter/all.hh rename to scribo/scribo/filter/all.hh diff --git a/scribo/filter/common/objects_photo.hh b/scribo/scribo/filter/common/objects_photo.hh similarity index 100% rename from scribo/filter/common/objects_photo.hh rename to scribo/scribo/filter/common/objects_photo.hh diff --git a/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh similarity index 100% rename from scribo/filter/internal/alignment_angle.hh rename to scribo/scribo/filter/internal/alignment_angle.hh diff --git a/scribo/filter/internal/component_aligned.hh b/scribo/scribo/filter/internal/component_aligned.hh similarity index 100% rename from scribo/filter/internal/component_aligned.hh rename to scribo/scribo/filter/internal/component_aligned.hh diff --git a/scribo/filter/internal/compute.hh b/scribo/scribo/filter/internal/compute.hh similarity index 100% rename from scribo/filter/internal/compute.hh rename to scribo/scribo/filter/internal/compute.hh diff --git a/scribo/filter/object_groups_size_ratio.hh b/scribo/scribo/filter/object_groups_size_ratio.hh similarity index 100% rename from scribo/filter/object_groups_size_ratio.hh rename to scribo/scribo/filter/object_groups_size_ratio.hh diff --git a/scribo/filter/object_groups_small.hh b/scribo/scribo/filter/object_groups_small.hh similarity index 100% rename from scribo/filter/object_groups_small.hh rename to scribo/scribo/filter/object_groups_small.hh diff --git a/scribo/filter/object_groups_v_thickness.hh b/scribo/scribo/filter/object_groups_v_thickness.hh similarity index 100% rename from scribo/filter/object_groups_v_thickness.hh rename to scribo/scribo/filter/object_groups_v_thickness.hh diff --git a/scribo/filter/object_groups_with_holes.hh b/scribo/scribo/filter/object_groups_with_holes.hh similarity index 100% rename from scribo/filter/object_groups_with_holes.hh rename to scribo/scribo/filter/object_groups_with_holes.hh diff --git a/scribo/filter/object_links_bbox_h_ratio.hh b/scribo/scribo/filter/object_links_bbox_h_ratio.hh similarity index 100% rename from scribo/filter/object_links_bbox_h_ratio.hh rename to scribo/scribo/filter/object_links_bbox_h_ratio.hh diff --git a/scribo/filter/object_links_bbox_overlap.hh b/scribo/scribo/filter/object_links_bbox_overlap.hh similarity index 100% rename from scribo/filter/object_links_bbox_overlap.hh rename to scribo/scribo/filter/object_links_bbox_overlap.hh diff --git a/scribo/filter/object_links_bbox_ratio.hh b/scribo/scribo/filter/object_links_bbox_ratio.hh similarity index 100% rename from scribo/filter/object_links_bbox_ratio.hh rename to scribo/scribo/filter/object_links_bbox_ratio.hh diff --git a/scribo/filter/object_links_bbox_w_ratio.hh b/scribo/scribo/filter/object_links_bbox_w_ratio.hh similarity index 100% rename from scribo/filter/object_links_bbox_w_ratio.hh rename to scribo/scribo/filter/object_links_bbox_w_ratio.hh diff --git a/scribo/filter/object_links_bottom_aligned.hh b/scribo/scribo/filter/object_links_bottom_aligned.hh similarity index 100% rename from scribo/filter/object_links_bottom_aligned.hh rename to scribo/scribo/filter/object_links_bottom_aligned.hh diff --git a/scribo/filter/object_links_center_aligned.hh b/scribo/scribo/filter/object_links_center_aligned.hh similarity index 100% rename from scribo/filter/object_links_center_aligned.hh rename to scribo/scribo/filter/object_links_center_aligned.hh diff --git a/scribo/filter/object_links_left_aligned.hh b/scribo/scribo/filter/object_links_left_aligned.hh similarity index 100% rename from scribo/filter/object_links_left_aligned.hh rename to scribo/scribo/filter/object_links_left_aligned.hh diff --git a/scribo/filter/object_links_non_aligned_simple.hh b/scribo/scribo/filter/object_links_non_aligned_simple.hh similarity index 100% rename from scribo/filter/object_links_non_aligned_simple.hh rename to scribo/scribo/filter/object_links_non_aligned_simple.hh diff --git a/scribo/filter/object_links_right_aligned.hh b/scribo/scribo/filter/object_links_right_aligned.hh similarity index 100% rename from scribo/filter/object_links_right_aligned.hh rename to scribo/scribo/filter/object_links_right_aligned.hh diff --git a/scribo/filter/object_links_top_aligned.hh b/scribo/scribo/filter/object_links_top_aligned.hh similarity index 100% rename from scribo/filter/object_links_top_aligned.hh rename to scribo/scribo/filter/object_links_top_aligned.hh diff --git a/scribo/filter/objects_h_thick.hh b/scribo/scribo/filter/objects_h_thick.hh similarity index 100% rename from scribo/filter/objects_h_thick.hh rename to scribo/scribo/filter/objects_h_thick.hh diff --git a/scribo/filter/objects_h_thin.hh b/scribo/scribo/filter/objects_h_thin.hh similarity index 100% rename from scribo/filter/objects_h_thin.hh rename to scribo/scribo/filter/objects_h_thin.hh diff --git a/scribo/filter/objects_large.hh b/scribo/scribo/filter/objects_large.hh similarity index 100% rename from scribo/filter/objects_large.hh rename to scribo/scribo/filter/objects_large.hh diff --git a/scribo/filter/objects_size_ratio.hh b/scribo/scribo/filter/objects_size_ratio.hh similarity index 100% rename from scribo/filter/objects_size_ratio.hh rename to scribo/scribo/filter/objects_size_ratio.hh diff --git a/scribo/filter/objects_small.hh b/scribo/scribo/filter/objects_small.hh similarity index 100% rename from scribo/filter/objects_small.hh rename to scribo/scribo/filter/objects_small.hh diff --git a/scribo/filter/objects_thick.hh b/scribo/scribo/filter/objects_thick.hh similarity index 100% rename from scribo/filter/objects_thick.hh rename to scribo/scribo/filter/objects_thick.hh diff --git a/scribo/filter/objects_thin.hh b/scribo/scribo/filter/objects_thin.hh similarity index 100% rename from scribo/filter/objects_thin.hh rename to scribo/scribo/filter/objects_thin.hh diff --git a/scribo/filter/objects_v_thick.hh b/scribo/scribo/filter/objects_v_thick.hh similarity index 100% rename from scribo/filter/objects_v_thick.hh rename to scribo/scribo/filter/objects_v_thick.hh diff --git a/scribo/filter/objects_v_thin.hh b/scribo/scribo/filter/objects_v_thin.hh similarity index 100% rename from scribo/filter/objects_v_thin.hh rename to scribo/scribo/filter/objects_v_thin.hh diff --git a/scribo/filter/objects_with_holes.hh b/scribo/scribo/filter/objects_with_holes.hh similarity index 100% rename from scribo/filter/objects_with_holes.hh rename to scribo/scribo/filter/objects_with_holes.hh diff --git a/scribo/fun/v2b/label_to_bool.hh b/scribo/scribo/fun/v2b/label_to_bool.hh similarity index 100% rename from scribo/fun/v2b/label_to_bool.hh rename to scribo/scribo/fun/v2b/label_to_bool.hh diff --git a/scribo/fun/v2b/objects_large_filter.hh b/scribo/scribo/fun/v2b/objects_large_filter.hh similarity index 100% rename from scribo/fun/v2b/objects_large_filter.hh rename to scribo/scribo/fun/v2b/objects_large_filter.hh diff --git a/scribo/fun/v2b/objects_small_filter.hh b/scribo/scribo/fun/v2b/objects_small_filter.hh similarity index 100% rename from scribo/fun/v2b/objects_small_filter.hh rename to scribo/scribo/fun/v2b/objects_small_filter.hh diff --git a/scribo/io/text_boxes/save.hh b/scribo/scribo/io/text_boxes/save.hh similarity index 100% rename from scribo/io/text_boxes/save.hh rename to scribo/scribo/io/text_boxes/save.hh diff --git a/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh similarity index 100% rename from scribo/io/xml/save.hh rename to scribo/scribo/io/xml/save.hh diff --git a/scribo/make/all.hh b/scribo/scribo/make/all.hh similarity index 100% rename from scribo/make/all.hh rename to scribo/scribo/make/all.hh diff --git a/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh similarity index 100% rename from scribo/make/debug_filename.hh rename to scribo/scribo/make/debug_filename.hh diff --git a/scribo/make/influence_zone_graph.hh b/scribo/scribo/make/influence_zone_graph.hh similarity index 100% rename from scribo/make/influence_zone_graph.hh rename to scribo/scribo/make/influence_zone_graph.hh diff --git a/scribo/postprocessing/all.hh b/scribo/scribo/postprocessing/all.hh similarity index 100% rename from scribo/postprocessing/all.hh rename to scribo/scribo/postprocessing/all.hh diff --git a/scribo/postprocessing/fill_object_holes.hh b/scribo/scribo/postprocessing/fill_object_holes.hh similarity index 100% rename from scribo/postprocessing/fill_object_holes.hh rename to scribo/scribo/postprocessing/fill_object_holes.hh diff --git a/scribo/preprocessing/all.hh b/scribo/scribo/preprocessing/all.hh similarity index 100% rename from scribo/preprocessing/all.hh rename to scribo/scribo/preprocessing/all.hh diff --git a/scribo/preprocessing/crop.hh b/scribo/scribo/preprocessing/crop.hh similarity index 100% rename from scribo/preprocessing/crop.hh rename to scribo/scribo/preprocessing/crop.hh diff --git a/scribo/preprocessing/crop_without_localization.hh b/scribo/scribo/preprocessing/crop_without_localization.hh similarity index 100% rename from scribo/preprocessing/crop_without_localization.hh rename to scribo/scribo/preprocessing/crop_without_localization.hh diff --git a/scribo/preprocessing/denoise.hh b/scribo/scribo/preprocessing/denoise.hh similarity index 100% rename from scribo/preprocessing/denoise.hh rename to scribo/scribo/preprocessing/denoise.hh diff --git a/scribo/preprocessing/denoise_bg.hh b/scribo/scribo/preprocessing/denoise_bg.hh similarity index 100% rename from scribo/preprocessing/denoise_bg.hh rename to scribo/scribo/preprocessing/denoise_bg.hh diff --git a/scribo/preprocessing/denoise_fg.hh b/scribo/scribo/preprocessing/denoise_fg.hh similarity index 100% rename from scribo/preprocessing/denoise_fg.hh rename to scribo/scribo/preprocessing/denoise_fg.hh diff --git a/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh similarity index 100% rename from scribo/preprocessing/deskew.hh rename to scribo/scribo/preprocessing/deskew.hh diff --git a/scribo/preprocessing/deskew_crop.hh b/scribo/scribo/preprocessing/deskew_crop.hh similarity index 100% rename from scribo/preprocessing/deskew_crop.hh rename to scribo/scribo/preprocessing/deskew_crop.hh diff --git a/scribo/preprocessing/homogeneous_contrast.hh b/scribo/scribo/preprocessing/homogeneous_contrast.hh similarity index 100% rename from scribo/preprocessing/homogeneous_contrast.hh rename to scribo/scribo/preprocessing/homogeneous_contrast.hh diff --git a/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh similarity index 100% rename from scribo/preprocessing/rotate_90.hh rename to scribo/scribo/preprocessing/rotate_90.hh diff --git a/scribo/preprocessing/split_bg_fg.hh b/scribo/scribo/preprocessing/split_bg_fg.hh similarity index 100% rename from scribo/preprocessing/split_bg_fg.hh rename to scribo/scribo/preprocessing/split_bg_fg.hh diff --git a/scribo/primitive/all.hh b/scribo/scribo/primitive/all.hh similarity index 100% rename from scribo/primitive/all.hh rename to scribo/scribo/primitive/all.hh diff --git a/scribo/primitive/extract/all.hh b/scribo/scribo/primitive/extract/all.hh similarity index 100% rename from scribo/primitive/extract/all.hh rename to scribo/scribo/primitive/extract/all.hh diff --git a/scribo/primitive/extract/canvas.hh b/scribo/scribo/primitive/extract/canvas.hh similarity index 100% rename from scribo/primitive/extract/canvas.hh rename to scribo/scribo/primitive/extract/canvas.hh diff --git a/scribo/primitive/extract/cells.hh b/scribo/scribo/primitive/extract/cells.hh similarity index 100% rename from scribo/primitive/extract/cells.hh rename to scribo/scribo/primitive/extract/cells.hh diff --git a/scribo/primitive/extract/components.hh b/scribo/scribo/primitive/extract/components.hh similarity index 100% rename from scribo/primitive/extract/components.hh rename to scribo/scribo/primitive/extract/components.hh diff --git a/scribo/primitive/extract/horizontal_separators.hh b/scribo/scribo/primitive/extract/horizontal_separators.hh similarity index 100% rename from scribo/primitive/extract/horizontal_separators.hh rename to scribo/scribo/primitive/extract/horizontal_separators.hh diff --git a/scribo/primitive/extract/lines_discontinued.hh b/scribo/scribo/primitive/extract/lines_discontinued.hh similarity index 100% rename from scribo/primitive/extract/lines_discontinued.hh rename to scribo/scribo/primitive/extract/lines_discontinued.hh diff --git a/scribo/primitive/extract/lines_h_discontinued.hh b/scribo/scribo/primitive/extract/lines_h_discontinued.hh similarity index 100% rename from scribo/primitive/extract/lines_h_discontinued.hh rename to scribo/scribo/primitive/extract/lines_h_discontinued.hh diff --git a/scribo/primitive/extract/lines_h_pattern.hh b/scribo/scribo/primitive/extract/lines_h_pattern.hh similarity index 100% rename from scribo/primitive/extract/lines_h_pattern.hh rename to scribo/scribo/primitive/extract/lines_h_pattern.hh diff --git a/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh similarity index 100% rename from scribo/primitive/extract/lines_h_single.hh rename to scribo/scribo/primitive/extract/lines_h_single.hh diff --git a/scribo/primitive/extract/lines_h_thick.hh b/scribo/scribo/primitive/extract/lines_h_thick.hh similarity index 100% rename from scribo/primitive/extract/lines_h_thick.hh rename to scribo/scribo/primitive/extract/lines_h_thick.hh diff --git a/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/scribo/primitive/extract/lines_h_thick_and_single.hh similarity index 100% rename from scribo/primitive/extract/lines_h_thick_and_single.hh rename to scribo/scribo/primitive/extract/lines_h_thick_and_single.hh diff --git a/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh similarity index 100% rename from scribo/primitive/extract/lines_pattern.hh rename to scribo/scribo/primitive/extract/lines_pattern.hh diff --git a/scribo/primitive/extract/lines_thick.hh b/scribo/scribo/primitive/extract/lines_thick.hh similarity index 100% rename from scribo/primitive/extract/lines_thick.hh rename to scribo/scribo/primitive/extract/lines_thick.hh diff --git a/scribo/primitive/extract/lines_v_discontinued.hh b/scribo/scribo/primitive/extract/lines_v_discontinued.hh similarity index 100% rename from scribo/primitive/extract/lines_v_discontinued.hh rename to scribo/scribo/primitive/extract/lines_v_discontinued.hh diff --git a/scribo/primitive/extract/lines_v_pattern.hh b/scribo/scribo/primitive/extract/lines_v_pattern.hh similarity index 100% rename from scribo/primitive/extract/lines_v_pattern.hh rename to scribo/scribo/primitive/extract/lines_v_pattern.hh diff --git a/scribo/primitive/extract/lines_v_single.hh b/scribo/scribo/primitive/extract/lines_v_single.hh similarity index 100% rename from scribo/primitive/extract/lines_v_single.hh rename to scribo/scribo/primitive/extract/lines_v_single.hh diff --git a/scribo/primitive/extract/lines_v_thick.hh b/scribo/scribo/primitive/extract/lines_v_thick.hh similarity index 100% rename from scribo/primitive/extract/lines_v_thick.hh rename to scribo/scribo/primitive/extract/lines_v_thick.hh diff --git a/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/scribo/primitive/extract/lines_v_thick_and_single.hh similarity index 100% rename from scribo/primitive/extract/lines_v_thick_and_single.hh rename to scribo/scribo/primitive/extract/lines_v_thick_and_single.hh diff --git a/scribo/primitive/extract/separators.hh b/scribo/scribo/primitive/extract/separators.hh similarity index 100% rename from scribo/primitive/extract/separators.hh rename to scribo/scribo/primitive/extract/separators.hh diff --git a/scribo/primitive/extract/vertical_separators.hh b/scribo/scribo/primitive/extract/vertical_separators.hh similarity index 100% rename from scribo/primitive/extract/vertical_separators.hh rename to scribo/scribo/primitive/extract/vertical_separators.hh diff --git a/scribo/primitive/group/all.hh b/scribo/scribo/primitive/group/all.hh similarity index 100% rename from scribo/primitive/group/all.hh rename to scribo/scribo/primitive/group/all.hh diff --git a/scribo/primitive/group/apply.hh b/scribo/scribo/primitive/group/apply.hh similarity index 100% rename from scribo/primitive/group/apply.hh rename to scribo/scribo/primitive/group/apply.hh diff --git a/scribo/primitive/group/from_double_link.hh b/scribo/scribo/primitive/group/from_double_link.hh similarity index 100% rename from scribo/primitive/group/from_double_link.hh rename to scribo/scribo/primitive/group/from_double_link.hh diff --git a/scribo/primitive/group/from_graph.hh b/scribo/scribo/primitive/group/from_graph.hh similarity index 100% rename from scribo/primitive/group/from_graph.hh rename to scribo/scribo/primitive/group/from_graph.hh diff --git a/scribo/primitive/group/from_single_link.hh b/scribo/scribo/primitive/group/from_single_link.hh similarity index 100% rename from scribo/primitive/group/from_single_link.hh rename to scribo/scribo/primitive/group/from_single_link.hh diff --git a/scribo/primitive/internal/all.hh b/scribo/scribo/primitive/internal/all.hh similarity index 100% rename from scribo/primitive/internal/all.hh rename to scribo/scribo/primitive/internal/all.hh diff --git a/scribo/primitive/internal/find_graph_link.hh b/scribo/scribo/primitive/internal/find_graph_link.hh similarity index 100% rename from scribo/primitive/internal/find_graph_link.hh rename to scribo/scribo/primitive/internal/find_graph_link.hh diff --git a/scribo/primitive/internal/find_root.hh b/scribo/scribo/primitive/internal/find_root.hh similarity index 100% rename from scribo/primitive/internal/find_root.hh rename to scribo/scribo/primitive/internal/find_root.hh diff --git a/scribo/primitive/internal/have_link_valid.hh b/scribo/scribo/primitive/internal/have_link_valid.hh similarity index 100% rename from scribo/primitive/internal/have_link_valid.hh rename to scribo/scribo/primitive/internal/have_link_valid.hh diff --git a/scribo/primitive/internal/is_link_valid.hh b/scribo/scribo/primitive/internal/is_link_valid.hh similarity index 100% rename from scribo/primitive/internal/is_link_valid.hh rename to scribo/scribo/primitive/internal/is_link_valid.hh diff --git a/scribo/primitive/internal/rd.hh b/scribo/scribo/primitive/internal/rd.hh similarity index 100% rename from scribo/primitive/internal/rd.hh rename to scribo/scribo/primitive/internal/rd.hh diff --git a/scribo/primitive/internal/update_graph_link.hh b/scribo/scribo/primitive/internal/update_graph_link.hh similarity index 100% rename from scribo/primitive/internal/update_graph_link.hh rename to scribo/scribo/primitive/internal/update_graph_link.hh diff --git a/scribo/primitive/link/all.hh b/scribo/scribo/primitive/link/all.hh similarity index 100% rename from scribo/primitive/link/all.hh rename to scribo/scribo/primitive/link/all.hh diff --git a/scribo/primitive/link/compute.hh b/scribo/scribo/primitive/link/compute.hh similarity index 100% rename from scribo/primitive/link/compute.hh rename to scribo/scribo/primitive/link/compute.hh diff --git a/scribo/primitive/link/compute_several.hh b/scribo/scribo/primitive/link/compute_several.hh similarity index 100% rename from scribo/primitive/link/compute_several.hh rename to scribo/scribo/primitive/link/compute_several.hh diff --git a/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh similarity index 100% rename from scribo/primitive/link/internal/compute_anchor.hh rename to scribo/scribo/primitive/link/internal/compute_anchor.hh diff --git a/scribo/primitive/link/internal/dmax_default.hh b/scribo/scribo/primitive/link/internal/dmax_default.hh similarity index 100% rename from scribo/primitive/link/internal/dmax_default.hh rename to scribo/scribo/primitive/link/internal/dmax_default.hh diff --git a/scribo/primitive/link/internal/dmax_functor_base.hh b/scribo/scribo/primitive/link/internal/dmax_functor_base.hh similarity index 100% rename from scribo/primitive/link/internal/dmax_functor_base.hh rename to scribo/scribo/primitive/link/internal/dmax_functor_base.hh diff --git a/scribo/primitive/link/internal/dmax_width_and_height.hh b/scribo/scribo/primitive/link/internal/dmax_width_and_height.hh similarity index 100% rename from scribo/primitive/link/internal/dmax_width_and_height.hh rename to scribo/scribo/primitive/link/internal/dmax_width_and_height.hh diff --git a/scribo/primitive/link/internal/dmax_width_only.hh b/scribo/scribo/primitive/link/internal/dmax_width_only.hh similarity index 100% rename from scribo/primitive/link/internal/dmax_width_only.hh rename to scribo/scribo/primitive/link/internal/dmax_width_only.hh diff --git a/scribo/primitive/link/internal/find_link.hh b/scribo/scribo/primitive/link/internal/find_link.hh similarity index 100% rename from scribo/primitive/link/internal/find_link.hh rename to scribo/scribo/primitive/link/internal/find_link.hh diff --git a/scribo/primitive/link/internal/find_several_links.hh b/scribo/scribo/primitive/link/internal/find_several_links.hh similarity index 100% rename from scribo/primitive/link/internal/find_several_links.hh rename to scribo/scribo/primitive/link/internal/find_several_links.hh diff --git a/scribo/primitive/link/internal/link_functor_base.hh b/scribo/scribo/primitive/link/internal/link_functor_base.hh similarity index 100% rename from scribo/primitive/link/internal/link_functor_base.hh rename to scribo/scribo/primitive/link/internal/link_functor_base.hh diff --git a/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh similarity index 100% rename from scribo/primitive/link/internal/link_several_dmax_base.hh rename to scribo/scribo/primitive/link/internal/link_several_dmax_base.hh diff --git a/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh similarity index 100% rename from scribo/primitive/link/internal/link_single_dmax_base.hh rename to scribo/scribo/primitive/link/internal/link_single_dmax_base.hh diff --git a/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh similarity index 100% rename from scribo/primitive/link/internal/link_single_dmax_ratio_base.hh rename to scribo/scribo/primitive/link/internal/link_single_dmax_ratio_base.hh diff --git a/scribo/primitive/link/merge_double_link.hh b/scribo/scribo/primitive/link/merge_double_link.hh similarity index 100% rename from scribo/primitive/link/merge_double_link.hh rename to scribo/scribo/primitive/link/merge_double_link.hh diff --git a/scribo/primitive/link/with_graph.hh b/scribo/scribo/primitive/link/with_graph.hh similarity index 100% rename from scribo/primitive/link/with_graph.hh rename to scribo/scribo/primitive/link/with_graph.hh diff --git a/scribo/primitive/link/with_rag.hh b/scribo/scribo/primitive/link/with_rag.hh similarity index 100% rename from scribo/primitive/link/with_rag.hh rename to scribo/scribo/primitive/link/with_rag.hh diff --git a/scribo/primitive/link/with_several_graphes.hh b/scribo/scribo/primitive/link/with_several_graphes.hh similarity index 100% rename from scribo/primitive/link/with_several_graphes.hh rename to scribo/scribo/primitive/link/with_several_graphes.hh diff --git a/scribo/primitive/link/with_several_left_links.hh b/scribo/scribo/primitive/link/with_several_left_links.hh similarity index 100% rename from scribo/primitive/link/with_several_left_links.hh rename to scribo/scribo/primitive/link/with_several_left_links.hh diff --git a/scribo/primitive/link/with_several_right_closest_links.hh b/scribo/scribo/primitive/link/with_several_right_closest_links.hh similarity index 100% rename from scribo/primitive/link/with_several_right_closest_links.hh rename to scribo/scribo/primitive/link/with_several_right_closest_links.hh diff --git a/scribo/primitive/link/with_several_right_links.hh b/scribo/scribo/primitive/link/with_several_right_links.hh similarity index 100% rename from scribo/primitive/link/with_several_right_links.hh rename to scribo/scribo/primitive/link/with_several_right_links.hh diff --git a/scribo/primitive/link/with_several_right_links_overlap.hh b/scribo/scribo/primitive/link/with_several_right_links_overlap.hh similarity index 100% rename from scribo/primitive/link/with_several_right_links_overlap.hh rename to scribo/scribo/primitive/link/with_several_right_links_overlap.hh diff --git a/scribo/primitive/link/with_single_down_link.hh b/scribo/scribo/primitive/link/with_single_down_link.hh similarity index 100% rename from scribo/primitive/link/with_single_down_link.hh rename to scribo/scribo/primitive/link/with_single_down_link.hh diff --git a/scribo/primitive/link/with_single_left_link.hh b/scribo/scribo/primitive/link/with_single_left_link.hh similarity index 100% rename from scribo/primitive/link/with_single_left_link.hh rename to scribo/scribo/primitive/link/with_single_left_link.hh diff --git a/scribo/primitive/link/with_single_left_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh similarity index 100% rename from scribo/primitive/link/with_single_left_link_dmax_ratio.hh rename to scribo/scribo/primitive/link/with_single_left_link_dmax_ratio.hh diff --git a/scribo/primitive/link/with_single_right_link.hh b/scribo/scribo/primitive/link/with_single_right_link.hh similarity index 100% rename from scribo/primitive/link/with_single_right_link.hh rename to scribo/scribo/primitive/link/with_single_right_link.hh diff --git a/scribo/primitive/link/with_single_right_link_bottom.hh b/scribo/scribo/primitive/link/with_single_right_link_bottom.hh similarity index 100% rename from scribo/primitive/link/with_single_right_link_bottom.hh rename to scribo/scribo/primitive/link/with_single_right_link_bottom.hh diff --git a/scribo/primitive/link/with_single_right_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh similarity index 100% rename from scribo/primitive/link/with_single_right_link_dmax_ratio.hh rename to scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh diff --git a/scribo/primitive/link/with_single_right_link_top.hh b/scribo/scribo/primitive/link/with_single_right_link_top.hh similarity index 100% rename from scribo/primitive/link/with_single_right_link_top.hh rename to scribo/scribo/primitive/link/with_single_right_link_top.hh diff --git a/scribo/primitive/link/with_single_up_link.hh b/scribo/scribo/primitive/link/with_single_up_link.hh similarity index 100% rename from scribo/primitive/link/with_single_up_link.hh rename to scribo/scribo/primitive/link/with_single_up_link.hh diff --git a/scribo/primitive/regroup/from_single_left_link.hh b/scribo/scribo/primitive/regroup/from_single_left_link.hh similarity index 100% rename from scribo/primitive/regroup/from_single_left_link.hh rename to scribo/scribo/primitive/regroup/from_single_left_link.hh diff --git a/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh b/scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh similarity index 100% rename from scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh rename to scribo/scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh diff --git a/scribo/primitive/remove/separators.hh b/scribo/scribo/primitive/remove/separators.hh similarity index 100% rename from scribo/primitive/remove/separators.hh rename to scribo/scribo/primitive/remove/separators.hh diff --git a/scribo/subsampling/bilinear.hh b/scribo/scribo/subsampling/bilinear.hh similarity index 100% rename from scribo/subsampling/bilinear.hh rename to scribo/scribo/subsampling/bilinear.hh diff --git a/scribo/subsampling/integral.hh b/scribo/scribo/subsampling/integral.hh similarity index 100% rename from scribo/subsampling/integral.hh rename to scribo/scribo/subsampling/integral.hh diff --git a/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh similarity index 100% rename from scribo/subsampling/integral_single_image.hh rename to scribo/scribo/subsampling/integral_single_image.hh diff --git a/scribo/table/align_lines_horizontaly.hh b/scribo/scribo/table/align_lines_horizontaly.hh similarity index 100% rename from scribo/table/align_lines_horizontaly.hh rename to scribo/scribo/table/align_lines_horizontaly.hh diff --git a/scribo/table/align_lines_verticaly.hh b/scribo/scribo/table/align_lines_verticaly.hh similarity index 100% rename from scribo/table/align_lines_verticaly.hh rename to scribo/scribo/table/align_lines_verticaly.hh diff --git a/scribo/table/all.hh b/scribo/scribo/table/all.hh similarity index 100% rename from scribo/table/all.hh rename to scribo/scribo/table/all.hh diff --git a/scribo/table/connect_horizontal_lines.hh b/scribo/scribo/table/connect_horizontal_lines.hh similarity index 100% rename from scribo/table/connect_horizontal_lines.hh rename to scribo/scribo/table/connect_horizontal_lines.hh diff --git a/scribo/table/connect_vertical_lines.hh b/scribo/scribo/table/connect_vertical_lines.hh similarity index 100% rename from scribo/table/connect_vertical_lines.hh rename to scribo/scribo/table/connect_vertical_lines.hh diff --git a/scribo/table/erase.hh b/scribo/scribo/table/erase.hh similarity index 100% rename from scribo/table/erase.hh rename to scribo/scribo/table/erase.hh diff --git a/scribo/table/extract.hh b/scribo/scribo/table/extract.hh similarity index 100% rename from scribo/table/extract.hh rename to scribo/scribo/table/extract.hh diff --git a/scribo/table/internal/align_lines.hh b/scribo/scribo/table/internal/align_lines.hh similarity index 100% rename from scribo/table/internal/align_lines.hh rename to scribo/scribo/table/internal/align_lines.hh diff --git a/scribo/table/internal/all.hh b/scribo/scribo/table/internal/all.hh similarity index 100% rename from scribo/table/internal/all.hh rename to scribo/scribo/table/internal/all.hh diff --git a/scribo/table/internal/connect_lines.hh b/scribo/scribo/table/internal/connect_lines.hh similarity index 100% rename from scribo/table/internal/connect_lines.hh rename to scribo/scribo/table/internal/connect_lines.hh diff --git a/scribo/table/internal/repair_lines.hh b/scribo/scribo/table/internal/repair_lines.hh similarity index 100% rename from scribo/table/internal/repair_lines.hh rename to scribo/scribo/table/internal/repair_lines.hh diff --git a/scribo/table/rebuild.hh b/scribo/scribo/table/rebuild.hh similarity index 100% rename from scribo/table/rebuild.hh rename to scribo/scribo/table/rebuild.hh diff --git a/scribo/table/repair_horizontal_lines.hh b/scribo/scribo/table/repair_horizontal_lines.hh similarity index 100% rename from scribo/table/repair_horizontal_lines.hh rename to scribo/scribo/table/repair_horizontal_lines.hh diff --git a/scribo/table/repair_vertical_lines.hh b/scribo/scribo/table/repair_vertical_lines.hh similarity index 100% rename from scribo/table/repair_vertical_lines.hh rename to scribo/scribo/table/repair_vertical_lines.hh diff --git a/scribo/text/all.hh b/scribo/scribo/text/all.hh similarity index 100% rename from scribo/text/all.hh rename to scribo/scribo/text/all.hh diff --git a/scribo/text/clean.hh b/scribo/scribo/text/clean.hh similarity index 100% rename from scribo/text/clean.hh rename to scribo/scribo/text/clean.hh diff --git a/scribo/text/clean_inplace.hh b/scribo/scribo/text/clean_inplace.hh similarity index 100% rename from scribo/text/clean_inplace.hh rename to scribo/scribo/text/clean_inplace.hh diff --git a/scribo/text/extract_lines.hh b/scribo/scribo/text/extract_lines.hh similarity index 100% rename from scribo/text/extract_lines.hh rename to scribo/scribo/text/extract_lines.hh diff --git a/scribo/text/look_like_text_lines.hh b/scribo/scribo/text/look_like_text_lines.hh similarity index 100% rename from scribo/text/look_like_text_lines.hh rename to scribo/scribo/text/look_like_text_lines.hh diff --git a/scribo/text/merging.hh b/scribo/scribo/text/merging.hh similarity index 100% rename from scribo/text/merging.hh rename to scribo/scribo/text/merging.hh diff --git a/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh similarity index 100% rename from scribo/text/recognition.hh rename to scribo/scribo/text/recognition.hh diff --git a/scribo/toolchain/nepomuk/text_extraction.hh b/scribo/scribo/toolchain/nepomuk/text_extraction.hh similarity index 100% rename from scribo/toolchain/nepomuk/text_extraction.hh rename to scribo/scribo/toolchain/nepomuk/text_extraction.hh diff --git a/scribo/toolchain/text_in_doc.hh b/scribo/scribo/toolchain/text_in_doc.hh similarity index 100% rename from scribo/toolchain/text_in_doc.hh rename to scribo/scribo/toolchain/text_in_doc.hh diff --git a/scribo/upsampling/bs2x.hh b/scribo/scribo/upsampling/bs2x.hh similarity index 100% rename from scribo/upsampling/bs2x.hh rename to scribo/scribo/upsampling/bs2x.hh diff --git a/scribo/upsampling/eagle.hh b/scribo/scribo/upsampling/eagle.hh similarity index 100% rename from scribo/upsampling/eagle.hh rename to scribo/scribo/upsampling/eagle.hh -- 1.5.6.5

14 years, 10 months

last-svn-commit-446-g6bf37e8 mln/io/dicom/get_header.hh: Add missing headers.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/io/dicom/get_header.hh | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 967d9bb..3701f90 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/dicom/get_header.hh: Add missing headers. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Setup conditional unit-tests in Milena. * tests/unit_test/Makefile.am diff --git a/milena/mln/io/dicom/get_header.hh b/milena/mln/io/dicom/get_header.hh index 6d85850..8ebe375 100644 --- a/milena/mln/io/dicom/get_header.hh +++ b/milena/mln/io/dicom/get_header.hh @@ -33,11 +33,18 @@ # include <iostream> # include <fstream> +# include <gdcm-2.0/gdcmReader.h> +# include <gdcm-2.0/gdcmImageReader.h> +# include <gdcm-2.0/gdcmWriter.h> +# include <gdcm-2.0/gdcmDataSet.h> +# include <gdcm-2.0/gdcmAttribute.h> + # include <mln/core/concept/image.hh> # include <mln/core/routine/initialize.hh> # include <mln/core/box_runstart_piter.hh> # include <mln/core/pixel.hh> # include <mln/data/memcpy_.hh> +# include <mln/util/array.hh> namespace mln { -- 1.5.6.5

14 years, 10 months

last-svn-commit-445-g0545aad Setup conditional unit-tests in Scribo.

by Guillaume Lazzara

* tests/tests.mk: Add specific flags for external dependencies. * tests/unit_test/Makefile.am (EXTRA_DIST): Add const_tests_* files. (regen-am): Use build-aux/build_unit_test.sh. (scribo_*FLAGS): Remove specific flags for conditional unit-tests. * tests/unit_test/build_unit_test.sh: Remove. Useless since build-aux/build_unit_test.sh is used instead. * tests/unit_test/cond_tests_qt, * tests/unit_test/cond_tests_qt_tesseract_tiff, * tests/unit_test/cond_tests_tesseract_tiff: New. * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 20 ++ scribo/tests/tests.mk | 14 + scribo/tests/unit_test/Makefile.am | 51 +--- scribo/tests/unit_test/build_unit_test.sh | 85 ------ scribo/tests/unit_test/cond_tests_qt | 1 + .../tests/unit_test/cond_tests_qt_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 + scribo/tests/unit_test/unit-tests.mk | 310 ++++---------------- 8 files changed, 107 insertions(+), 376 deletions(-) delete mode 100755 scribo/tests/unit_test/build_unit_test.sh create mode 100644 scribo/tests/unit_test/cond_tests_qt create mode 100644 scribo/tests/unit_test/cond_tests_qt_tesseract_tiff create mode 100644 scribo/tests/unit_test/cond_tests_tesseract_tiff diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7f1f52d..ddd39df 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,23 @@ +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Setup conditional unit-tests in Scribo. + + * tests/tests.mk: Add specific flags for external dependencies. + + * tests/unit_test/Makefile.am + (EXTRA_DIST): Add const_tests_* files. + (regen-am): Use build-aux/build_unit_test.sh. + (scribo_*FLAGS): Remove specific flags for conditional unit-tests. + + * tests/unit_test/build_unit_test.sh: Remove. Useless since + build-aux/build_unit_test.sh is used instead. + + * tests/unit_test/cond_tests_qt, + * tests/unit_test/cond_tests_qt_tesseract_tiff, + * tests/unit_test/cond_tests_tesseract_tiff: New. + + * tests/unit_test/unit-tests.mk: Regen. + 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/disabled_tests: Update list of disabled tests. diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index d42c206..48a1009 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -18,3 +18,17 @@ AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) + +# Flags for optional dependencies. + +MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@ +MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@ + +TIFF_CPPFLAGS = @TIFF_CPPFLAGS@ +TIFF_LDFLAGS = @TIFF_LDFLAGS@ + +QT_CPPFLAGS = @QT_CPPFLAGS@ +QT_LDFLAGS = @QT_LDFLAGS@ @QT_LIBS@ + +TESSERACT_CPPFLAGS = @TESSERACT_CPPFLAGS@ +TESSERACT_LDFLAGS = @TESSERACT_LDFLAGS@ \ No newline at end of file diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 255babf..86721e8 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -16,16 +16,23 @@ include $(top_srcdir)/scribo/tests/tests.mk -EXTRA_DIST = build_unit_test.sh disabled_tests +COND_TESTS = cond_tests_qt \ + cond_tests_qt_tesseract_tiff \ + cond_tests_tesseract_tiff + +EXTRA_DIST = disabled_tests \ + $(COND_TESTS) + # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: cd $(top_srcdir) \ - && scribo/tests/unit_test/build_unit_test.sh \ + && ./build-aux/build_unit_test.sh \ scribo \ scribo/tests/unit_test \ - scribo/tests/unit_test/disabled_tests + scribo/tests/unit_test/disabled_tests \ + scribo # FIXME: Change build_unit_test.sh so that the action looks like this: # @@ -33,47 +40,17 @@ regen-am: # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -$(srcdir)/unit-tests.mk: build_unit_test.sh disabled_tests +$(srcdir)/unit-tests.mk: build_unit_test.sh disabled_tests $(COND_TESTS) cd $(top_srcdir) \ - && scribo/tests/unit_test/build_unit_test.sh \ + && ./build-aux/build_unit_test.sh \ scribo \ scribo/tests/unit_test \ - scribo/tests/unit_test/disabled_tests + scribo/tests/unit_test/disabled_tests \ + scribo include $(srcdir)/unit-tests.mk -#FIXME: how to handle that automaticaly during the unit test list -#generation? -scribo_convert_from_qimage_CPPFLAGS=\ - $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) -scribo_convert_from_qimage_CXXFLAGS=\ - $(QT_CXXFLAGS) $(AM_CXXFLAGS) -scribo_convert_from_qimage_LDFLAGS=\ - $(QT_LDFLAGS) $(LDFLAGS) -scribo_convert_from_qimage_LDADD=\ - $(QT_LIBS) $(LDADD) - -scribo_toolchain_nepomuk_text_extraction_CPPFLAGS=\ - $(QT_CPPFLAGS) $(TESSERACT_CPPFLAGS) $(TIFF_CPPFLAGS) \ - $(AM_CPPFLAGS) -I$(srcdir) -scribo_toolchain_nepomuk_text_extraction_CXXFLAGS=\ - $(QT_CXXFLAGS) $(AM_CXXFLAGS) -scribo_toolchain_nepomuk_text_extraction_LDFLAGS=\ - $(QT_LDFLAGS) $(TESSERACT_LDFLAGS) $(TIFF_LDFLAGS) \ - $(LDFLAGS) -scribo_toolchain_nepomuk_text_extraction_LDADD=\ - $(QT_LIBS) $(LDADD) - -scribo_text_recognition_CPPFLAGS=\ - $(TESSERACT_CPPFLAGS) $(TIFF_CPPFLAGS) \ - $(AM_CPPFLAGS) -I$(srcdir) -scribo_text_recognition_LDFLAGS=\ - $(TESSERACT_LDFLAGS) $(TIFF_LDFLAGS) \ - $(LDFLAGS) - - - MAINTAINERCLEANFILES = $(srcdir)/scribo_*.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/unit_test/build_unit_test.sh b/scribo/tests/unit_test/build_unit_test.sh deleted file mode 100755 index 415ff95..0000000 --- a/scribo/tests/unit_test/build_unit_test.sh +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh - -# 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/>. - -## FIXME: Unify with build-aux/build_unit_test.sh. - -## FIXME: Don't use `echo -n', as echo's options are not portable. -## -## http://www.gnu.org/software/autoconf/manual/html_node/Limitations-of-Builti… -## -## As an ugly workaround, use `printf' instead. The right approach -## would be to only emit lines ended with newlines. -ECHO_N=printf - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -test $# -eq 3 || { echo "Usage: $0 <scanned dir> <output_dir> <disabled_tests>" && exit 1; } - -scanned_dir=$1 -output_dir=$2 -disabled_tests=$3 - -HEADERS=$(find $scanned_dir -type f -name "*.hh" \ - | sort \ - | sed -e 's/.*\/scribo\/$.*$/scribo\/\1/g' | sed 's/\.\.\/\.\.\///g' \ - | comm -23 - "$disabled_tests") - -output="$output_dir/unit-tests.mk" - -rm -f "$output" -rm -f scribo_*.cc - -# Build unit-tests.mk. -echo "## Generated by $0, do not modify." >"$output" -echo >>"$output" -$ECHO_N "check_PROGRAMS = " >>"$output" - -for i in $HEADERS; do - FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` - - # Build .cc. - cat > "$output_dir/$FILE_CC" << EOF -// Unit test for $i. -// Generated by $0, do not modify. - -// Include the file twice, so we detect missing inclusion guards. -#include <$i> -#include <$i> - -int main() -{ - // Nothing. -} -EOF - - # Build unit-tests.mk. - TARGET=`echo "${FILE_CC}" | sed 's/\.cc//'` - echo " \\" >>"$output" - $ECHO_N "${TARGET}" >>"$output" -done - -# Build "$output". -echo "" >>"$output" -echo "" >>"$output" -for i in $HEADERS; do - FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` - NAME=`echo $FILE_CC | sed 's/\.cc//g'` - echo "${NAME}_SOURCES = $FILE_CC" >>"$output" -done diff --git a/scribo/tests/unit_test/cond_tests_qt b/scribo/tests/unit_test/cond_tests_qt new file mode 100644 index 0000000..5428215 --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_qt @@ -0,0 +1 @@ +scribo/convert/from_qimage.hh diff --git a/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff b/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff new file mode 100644 index 0000000..7dfe76d --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_qt_tesseract_tiff @@ -0,0 +1 @@ +scribo/toolchain/nepomuk/text_extraction.hh diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff new file mode 100644 index 0000000..bce37c9 --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -0,0 +1 @@ +scribo/text/recognition.hh diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index a37db3b..82664fa 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -1,11 +1,50 @@ -## Generated by scribo/tests/unit_test/build_unit_test.sh, do not modify. +## Generated by ./build-aux/build_unit_test.sh, do not modify. -check_PROGRAMS = \ +check_PROGRAMS = + +# Starting a conditional unit test list. +if HAVE_QT +check_PROGRAMS += \ +scribo_convert_from_qimage + +scribo_convert_from_qimage_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_convert_from_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +scribo_convert_from_qimage_SOURCES = scribo_convert_from_qimage.cc +endif HAVE_QT + +# Starting a conditional unit test list. +if HAVE_QT +if HAVE_TESSERACT +if HAVE_TIFF +check_PROGRAMS += \ +scribo_toolchain_nepomuk_text_extraction + +scribo_toolchain_nepomuk_text_extraction_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${QT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_nepomuk_text_extraction_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${QT_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_nepomuk_text_extraction_SOURCES = scribo_toolchain_nepomuk_text_extraction.cc +endif HAVE_TIFF +endif HAVE_TESSERACT +endif HAVE_QT + +# Starting a conditional unit test list. +if HAVE_TESSERACT +if HAVE_TIFF +check_PROGRAMS += \ +scribo_text_recognition + +scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_text_recognition_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} +scribo_text_recognition_SOURCES = scribo_text_recognition.cc +endif HAVE_TIFF +endif HAVE_TESSERACT + +# Starting non-conditional unit test list. +check_PROGRAMS += \ scribo_all \ +scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ scribo_binarization_internal_first_pass_functor \ -scribo_binarization_internal_min_mean_max_stddev \ scribo_binarization_local_threshold \ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ @@ -13,7 +52,6 @@ scribo_binarization_sauvola_ms_split \ scribo_binarization_sauvola_threshold_image \ scribo_binarization_sauvola_threshold_image_debug \ scribo_canvas_integral_browsing \ -scribo_convert_from_qimage \ scribo_core_all \ scribo_core_central_sites \ scribo_core_component_info \ @@ -23,12 +61,10 @@ scribo_core_concept_link_functor \ scribo_core_def_lbl_type \ scribo_core_erase_objects \ scribo_core_init_integral_image \ -scribo_core_internal_link_functor_base \ scribo_core_line_info \ scribo_core_line_set \ scribo_core_macros \ scribo_core_object_groups \ -scribo_core_object_image \ scribo_core_object_links \ scribo_core_tag_anchor \ scribo_core_tag_component \ @@ -36,72 +72,21 @@ scribo_core_tag_line \ scribo_debug_alignment_decision_image \ scribo_debug_all \ scribo_debug_bboxes_enlarged_image \ +scribo_debug_char_space_image \ scribo_debug_decision_image \ scribo_debug_highlight_text_area \ +scribo_debug_line_info_image \ scribo_debug_links_decision_image \ scribo_debug_looks_like_a_text_line_image \ scribo_debug_mean_and_base_lines_image \ scribo_debug_save_bboxes_image \ +scribo_debug_save_comp_diff \ 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_text_areas_image \ scribo_debug_usage \ -scribo_demo_demat_src_doc_type \ -scribo_demo_demat_src_main_window \ -scribo_demo_demat_src_preprocessing_task \ -scribo_demo_demat_src_process_args \ -scribo_demo_demat_src_runner \ -scribo_demo_review_src_mainwindow \ -scribo_demo_shared_src_bak_crop_item \ -scribo_demo_shared_src_bak_image_viewer \ -scribo_demo_shared_src_bak_types \ -scribo_demo_shared_src_browse_widget \ -scribo_demo_shared_src_crop_item \ -scribo_demo_shared_src_image_viewer \ -scribo_demo_shared_src_internal_bak_interactive_scene \ -scribo_demo_shared_src_internal_bak_selection_rectangle \ -scribo_demo_shared_src_internal_interactive_scene \ -scribo_demo_shared_src_internal_selection_rectangle \ -scribo_demo_shared_src_to_mln_image \ -scribo_demo_shared_src_types \ -scribo_demo_shared_ui_interactive_scene \ -scribo_demo_tip_src_custom_delegate \ -scribo_demo_tip_src_launch_dialog \ -scribo_demo_tip_src_main_window \ -scribo_demo_viewer_browser_widget \ -scribo_demo_viewer_common \ -scribo_demo_viewer_domitem \ -scribo_demo_viewer_dommodel \ -scribo_demo_viewer_help_dialog \ -scribo_demo_viewer_image_region \ -scribo_demo_viewer_image_scene \ -scribo_demo_viewer_image_view \ -scribo_demo_viewer_image_widget \ -scribo_demo_viewer_key_widget \ -scribo_demo_viewer_property_widget \ -scribo_demo_viewer_step_widget \ -scribo_demo_viewer_viewer \ -scribo_demo_viewer_xml_widget \ -scribo_demo_wizard_src_crop_page \ -scribo_demo_wizard_src_crop_widget \ -scribo_demo_wizard_src_doc_type \ -scribo_demo_wizard_src_doc_type_page \ -scribo_demo_wizard_src_doc_type_widget \ -scribo_demo_wizard_src_load_page \ -scribo_demo_wizard_src_load_widget \ -scribo_demo_wizard_src_main_window \ -scribo_demo_wizard_src_preprocessing_page \ -scribo_demo_wizard_src_preprocessing_task \ -scribo_demo_wizard_src_preprocessing_widget \ -scribo_demo_wizard_src_process_page \ -scribo_demo_wizard_src_process_widget \ -scribo_demo_wizard_src_result_page \ -scribo_demo_wizard_src_result_widget \ -scribo_demo_wizard_src_rotate_page \ -scribo_demo_wizard_src_rotate_widget \ -scribo_demo_wizard_src_runner \ scribo_draw_all \ scribo_draw_bounding_box_links \ scribo_draw_bounding_boxes \ @@ -144,7 +129,7 @@ scribo_io_xml_save \ scribo_make_all \ scribo_make_debug_filename \ scribo_make_influence_zone_graph \ -scribo_make_text \ +scribo_postprocessing_all \ scribo_postprocessing_fill_object_holes \ scribo_preprocessing_all \ scribo_preprocessing_crop \ @@ -181,22 +166,17 @@ 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_group_from_single_link_robust \ scribo_primitive_internal_all \ scribo_primitive_internal_find_graph_link \ scribo_primitive_internal_find_root \ -scribo_primitive_internal_find_root_robust \ scribo_primitive_internal_have_link_valid \ scribo_primitive_internal_is_link_valid \ scribo_primitive_internal_rd \ scribo_primitive_internal_update_graph_link \ -scribo_primitive_internal_update_link_array \ scribo_primitive_link_all \ scribo_primitive_link_compute \ -scribo_primitive_link_internal_anchors_3 \ scribo_primitive_link_internal_compute_anchor \ scribo_primitive_link_internal_dmax_default \ scribo_primitive_link_internal_dmax_functor_base \ @@ -204,8 +184,6 @@ scribo_primitive_link_internal_dmax_width_and_height \ scribo_primitive_link_internal_dmax_width_only \ scribo_primitive_link_internal_find_link \ 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_internal_link_several_dmax_base \ scribo_primitive_link_internal_link_single_dmax_base \ scribo_primitive_link_internal_link_single_dmax_ratio_base \ @@ -214,7 +192,6 @@ 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_single_down_link \ scribo_primitive_link_with_single_left_link \ @@ -222,67 +199,11 @@ 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_regroup_from_single_left_link \ +scribo_primitive_regroup_from_single_left_link_wrt_h_ratio \ scribo_primitive_remove_separators \ -scribo_sandbox__julien_hough_hough_hough_pgm \ -scribo_sandbox__julien_hough_hough_hough_v1 \ -scribo_sandbox__julien_hough_hough_hough_v2 \ -scribo_sandbox__julien_hough_hough_hough_v3 \ -scribo_sandbox__julien_hough_hough_hough_v4 \ -scribo_sandbox__julien_hough_kht_buffer_2d \ -scribo_sandbox__julien_hough_kht_closing \ -scribo_sandbox__julien_hough_kht_eigen \ -scribo_sandbox__julien_hough_kht_filter \ -scribo_sandbox__julien_hough_kht_kht \ -scribo_sandbox__julien_hough_kht_linking \ -scribo_sandbox__julien_hough_kht_peak_detection \ -scribo_sandbox__julien_hough_kht_subdivision \ -scribo_sandbox__julien_hough_kht_types \ -scribo_sandbox__julien_hough_kht_voting \ -scribo_sandbox__julien_upsampling_eagle \ -scribo_sandbox__julien_upsampling_pyxies \ -scribo_sandbox_green_mln_accu_stat_histo1d \ -scribo_sandbox_green_mln_accu_stat_histo2d \ -scribo_sandbox_green_mln_accu_stat_histo3d_hsl \ -scribo_sandbox_green_mln_accu_stat_histo3d_rgb \ -scribo_sandbox_green_mln_clustering_k_mean \ -scribo_sandbox_green_mln_clustering_kmean1d \ -scribo_sandbox_green_mln_clustering_kmean2d \ -scribo_sandbox_green_mln_clustering_kmean3d \ -scribo_sandbox_green_mln_clustering_kmean_rgb \ -scribo_sandbox_green_mln_display_display_histo \ -scribo_sandbox_green_mln_display_project_histo \ -scribo_sandbox_green_mln_fun_p2b_achromatic \ -scribo_sandbox_green_mln_fun_p2b_component_equals \ -scribo_sandbox_green_mln_fun_v2v_achromatism \ -scribo_sandbox_green_mln_fun_v2v_hue_concentration \ -scribo_sandbox_green_mln_fun_v2v_int_u16_to_int_u14 \ -scribo_sandbox_green_mln_fun_v2v_log \ -scribo_sandbox_green_mln_fun_v2v_rg_to_rgb \ -scribo_sandbox_green_mln_fun_v2v_rgb8_to_int_u8 \ -scribo_sandbox_green_mln_fun_v2v_rgb8_to_rgbn \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_achromatism_map \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_hsv \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_hue_map \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_rg \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_saturation_map \ -scribo_sandbox_green_mln_fun_v2v_rgb_to_value_map \ -scribo_sandbox_green_mln_img_path \ -scribo_sandbox_green_mln_io_plot_save_image_sh \ -scribo_sandbox_green_mln_math_ceil \ -scribo_sandbox_green_mln_math_floor \ -scribo_sandbox_green_mln_value_hsv \ -scribo_sandbox_green_mln_value_rg \ -scribo_sandbox_green_ok_mln_accu_histo_histo1d \ -scribo_sandbox_green_ok_mln_accu_histo_histo2d \ -scribo_sandbox_green_ok_mln_accu_histo_histo3d \ -scribo_sandbox_green_ok_mln_img_path \ -scribo_src_afp_components \ -scribo_src_afp_link \ -scribo_src_afp_regroup \ scribo_subsampling_bilinear \ scribo_subsampling_integral \ scribo_subsampling_integral_single_image \ @@ -306,16 +227,15 @@ scribo_text_clean_inplace \ scribo_text_extract_lines \ scribo_text_look_like_text_lines \ scribo_text_merging \ -scribo_toolchain_nepomuk_text_extraction \ scribo_toolchain_text_in_doc \ scribo_upsampling_bs2x \ scribo_upsampling_eagle 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_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc -scribo_binarization_internal_min_mean_max_stddev_SOURCES = scribo_binarization_internal_min_mean_max_stddev.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 @@ -323,7 +243,6 @@ scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_sp 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_convert_from_qimage_SOURCES = scribo_convert_from_qimage.cc scribo_core_all_SOURCES = scribo_core_all.cc scribo_core_central_sites_SOURCES = scribo_core_central_sites.cc scribo_core_component_info_SOURCES = scribo_core_component_info.cc @@ -333,12 +252,10 @@ 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_erase_objects_SOURCES = scribo_core_erase_objects.cc scribo_core_init_integral_image_SOURCES = scribo_core_init_integral_image.cc -scribo_core_internal_link_functor_base_SOURCES = scribo_core_internal_link_functor_base.cc scribo_core_line_info_SOURCES = scribo_core_line_info.cc scribo_core_line_set_SOURCES = scribo_core_line_set.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_core_tag_anchor_SOURCES = scribo_core_tag_anchor.cc scribo_core_tag_component_SOURCES = scribo_core_tag_component.cc @@ -346,72 +263,21 @@ scribo_core_tag_line_SOURCES = scribo_core_tag_line.cc scribo_debug_alignment_decision_image_SOURCES = scribo_debug_alignment_decision_image.cc scribo_debug_all_SOURCES = scribo_debug_all.cc scribo_debug_bboxes_enlarged_image_SOURCES = scribo_debug_bboxes_enlarged_image.cc +scribo_debug_char_space_image_SOURCES = scribo_debug_char_space_image.cc scribo_debug_decision_image_SOURCES = scribo_debug_decision_image.cc scribo_debug_highlight_text_area_SOURCES = scribo_debug_highlight_text_area.cc +scribo_debug_line_info_image_SOURCES = scribo_debug_line_info_image.cc scribo_debug_links_decision_image_SOURCES = scribo_debug_links_decision_image.cc scribo_debug_looks_like_a_text_line_image_SOURCES = scribo_debug_looks_like_a_text_line_image.cc scribo_debug_mean_and_base_lines_image_SOURCES = scribo_debug_mean_and_base_lines_image.cc scribo_debug_save_bboxes_image_SOURCES = scribo_debug_save_bboxes_image.cc +scribo_debug_save_comp_diff_SOURCES = scribo_debug_save_comp_diff.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_text_areas_image_SOURCES = scribo_debug_text_areas_image.cc scribo_debug_usage_SOURCES = scribo_debug_usage.cc -scribo_demo_demat_src_doc_type_SOURCES = scribo_demo_demat_src_doc_type.cc -scribo_demo_demat_src_main_window_SOURCES = scribo_demo_demat_src_main_window.cc -scribo_demo_demat_src_preprocessing_task_SOURCES = scribo_demo_demat_src_preprocessing_task.cc -scribo_demo_demat_src_process_args_SOURCES = scribo_demo_demat_src_process_args.cc -scribo_demo_demat_src_runner_SOURCES = scribo_demo_demat_src_runner.cc -scribo_demo_review_src_mainwindow_SOURCES = scribo_demo_review_src_mainwindow.cc -scribo_demo_shared_src_bak_crop_item_SOURCES = scribo_demo_shared_src_bak_crop_item.cc -scribo_demo_shared_src_bak_image_viewer_SOURCES = scribo_demo_shared_src_bak_image_viewer.cc -scribo_demo_shared_src_bak_types_SOURCES = scribo_demo_shared_src_bak_types.cc -scribo_demo_shared_src_browse_widget_SOURCES = scribo_demo_shared_src_browse_widget.cc -scribo_demo_shared_src_crop_item_SOURCES = scribo_demo_shared_src_crop_item.cc -scribo_demo_shared_src_image_viewer_SOURCES = scribo_demo_shared_src_image_viewer.cc -scribo_demo_shared_src_internal_bak_interactive_scene_SOURCES = scribo_demo_shared_src_internal_bak_interactive_scene.cc -scribo_demo_shared_src_internal_bak_selection_rectangle_SOURCES = scribo_demo_shared_src_internal_bak_selection_rectangle.cc -scribo_demo_shared_src_internal_interactive_scene_SOURCES = scribo_demo_shared_src_internal_interactive_scene.cc -scribo_demo_shared_src_internal_selection_rectangle_SOURCES = scribo_demo_shared_src_internal_selection_rectangle.cc -scribo_demo_shared_src_to_mln_image_SOURCES = scribo_demo_shared_src_to_mln_image.cc -scribo_demo_shared_src_types_SOURCES = scribo_demo_shared_src_types.cc -scribo_demo_shared_ui_interactive_scene_SOURCES = scribo_demo_shared_ui_interactive_scene.cc -scribo_demo_tip_src_custom_delegate_SOURCES = scribo_demo_tip_src_custom_delegate.cc -scribo_demo_tip_src_launch_dialog_SOURCES = scribo_demo_tip_src_launch_dialog.cc -scribo_demo_tip_src_main_window_SOURCES = scribo_demo_tip_src_main_window.cc -scribo_demo_viewer_browser_widget_SOURCES = scribo_demo_viewer_browser_widget.cc -scribo_demo_viewer_common_SOURCES = scribo_demo_viewer_common.cc -scribo_demo_viewer_domitem_SOURCES = scribo_demo_viewer_domitem.cc -scribo_demo_viewer_dommodel_SOURCES = scribo_demo_viewer_dommodel.cc -scribo_demo_viewer_help_dialog_SOURCES = scribo_demo_viewer_help_dialog.cc -scribo_demo_viewer_image_region_SOURCES = scribo_demo_viewer_image_region.cc -scribo_demo_viewer_image_scene_SOURCES = scribo_demo_viewer_image_scene.cc -scribo_demo_viewer_image_view_SOURCES = scribo_demo_viewer_image_view.cc -scribo_demo_viewer_image_widget_SOURCES = scribo_demo_viewer_image_widget.cc -scribo_demo_viewer_key_widget_SOURCES = scribo_demo_viewer_key_widget.cc -scribo_demo_viewer_property_widget_SOURCES = scribo_demo_viewer_property_widget.cc -scribo_demo_viewer_step_widget_SOURCES = scribo_demo_viewer_step_widget.cc -scribo_demo_viewer_viewer_SOURCES = scribo_demo_viewer_viewer.cc -scribo_demo_viewer_xml_widget_SOURCES = scribo_demo_viewer_xml_widget.cc -scribo_demo_wizard_src_crop_page_SOURCES = scribo_demo_wizard_src_crop_page.cc -scribo_demo_wizard_src_crop_widget_SOURCES = scribo_demo_wizard_src_crop_widget.cc -scribo_demo_wizard_src_doc_type_SOURCES = scribo_demo_wizard_src_doc_type.cc -scribo_demo_wizard_src_doc_type_page_SOURCES = scribo_demo_wizard_src_doc_type_page.cc -scribo_demo_wizard_src_doc_type_widget_SOURCES = scribo_demo_wizard_src_doc_type_widget.cc -scribo_demo_wizard_src_load_page_SOURCES = scribo_demo_wizard_src_load_page.cc -scribo_demo_wizard_src_load_widget_SOURCES = scribo_demo_wizard_src_load_widget.cc -scribo_demo_wizard_src_main_window_SOURCES = scribo_demo_wizard_src_main_window.cc -scribo_demo_wizard_src_preprocessing_page_SOURCES = scribo_demo_wizard_src_preprocessing_page.cc -scribo_demo_wizard_src_preprocessing_task_SOURCES = scribo_demo_wizard_src_preprocessing_task.cc -scribo_demo_wizard_src_preprocessing_widget_SOURCES = scribo_demo_wizard_src_preprocessing_widget.cc -scribo_demo_wizard_src_process_page_SOURCES = scribo_demo_wizard_src_process_page.cc -scribo_demo_wizard_src_process_widget_SOURCES = scribo_demo_wizard_src_process_widget.cc -scribo_demo_wizard_src_result_page_SOURCES = scribo_demo_wizard_src_result_page.cc -scribo_demo_wizard_src_result_widget_SOURCES = scribo_demo_wizard_src_result_widget.cc -scribo_demo_wizard_src_rotate_page_SOURCES = scribo_demo_wizard_src_rotate_page.cc -scribo_demo_wizard_src_rotate_widget_SOURCES = scribo_demo_wizard_src_rotate_widget.cc -scribo_demo_wizard_src_runner_SOURCES = scribo_demo_wizard_src_runner.cc scribo_draw_all_SOURCES = scribo_draw_all.cc scribo_draw_bounding_box_links_SOURCES = scribo_draw_bounding_box_links.cc scribo_draw_bounding_boxes_SOURCES = scribo_draw_bounding_boxes.cc @@ -454,7 +320,7 @@ scribo_io_xml_save_SOURCES = scribo_io_xml_save.cc scribo_make_all_SOURCES = scribo_make_all.cc scribo_make_debug_filename_SOURCES = scribo_make_debug_filename.cc scribo_make_influence_zone_graph_SOURCES = scribo_make_influence_zone_graph.cc -scribo_make_text_SOURCES = scribo_make_text.cc +scribo_postprocessing_all_SOURCES = scribo_postprocessing_all.cc scribo_postprocessing_fill_object_holes_SOURCES = scribo_postprocessing_fill_object_holes.cc scribo_preprocessing_all_SOURCES = scribo_preprocessing_all.cc scribo_preprocessing_crop_SOURCES = scribo_preprocessing_crop.cc @@ -491,22 +357,17 @@ scribo_primitive_extract_vertical_separators_SOURCES = scribo_primitive_extract_ 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_group_from_single_link_robust_SOURCES = scribo_primitive_group_from_single_link_robust.cc scribo_primitive_internal_all_SOURCES = scribo_primitive_internal_all.cc scribo_primitive_internal_find_graph_link_SOURCES = scribo_primitive_internal_find_graph_link.cc scribo_primitive_internal_find_root_SOURCES = scribo_primitive_internal_find_root.cc -scribo_primitive_internal_find_root_robust_SOURCES = scribo_primitive_internal_find_root_robust.cc scribo_primitive_internal_have_link_valid_SOURCES = scribo_primitive_internal_have_link_valid.cc scribo_primitive_internal_is_link_valid_SOURCES = scribo_primitive_internal_is_link_valid.cc scribo_primitive_internal_rd_SOURCES = scribo_primitive_internal_rd.cc 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_internal_anchors_3_SOURCES = scribo_primitive_link_internal_anchors_3.cc scribo_primitive_link_internal_compute_anchor_SOURCES = scribo_primitive_link_internal_compute_anchor.cc scribo_primitive_link_internal_dmax_default_SOURCES = scribo_primitive_link_internal_dmax_default.cc scribo_primitive_link_internal_dmax_functor_base_SOURCES = scribo_primitive_link_internal_dmax_functor_base.cc @@ -514,8 +375,6 @@ scribo_primitive_link_internal_dmax_width_and_height_SOURCES = scribo_primitive_ scribo_primitive_link_internal_dmax_width_only_SOURCES = scribo_primitive_link_internal_dmax_width_only.cc scribo_primitive_link_internal_find_link_SOURCES = scribo_primitive_link_internal_find_link.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_internal_link_several_dmax_base_SOURCES = scribo_primitive_link_internal_link_several_dmax_base.cc scribo_primitive_link_internal_link_single_dmax_base_SOURCES = scribo_primitive_link_internal_link_single_dmax_base.cc scribo_primitive_link_internal_link_single_dmax_ratio_base_SOURCES = scribo_primitive_link_internal_link_single_dmax_ratio_base.cc @@ -524,7 +383,6 @@ 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_single_down_link_SOURCES = scribo_primitive_link_with_single_down_link.cc scribo_primitive_link_with_single_left_link_SOURCES = scribo_primitive_link_with_single_left_link.cc @@ -532,67 +390,11 @@ 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_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 -scribo_sandbox__julien_hough_hough_hough_pgm_SOURCES = scribo_sandbox__julien_hough_hough_hough_pgm.cc -scribo_sandbox__julien_hough_hough_hough_v1_SOURCES = scribo_sandbox__julien_hough_hough_hough_v1.cc -scribo_sandbox__julien_hough_hough_hough_v2_SOURCES = scribo_sandbox__julien_hough_hough_hough_v2.cc -scribo_sandbox__julien_hough_hough_hough_v3_SOURCES = scribo_sandbox__julien_hough_hough_hough_v3.cc -scribo_sandbox__julien_hough_hough_hough_v4_SOURCES = scribo_sandbox__julien_hough_hough_hough_v4.cc -scribo_sandbox__julien_hough_kht_buffer_2d_SOURCES = scribo_sandbox__julien_hough_kht_buffer_2d.cc -scribo_sandbox__julien_hough_kht_closing_SOURCES = scribo_sandbox__julien_hough_kht_closing.cc -scribo_sandbox__julien_hough_kht_eigen_SOURCES = scribo_sandbox__julien_hough_kht_eigen.cc -scribo_sandbox__julien_hough_kht_filter_SOURCES = scribo_sandbox__julien_hough_kht_filter.cc -scribo_sandbox__julien_hough_kht_kht_SOURCES = scribo_sandbox__julien_hough_kht_kht.cc -scribo_sandbox__julien_hough_kht_linking_SOURCES = scribo_sandbox__julien_hough_kht_linking.cc -scribo_sandbox__julien_hough_kht_peak_detection_SOURCES = scribo_sandbox__julien_hough_kht_peak_detection.cc -scribo_sandbox__julien_hough_kht_subdivision_SOURCES = scribo_sandbox__julien_hough_kht_subdivision.cc -scribo_sandbox__julien_hough_kht_types_SOURCES = scribo_sandbox__julien_hough_kht_types.cc -scribo_sandbox__julien_hough_kht_voting_SOURCES = scribo_sandbox__julien_hough_kht_voting.cc -scribo_sandbox__julien_upsampling_eagle_SOURCES = scribo_sandbox__julien_upsampling_eagle.cc -scribo_sandbox__julien_upsampling_pyxies_SOURCES = scribo_sandbox__julien_upsampling_pyxies.cc -scribo_sandbox_green_mln_accu_stat_histo1d_SOURCES = scribo_sandbox_green_mln_accu_stat_histo1d.cc -scribo_sandbox_green_mln_accu_stat_histo2d_SOURCES = scribo_sandbox_green_mln_accu_stat_histo2d.cc -scribo_sandbox_green_mln_accu_stat_histo3d_hsl_SOURCES = scribo_sandbox_green_mln_accu_stat_histo3d_hsl.cc -scribo_sandbox_green_mln_accu_stat_histo3d_rgb_SOURCES = scribo_sandbox_green_mln_accu_stat_histo3d_rgb.cc -scribo_sandbox_green_mln_clustering_k_mean_SOURCES = scribo_sandbox_green_mln_clustering_k_mean.cc -scribo_sandbox_green_mln_clustering_kmean1d_SOURCES = scribo_sandbox_green_mln_clustering_kmean1d.cc -scribo_sandbox_green_mln_clustering_kmean2d_SOURCES = scribo_sandbox_green_mln_clustering_kmean2d.cc -scribo_sandbox_green_mln_clustering_kmean3d_SOURCES = scribo_sandbox_green_mln_clustering_kmean3d.cc -scribo_sandbox_green_mln_clustering_kmean_rgb_SOURCES = scribo_sandbox_green_mln_clustering_kmean_rgb.cc -scribo_sandbox_green_mln_display_display_histo_SOURCES = scribo_sandbox_green_mln_display_display_histo.cc -scribo_sandbox_green_mln_display_project_histo_SOURCES = scribo_sandbox_green_mln_display_project_histo.cc -scribo_sandbox_green_mln_fun_p2b_achromatic_SOURCES = scribo_sandbox_green_mln_fun_p2b_achromatic.cc -scribo_sandbox_green_mln_fun_p2b_component_equals_SOURCES = scribo_sandbox_green_mln_fun_p2b_component_equals.cc -scribo_sandbox_green_mln_fun_v2v_achromatism_SOURCES = scribo_sandbox_green_mln_fun_v2v_achromatism.cc -scribo_sandbox_green_mln_fun_v2v_hue_concentration_SOURCES = scribo_sandbox_green_mln_fun_v2v_hue_concentration.cc -scribo_sandbox_green_mln_fun_v2v_int_u16_to_int_u14_SOURCES = scribo_sandbox_green_mln_fun_v2v_int_u16_to_int_u14.cc -scribo_sandbox_green_mln_fun_v2v_log_SOURCES = scribo_sandbox_green_mln_fun_v2v_log.cc -scribo_sandbox_green_mln_fun_v2v_rg_to_rgb_SOURCES = scribo_sandbox_green_mln_fun_v2v_rg_to_rgb.cc -scribo_sandbox_green_mln_fun_v2v_rgb8_to_int_u8_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb8_to_int_u8.cc -scribo_sandbox_green_mln_fun_v2v_rgb8_to_rgbn_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb8_to_rgbn.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_achromatism_map_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_achromatism_map.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_hsv_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_hsv.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_hue_map_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_hue_map.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_rg_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_rg.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_saturation_map_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_saturation_map.cc -scribo_sandbox_green_mln_fun_v2v_rgb_to_value_map_SOURCES = scribo_sandbox_green_mln_fun_v2v_rgb_to_value_map.cc -scribo_sandbox_green_mln_img_path_SOURCES = scribo_sandbox_green_mln_img_path.cc -scribo_sandbox_green_mln_io_plot_save_image_sh_SOURCES = scribo_sandbox_green_mln_io_plot_save_image_sh.cc -scribo_sandbox_green_mln_math_ceil_SOURCES = scribo_sandbox_green_mln_math_ceil.cc -scribo_sandbox_green_mln_math_floor_SOURCES = scribo_sandbox_green_mln_math_floor.cc -scribo_sandbox_green_mln_value_hsv_SOURCES = scribo_sandbox_green_mln_value_hsv.cc -scribo_sandbox_green_mln_value_rg_SOURCES = scribo_sandbox_green_mln_value_rg.cc -scribo_sandbox_green_ok_mln_accu_histo_histo1d_SOURCES = scribo_sandbox_green_ok_mln_accu_histo_histo1d.cc -scribo_sandbox_green_ok_mln_accu_histo_histo2d_SOURCES = scribo_sandbox_green_ok_mln_accu_histo_histo2d.cc -scribo_sandbox_green_ok_mln_accu_histo_histo3d_SOURCES = scribo_sandbox_green_ok_mln_accu_histo_histo3d.cc -scribo_sandbox_green_ok_mln_img_path_SOURCES = scribo_sandbox_green_ok_mln_img_path.cc -scribo_src_afp_components_SOURCES = scribo_src_afp_components.cc -scribo_src_afp_link_SOURCES = scribo_src_afp_link.cc -scribo_src_afp_regroup_SOURCES = scribo_src_afp_regroup.cc scribo_subsampling_bilinear_SOURCES = scribo_subsampling_bilinear.cc scribo_subsampling_integral_SOURCES = scribo_subsampling_integral.cc scribo_subsampling_integral_single_image_SOURCES = scribo_subsampling_integral_single_image.cc @@ -616,7 +418,7 @@ 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_nepomuk_text_extraction_SOURCES = scribo_toolchain_nepomuk_text_extraction.cc scribo_toolchain_text_in_doc_SOURCES = scribo_toolchain_text_in_doc.cc scribo_upsampling_bs2x_SOURCES = scribo_upsampling_bs2x.cc scribo_upsampling_eagle_SOURCES = scribo_upsampling_eagle.cc + -- 1.5.6.5

14 years, 10 months

last-svn-commit-444-g324908f Setup conditional unit-tests in Milena.

by Guillaume Lazzara

* tests/unit_test/Makefile.am (regen-am): Update the use of build_unit_test.sh. (EXTRA_DIST): Add cond_tests_* files. * tests/unit_test/cond_tests_cfitsio, * tests/unit_test/cond_tests_gdcm, * tests/unit_test/cond_tests_magickxx, * tests/unit_test/cond_tests_tiff: New. * tests/unit_test/disabled_tests: Remove some conditional tests. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 17 ++++++ milena/tests/unit_test/Makefile.am | 16 ++++-- milena/tests/unit_test/cond_tests_cfitsio | 2 + milena/tests/unit_test/cond_tests_gdcm | 3 + milena/tests/unit_test/cond_tests_magickxx | 3 + milena/tests/unit_test/cond_tests_tiff | 2 + milena/tests/unit_test/disabled_tests | 10 ---- milena/tests/unit_test/unit-tests.mk | 76 +++++++++++++++++++++++++--- 8 files changed, 108 insertions(+), 21 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_cfitsio create mode 100644 milena/tests/unit_test/cond_tests_gdcm create mode 100644 milena/tests/unit_test/cond_tests_magickxx create mode 100644 milena/tests/unit_test/cond_tests_tiff diff --git a/milena/ChangeLog b/milena/ChangeLog index 15a205c..967d9bb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Setup conditional unit-tests in Milena. + + * tests/unit_test/Makefile.am + (regen-am): Update the use of build_unit_test.sh. + (EXTRA_DIST): Add cond_tests_* files. + + * tests/unit_test/cond_tests_cfitsio, + * tests/unit_test/cond_tests_gdcm, + * tests/unit_test/cond_tests_magickxx, + * tests/unit_test/cond_tests_tiff: New. + + * tests/unit_test/disabled_tests: Remove some conditional tests. + + * tests/unit_test/unit-tests.mk: Regen. + 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> Small changes in Milena. diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 7327468..9a6d644 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -17,7 +17,13 @@ include $(top_srcdir)/milena/tests/tests.mk -EXTRA_DIST = disabled_tests +COND_TESTS = cond_tests_cfitsio \ + cond_tests_gdcm \ + cond_tests_magickxx \ + cond_tests_tiff + +EXTRA_DIST = disabled_tests \ + $(COND_TESTS) # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk @@ -26,7 +32,8 @@ regen-am: && ./build-aux/build_unit_test.sh \ milena/mln \ milena/tests/unit_test \ - milena/tests/unit_test/disabled_tests + milena/tests/unit_test/disabled_tests \ + mln # FIXME: Change build_unit_test.sh so that the action looks like this: # @@ -34,12 +41,13 @@ regen-am: # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests +$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS) cd $(top_srcdir) \ && ./build-aux/build_unit_test.sh \ milena/mln \ milena/tests/unit_test \ - milena/tests/unit_test/disabled_tests + milena/tests/unit_test/disabled_tests \ + mln include $(srcdir)/unit-tests.mk diff --git a/milena/tests/unit_test/cond_tests_cfitsio b/milena/tests/unit_test/cond_tests_cfitsio new file mode 100644 index 0000000..2edbb64 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_cfitsio @@ -0,0 +1,2 @@ +mln/io/fits/all.hh +mln/io/fits/load.hh diff --git a/milena/tests/unit_test/cond_tests_gdcm b/milena/tests/unit_test/cond_tests_gdcm new file mode 100644 index 0000000..dae71b4 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_gdcm @@ -0,0 +1,3 @@ +mln/io/dicom/all.hh +mln/io/dicom/load.hh +mln/io/dicom/get_header.hh diff --git a/milena/tests/unit_test/cond_tests_magickxx b/milena/tests/unit_test/cond_tests_magickxx new file mode 100644 index 0000000..2d9ff23 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_magickxx @@ -0,0 +1,3 @@ +mln/io/magick/all.hh +mln/io/magick/load.hh +mln/io/magick/save.hh diff --git a/milena/tests/unit_test/cond_tests_tiff b/milena/tests/unit_test/cond_tests_tiff new file mode 100644 index 0000000..9d052ea --- /dev/null +++ b/milena/tests/unit_test/cond_tests_tiff @@ -0,0 +1,2 @@ +mln/io/tiff/all.hh +mln/io/tiff/load.hh diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index 3943e70..5fd991c 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -28,16 +28,6 @@ mln/debug/iota.spe.hh mln/debug/println.spe.hh mln/debug/println_with_border.spe.hh mln/histo/compute.spe.hh -mln/io/dicom/all.hh -mln/io/dicom/load.hh -mln/io/fits/all.hh -mln/io/fits/load.hh -mln/io/magick/all.hh -mln/io/magick/load.hh -mln/io/magick/save.hh -mln/io/tiff/all.hh -mln/io/tiff/load.hh -mln/io/tiff/save.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 332c90b..bc0b6df 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1,7 +1,73 @@ ## Generated by ./build-aux/build_unit_test.sh, do not modify. -check_PROGRAMS = \ -mln_+trash_erosion_tolerant \ +check_PROGRAMS = + +# Starting a conditional unit test list. +if HAVE_CFITSIO +check_PROGRAMS += \ +mln_io_fits_all \ +mln_io_fits_load + +mln_io_fits_all_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_fits_all_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} +mln_io_fits_all_SOURCES = mln_io_fits_all.cc +mln_io_fits_load_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} +mln_io_fits_load_SOURCES = mln_io_fits_load.cc +endif HAVE_CFITSIO + +# Starting a conditional unit test list. +if HAVE_GDCM +check_PROGRAMS += \ +mln_io_dicom_all \ +mln_io_dicom_load \ +mln_io_dicom_get_header + +mln_io_dicom_all_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_all_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} +mln_io_dicom_all_SOURCES = mln_io_dicom_all.cc +mln_io_dicom_load_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_load_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} +mln_io_dicom_load_SOURCES = mln_io_dicom_load.cc +mln_io_dicom_get_header_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_dicom_get_header_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} +mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc +endif HAVE_GDCM + +# Starting a conditional unit test list. +if HAVE_MAGICKXX +check_PROGRAMS += \ +mln_io_magick_all \ +mln_io_magick_load \ +mln_io_magick_save + +mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_all_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +mln_io_magick_all_SOURCES = mln_io_magick_all.cc +mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_load_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +mln_io_magick_load_SOURCES = mln_io_magick_load.cc +mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_magick_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +mln_io_magick_save_SOURCES = mln_io_magick_save.cc +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. +if HAVE_TIFF +check_PROGRAMS += \ +mln_io_tiff_all \ +mln_io_tiff_load + +mln_io_tiff_all_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_tiff_all_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} +mln_io_tiff_all_SOURCES = mln_io_tiff_all.cc +mln_io_tiff_load_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS} +mln_io_tiff_load_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} +mln_io_tiff_load_SOURCES = mln_io_tiff_load.cc +endif HAVE_TIFF + +# Starting non-conditional unit test list. +check_PROGRAMS += \ mln_accu_all \ mln_accu_center \ mln_accu_compute \ @@ -671,7 +737,6 @@ mln_io_all \ mln_io_cloud_all \ mln_io_cloud_load \ mln_io_cloud_save \ -mln_io_dicom_get_header \ mln_io_dump_all \ mln_io_dump_get_header \ mln_io_dump_load \ @@ -1308,7 +1373,6 @@ mln_world_all \ mln_world_binary_2d_all \ mln_world_binary_2d_enlarge \ mln_world_binary_2d_projected_histo \ -mln_world_binary_2d_reduce \ mln_world_binary_2d_subsample \ mln_world_inter_pixel_all \ mln_world_inter_pixel_compute \ @@ -1326,7 +1390,6 @@ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels -mln_+trash_erosion_tolerant_SOURCES = mln_+trash_erosion_tolerant.cc mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc mln_accu_compute_SOURCES = mln_accu_compute.cc @@ -1996,7 +2059,6 @@ mln_io_all_SOURCES = mln_io_all.cc mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc -mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc mln_io_dump_all_SOURCES = mln_io_dump_all.cc mln_io_dump_get_header_SOURCES = mln_io_dump_get_header.cc mln_io_dump_load_SOURCES = mln_io_dump_load.cc @@ -2633,7 +2695,6 @@ mln_world_all_SOURCES = mln_world_all.cc mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc mln_world_binary_2d_enlarge_SOURCES = mln_world_binary_2d_enlarge.cc mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc -mln_world_binary_2d_reduce_SOURCES = mln_world_binary_2d_reduce.cc mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc mln_world_inter_pixel_compute_SOURCES = mln_world_inter_pixel_compute.cc @@ -2650,3 +2711,4 @@ mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc + -- 1.5.6.5

14 years, 10 months

last-svn-commit-443-g5ee999b build-aux/build_unit_test.sh: Add support for conditional unit-tests.

by Guillaume Lazzara

--- ChangeLog | 5 + build-aux/build_unit_test.sh | 192 +++++++++++++++++++++++++++++++++--------- 2 files changed, 157 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec948cc..dfa1ef6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * build-aux/build_unit_test.sh: Add support for conditional + unit-tests. + 2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Improve configure's outputs for external library diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 8080ef2..15310ff 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory # (LRDE) # # This file is part of Olena. @@ -17,6 +17,25 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. +## Build a list of unit tests. +## +## Conditional tests (external dependencies) can be handled +## automaticaly. For each dependency, a file named +## "cond_tests_{DEPS}" must contain the list of files which need the +## dependency. If a test needs more than one dependency, several +## dependency names can be used in the file name. +## +## Ex: cond_tests_qt_tesseract +## +## All the tests listed in this file will need both qt and tesseract +## to be compiled. +## +## "cond_tests_*" files must be created in the directory where +## unit-test.mk is generated (usually the unit-tests directory). +## +## WARNING: don't forget to add "cond_tests_*" files in the COND_TESTS +## variable in the right Makefile.am. + ## FIXME: Don't use `echo -n', as echo's options are not portable. ## ## http://www.gnu.org/software/autoconf/manual/html_node/Limitations-of-Builti… @@ -25,44 +44,38 @@ ## would be to only emit lines ended with newlines. ECHO_N=printf -# Use the C locale to have a deterministic sort. -export LC_ALL=C -test $# -eq 3 || { echo "Usage: $0 <scanned dir> <output_dir> <disabled_tests>" && exit 1; } +add_targets() +{ + HEADERS_="$1" + output_dir="$2" + output="$3" + IFDEF="$4" -scanned_dir=$1 -output_dir=$2 -disabled_tests=$3 + if ! (test -z "$IFDEF"); then + echo "# Starting a conditional unit test list." >> "$output" + else + echo "# Starting non-conditional unit test list." >> "$output" + fi -## FIXME: We do not include these directories -## -## mln/io/dicom -## mln/io/fits -## mln/io/magick -## mln/io/tiff -## -## because they contain files depending on optional (external) -## libraries. We should test them conditionally. -HEADERS=$(find $scanned_dir -type f -name "*.hh" \ - | sort \ - | sed -e 's/.*\/mln\/$.*$/mln\/\1/g' | sed 's/\.\.\/\.\.\///g' \ - | comm -23 - "$disabled_tests") + # Start conditions if necessary -output="$output_dir/unit-tests.mk" + # Construct a list of conditions in reverse order to write valid + # endif further. + IFDEF_TMP="" + for i in $IFDEF; do + echo "if HAVE_$i" >>"$output" + IFDEF_TMP="$i $IFDEF_TMP" + done + IFDEF="$IFDEF_TMP" -rm -f "$output" -rm -f mln_*.cc + $ECHO_N "check_PROGRAMS += " >>"$output" -# Build unit-tests.mk. -echo "## Generated by $0, do not modify." >"$output" -echo >>"$output" -$ECHO_N "check_PROGRAMS = " >>"$output" - -for i in $HEADERS; do - FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` + for i in $HEADERS_; do + FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` # Build .cc. - cat > $output_dir/$FILE_CC << EOF + cat > $output_dir/$FILE_CC << EOF // Unit test for $i. // Generated by $0, do not modify. @@ -77,16 +90,115 @@ int main() EOF # Build unit-tests.mk. - TARGET=`echo "${FILE_CC}" | sed 's/\.cc//'` - echo " \\" >>"$output" - $ECHO_N "${TARGET}" >>"$output" + TARGET=`echo "${FILE_CC}" | sed 's/\.cc//'` + echo " \\" >>"$output" + $ECHO_N "${TARGET}" >>"$output" + done + + # Build "$output". + echo "" >>"$output" + echo "" >>"$output" + for i in $HEADERS_; do + FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` + NAME=`echo $FILE_CC | sed 's/\.cc//g'` + + # Write specific flags if there are dependencies. + if ! (test -z "$IFDEF"); then + cppflags="${NAME}_CPPFLAGS=" + ldflags="${NAME}_LDFLAGS=" + for i in $IFDEF; do + cppflags="${cppflags} \${${i}_CPPFLAGS} " + ldflags="${ldflags} \${${i}_LDFLAGS} " + done + echo "$cppflags \${AM_CPPFLAGS}" >>"$output" + echo "$ldflags \${AM_LDFLAGS}" >>"$output" + fi + + echo "${NAME}_SOURCES = $FILE_CC" >>"$output" + done + + # End conditions if necessary + for i in $IFDEF; do + echo "endif HAVE_$i" >>"$output" + done + + echo "" >>"$output" +} + + + +# Use the C locale to have a deterministic sort. +export LC_ALL=C + +test $# -eq 4 || { echo "Usage: $0 <scanned dir> <output_dir> <disabled_tests> <base include dir>" && exit 1; } + +scanned_dir=$1 +output_dir=$2 +disabled_tests=$3 +base_inc_dir=$4 + +# Create a list of tests to be disabled or considered as conditional. +ignored_list="$output_dir/ignored_list.tmp" +cat "$disabled_tests" > $ignored_list +COND_TESTS=$(find $output_dir -type f -name "cond_tests_*" | sort) +for f in $COND_TESTS; do + cat "$f" >> "$ignored_list" done +cat "$ignored_list" | sort > "$ignored_list.tmp" +mv -f "$ignored_list.tmp" "$ignored_list" -# Build "$output". -echo "" >>"$output" +HEADERS=$(find $scanned_dir -type f -name "*.hh" \ + | sort \ + | sed -e "s/.*\/${base_inc_dir}\/$.*$/${base_inc_dir}\/\1/g" \ + | sed 's/\.\.\/\.\.\///g' \ + | comm -23 - "$ignored_list") + +output="$output_dir/unit-tests.mk" + +# Cleanup previously generated data. +rm -f "$output" +rm -f ${base_inc_dir}_*.cc + +# Build unit-tests.mk. +echo "## Generated by $0, do not modify." > "$output" +echo >>"$output" + +echo "check_PROGRAMS =" >>"$output" echo "" >>"$output" -for i in $HEADERS; do - FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` - NAME=`echo $FILE_CC | sed 's/\.cc//g'` - echo "${NAME}_SOURCES = $FILE_CC" >>"$output" + + +#----------------------------------- +# Insert lists of conditional tests. +#----------------------------------- + +for f in $COND_TESTS; do + # Generate the list of conditions. + fpostfix="`echo \"$f\" | sed -e 's/.*\/cond_tests_//g'`_" + i=1 + COND_LIST="" + while true; do + name=`echo $fpostfix | cut -s -d '_' -f $i \ + | tr "[:lower:]" "[:upper:]"` + i=$(($i+1)) + if (test -z "$name"); then + break; + fi + COND_LIST="${COND_LIST} $name" + done + + COND_HEADERS=$(cat $f) + + # Writing conditional targets + add_targets "$COND_HEADERS" "$output_dir" "$output" "$COND_LIST" done + + +#------------------------------------- +# Insert list of non-conditional tests +#------------------------------------- + +add_targets "$HEADERS" "$output_dir" "$output" "" + + +# Remove temporary files +rm -f "$ignored_list" \ No newline at end of file -- 1.5.6.5

14 years, 10 months

last-svn-commit-442-gaf62462 tests/unit_test/disabled_tests: Update list of disabled tests.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/disabled_tests | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2cb39ec..7f1f52d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/disabled_tests: Update list of disabled tests. + +2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new rotation tool. * src/preprocessing/Makefile.am: Add a new target. diff --git a/scribo/tests/unit_test/disabled_tests b/scribo/tests/unit_test/disabled_tests index 9804c82..9d84198 100644 --- a/scribo/tests/unit_test/disabled_tests +++ b/scribo/tests/unit_test/disabled_tests @@ -1,5 +1,4 @@ -scribo/demo/src/mainwindow.hh scribo/primitive/link/compute_several.hh scribo/primitive/link/internal/find_several_links.hh scribo/primitive/link/with_several_right_links_overlap.hh -scribo/text/recognition.hh +scribo/primitive/link/with_several_right_closest_links.hh -- 1.5.6.5

14 years, 10 months

last-svn-commit-441-g8fed6fb Add a new rotation tool.

by Guillaume Lazzara

* src/preprocessing/Makefile.am: Add a new target. * src/preprocessing/rotate.cc: New. --- scribo/ChangeLog | 8 ++++++ scribo/src/preprocessing/Makefile.am | 9 ++++++ .../src/preprocessing/{subsample.cc => rotate.cc} | 27 ++++++++++--------- 3 files changed, 31 insertions(+), 13 deletions(-) copy scribo/src/preprocessing/{subsample.cc => rotate.cc} (80%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9882ea6..2cb39ec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new rotation tool. + + * src/preprocessing/Makefile.am: Add a new target. + + * src/preprocessing/rotate.cc: New. + +2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove deprecated references to object_image. * core/object_image.hh: Remove. diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 5dabcac..0c6e00a 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -41,6 +41,15 @@ if HAVE_MAGICKXX $(MAGICKXX_LDFLAGS) \ -lpthread + bin_PROGRAMS += rotate + rotate_SOURCES = rotate.cc + rotate_CPPFLAGS = $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) + + rotate_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ + -lpthread + bin_PROGRAMS += rotate_90 rotate_90_SOURCES = rotate_90.cc rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/scribo/src/preprocessing/subsample.cc b/scribo/src/preprocessing/rotate.cc similarity index 80% copy from scribo/src/preprocessing/subsample.cc copy to scribo/src/preprocessing/rotate.cc index fde31e0..2910684 100644 --- a/scribo/src/preprocessing/subsample.cc +++ b/scribo/src/preprocessing/rotate.cc @@ -24,13 +24,13 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/core/alias/neighb2d.hh> +#include <mln/value/rgb8.hh> #include <mln/io/magick/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/subsampling/antialiased.hh> +#include <mln/geom/rotate.hh> -#include <mln/value/rgb8.hh> +#include <mln/literal/black.hh> #include <scribo/debug/usage.hh> @@ -38,30 +38,31 @@ const char *args_desc[][2] = { { "input.*", "An image." }, - { "ratio", "Scale ratio." }, - { "output.ppm", "A color image." }, + { "output.ppm", "A rotated image." }, + { "angle", "The rotation angle." }, {0, 0} }; + int main(int argc, char *argv[]) { using namespace mln; if (argc != 4) return scribo::debug::usage(argv, - "Subsample.", - "input.* ratio output.ppm", + "Rotation of an image from an arbitrary " + "angle.", + "input.* output.ppm angle", args_desc); - trace::entering("main"); typedef image2d<value::rgb8> I; - I input; - io::magick::load(input, argv[1]); + I ima; + io::magick::load(ima, argv[1]); - unsigned ratio = atoi(argv[2]); - io::ppm::save(mln::subsampling::antialiased(input, ratio), argv[3]); + image2d<value::rgb8> + out = mln::geom::rotate(ima, atof(argv[3]), literal::black); - trace::exiting("main"); + io::ppm::save(out, argv[2]); } -- 1.5.6.5

14 years, 10 months

last-svn-commit-440-gcb1501f Remove deprecated references to object_image.

by Guillaume Lazzara

* core/object_image.hh: Remove. * filter/object_groups_size_ratio.hh, * filter/object_links_bbox_w_ratio.hh, * filter/object_links_left_aligned.hh, * filter/object_links_right_aligned.hh, * primitive/extract/lines_h_thick_and_single.hh, * primitive/extract/lines_v_thick_and_single.hh, * primitive/link/internal/find_several_links.hh, * primitive/link/internal/link_several_dmax_base.hh, * primitive/link/with_single_up_link.hh, * src/debug/show_links_left_right_links_validation.cc, * src/primitive/find/find_discontinued_lines.cc, * src/primitive/find/find_pattern_lines.cc, * tests/filter/small_and_large_bboxes.cc, * src/primitive/group/group_from_double_link_filter_non_aligned.cc: Remove include of object_image.hh. --- scribo/ChangeLog | 22 +++++++++++ scribo/core/object_image.hh | 38 -------------------- scribo/filter/object_groups_size_ratio.hh | 1 - scribo/filter/object_links_bbox_w_ratio.hh | 1 - scribo/filter/object_links_left_aligned.hh | 1 - scribo/filter/object_links_right_aligned.hh | 1 - .../primitive/extract/lines_h_thick_and_single.hh | 1 - .../primitive/extract/lines_v_thick_and_single.hh | 1 - .../primitive/link/internal/find_several_links.hh | 4 +- .../link/internal/link_several_dmax_base.hh | 1 - scribo/primitive/link/with_single_up_link.hh | 1 - .../show_links_left_right_links_validation.cc | 1 - .../src/primitive/find/find_discontinued_lines.cc | 1 - scribo/src/primitive/find/find_pattern_lines.cc | 1 - .../src/primitive/group/group_from_double_link.cc | 1 - scribo/tests/filter/small_and_large_bboxes.cc | 3 -- 16 files changed, 24 insertions(+), 55 deletions(-) delete mode 100644 scribo/core/object_image.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7197f41..9882ea6 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,27 @@ 2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove deprecated references to object_image. + + * core/object_image.hh: Remove. + + * filter/object_groups_size_ratio.hh, + * filter/object_links_bbox_w_ratio.hh, + * filter/object_links_left_aligned.hh, + * filter/object_links_right_aligned.hh, + * primitive/extract/lines_h_thick_and_single.hh, + * primitive/extract/lines_v_thick_and_single.hh, + * primitive/link/internal/find_several_links.hh, + * primitive/link/internal/link_several_dmax_base.hh, + * primitive/link/with_single_up_link.hh, + * src/debug/show_links_left_right_links_validation.cc, + * src/primitive/find/find_discontinued_lines.cc, + * src/primitive/find/find_pattern_lines.cc, + * tests/filter/small_and_large_bboxes.cc, + * src/primitive/group/group_from_double_link_filter_non_aligned.cc: + Remove include of object_image.hh. + +2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup Makefiles. * src/Makefile.am: Disable tests and remove deprecated ones. diff --git a/scribo/core/object_image.hh b/scribo/core/object_image.hh deleted file mode 100644 index 7f672b2..0000000 --- a/scribo/core/object_image.hh +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#ifndef SCRIBO_CORE_OBJECT_IMAGE_HH -# define SCRIBO_CORE_OBJECT_IMAGE_HH - -/// \file -/// -/// FIXME. - -# include <mln/core/image/imorph/labeled_image.hh> - -# define object_image(L) \ - mln::labeled_image<L> - -#endif // ! SCRIBO_CORE_OBJECT_IMAGE_HH diff --git a/scribo/filter/object_groups_size_ratio.hh b/scribo/filter/object_groups_size_ratio.hh index 94d9b1b..fa59e7f 100644 --- a/scribo/filter/object_groups_size_ratio.hh +++ b/scribo/filter/object_groups_size_ratio.hh @@ -35,7 +35,6 @@ # include <scribo/core/macros.hh> # include <scribo/core/object_groups.hh> -# include <scribo/core/object_image.hh> namespace scribo { diff --git a/scribo/filter/object_links_bbox_w_ratio.hh b/scribo/filter/object_links_bbox_w_ratio.hh index 0bb373f..215413c 100644 --- a/scribo/filter/object_links_bbox_w_ratio.hh +++ b/scribo/filter/object_links_bbox_w_ratio.hh @@ -39,7 +39,6 @@ # include <scribo/core/macros.hh> # include <scribo/core/object_links.hh> -# include <scribo/core/object_image.hh> # include <scribo/filter/object_links_bbox_ratio.hh> namespace scribo diff --git a/scribo/filter/object_links_left_aligned.hh b/scribo/filter/object_links_left_aligned.hh index 059b423..82d4185 100644 --- a/scribo/filter/object_links_left_aligned.hh +++ b/scribo/filter/object_links_left_aligned.hh @@ -38,7 +38,6 @@ # include <scribo/core/macros.hh> # include <scribo/core/object_links.hh> -# include <scribo/core/object_image.hh> # include <scribo/filter/object_links_non_aligned_simple.hh> diff --git a/scribo/filter/object_links_right_aligned.hh b/scribo/filter/object_links_right_aligned.hh index dfb06c7..07ca309 100644 --- a/scribo/filter/object_links_right_aligned.hh +++ b/scribo/filter/object_links_right_aligned.hh @@ -37,7 +37,6 @@ # include <scribo/core/macros.hh> # include <scribo/core/object_links.hh> -# include <scribo/core/object_image.hh> # include <scribo/filter/object_links_non_aligned_simple.hh> diff --git a/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/primitive/extract/lines_h_thick_and_single.hh index 551e5d8..dd495a4 100644 --- a/scribo/primitive/extract/lines_h_thick_and_single.hh +++ b/scribo/primitive/extract/lines_h_thick_and_single.hh @@ -38,7 +38,6 @@ # include <mln/morpho/opening/structural.hh> -# include <scribo/core/object_image.hh> # include <scribo/core/macros.hh> # include <scribo/primitive/extract/lines_h_thick.hh> diff --git a/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/primitive/extract/lines_v_thick_and_single.hh index c19ba5a..44f7a9e 100644 --- a/scribo/primitive/extract/lines_v_thick_and_single.hh +++ b/scribo/primitive/extract/lines_v_thick_and_single.hh @@ -38,7 +38,6 @@ # include <mln/morpho/opening/structural.hh> -# include <scribo/core/object_image.hh> # include <scribo/core/macros.hh> # include <scribo/primitive/extract/lines_v_thick.hh> diff --git a/scribo/primitive/link/internal/find_several_links.hh b/scribo/primitive/link/internal/find_several_links.hh index 8cca3bd..4d9404e 100644 --- a/scribo/primitive/link/internal/find_several_links.hh +++ b/scribo/primitive/link/internal/find_several_links.hh @@ -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. // @@ -42,7 +43,6 @@ # include <scribo/core/concept/link_functor.hh> # include <scribo/core/tag/anchor.hh> -# include <scribo/core/object_image.hh> # include <scribo/core/object_links.hh> diff --git a/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/primitive/link/internal/link_several_dmax_base.hh index 3b4ec4b..e5b9ce2 100644 --- a/scribo/primitive/link/internal/link_several_dmax_base.hh +++ b/scribo/primitive/link/internal/link_several_dmax_base.hh @@ -43,7 +43,6 @@ # include <scribo/core/macros.hh> # include <scribo/core/tag/anchor.hh> -# include <scribo/core/object_image.hh> # include <scribo/core/object_links.hh> # include <scribo/primitive/link/internal/find_link.hh> diff --git a/scribo/primitive/link/with_single_up_link.hh b/scribo/primitive/link/with_single_up_link.hh index 4062275..eccf1fb 100644 --- a/scribo/primitive/link/with_single_up_link.hh +++ b/scribo/primitive/link/with_single_up_link.hh @@ -44,7 +44,6 @@ # include <scribo/core/macros.hh> -# include <scribo/core/object_image.hh> # include <scribo/core/object_links.hh> # include <scribo/primitive/link/internal/find_link.hh> diff --git a/scribo/src/debug/show_links_left_right_links_validation.cc b/scribo/src/debug/show_links_left_right_links_validation.cc index e022fa5..450232a 100644 --- a/scribo/src/debug/show_links_left_right_links_validation.cc +++ b/scribo/src/debug/show_links_left_right_links_validation.cc @@ -38,7 +38,6 @@ #include <mln/value/label_16.hh> #include <scribo/core/object_links.hh> -#include <scribo/core/object_image.hh> #include <scribo/primitive/extract/components.hh> diff --git a/scribo/src/primitive/find/find_discontinued_lines.cc b/scribo/src/primitive/find/find_discontinued_lines.cc index 244cae5..eec579a 100644 --- a/scribo/src/primitive/find/find_discontinued_lines.cc +++ b/scribo/src/primitive/find/find_discontinued_lines.cc @@ -35,7 +35,6 @@ #include <scribo/debug/usage.hh> -#include <scribo/core/object_image.hh> #include <scribo/primitive/extract/lines_h_discontinued.hh> #include <scribo/primitive/extract/lines_v_discontinued.hh> diff --git a/scribo/src/primitive/find/find_pattern_lines.cc b/scribo/src/primitive/find/find_pattern_lines.cc index 540328b..88d22c0 100644 --- a/scribo/src/primitive/find/find_pattern_lines.cc +++ b/scribo/src/primitive/find/find_pattern_lines.cc @@ -35,7 +35,6 @@ #include <scribo/debug/usage.hh> -#include <scribo/core/object_image.hh> #include <scribo/primitive/extract/lines_h_pattern.hh> #include <scribo/primitive/extract/lines_v_pattern.hh> diff --git a/scribo/src/primitive/group/group_from_double_link.cc b/scribo/src/primitive/group/group_from_double_link.cc index 00c68df..39b1bb9 100644 --- a/scribo/src/primitive/group/group_from_double_link.cc +++ b/scribo/src/primitive/group/group_from_double_link.cc @@ -36,7 +36,6 @@ #include <mln/value/label_16.hh> #include <scribo/core/object_links.hh> -#include <scribo/core/object_image.hh> #include <scribo/primitive/extract/components.hh> #include <scribo/primitive/group/apply.hh> diff --git a/scribo/tests/filter/small_and_large_bboxes.cc b/scribo/tests/filter/small_and_large_bboxes.cc index adae46f..653a8ca 100644 --- a/scribo/tests/filter/small_and_large_bboxes.cc +++ b/scribo/tests/filter/small_and_large_bboxes.cc @@ -32,9 +32,6 @@ #include <mln/value/label_16.hh> #include <mln/io/pbm/load.hh> #include <mln/literal/colors.hh> - -#include <scribo/core/object_image.hh> - #include <scribo/primitive/extract/components.hh> #include <scribo/primitive/group/apply.hh> #include <scribo/primitive/link/with_single_left_link.hh> -- 1.5.6.5

14 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches