* 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@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@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@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