1. 11 Aug, 2010 1 commit
  2. 10 Aug, 2010 20 commits
    • Guillaume Lazzara's avatar
      Fix tests in Milena. · f7bc7e13
      Guillaume Lazzara authored
      	* tests/geom/rotate.cc: Fix test.
      
      	* mln/labeling/blobs_and_compute.hh: Add comments.
      
      	* mln/labeling/flat_zones.hh: Add missing members to functors.
      
      	* tests/labeling/blobs_and_compute.cc: Fix return type.
      
      	* tests/labeling/flat_zones.cc,
      	* tests/labeling/foreground.cc: Fix functor template parameters.
      
      	* tests/labeling/relabel.cc: The number of components is not
      	updated anymore.
      
      	* tests/labeling/colorize.cc: Fix reference according to last
      	changes in labeling::colorize routine
      
      	* mln/core/point.hh: Add mln:: namespace prefix.
      f7bc7e13
    • Guillaume Lazzara's avatar
      Update READMEs. · 3c2ce9bb
      Guillaume Lazzara authored
      	* README,
      	* src/README: Add few details about the content.
      3c2ce9bb
    • Guillaume Lazzara's avatar
      Update Scribo include paths. · d34c8dd4
      Guillaume Lazzara authored
      	* 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.
      d34c8dd4
    • Guillaume Lazzara's avatar
      Move Scribo includes in a specific directory. · d5c383ad
      Guillaume Lazzara authored
      	* 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.
      d5c383ad
    • Guillaume Lazzara's avatar
      59987833
    • Guillaume Lazzara's avatar
      6bf37e85
    • Guillaume Lazzara's avatar
      Setup conditional unit-tests in Scribo. · 0545aad9
      Guillaume Lazzara authored
      	* 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.
      0545aad9
    • Guillaume Lazzara's avatar
      Setup conditional unit-tests in Milena. · 324908fe
      Guillaume Lazzara authored
      	* 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.
      324908fe
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Add a new rotation tool. · 8fed6fb9
      Guillaume Lazzara authored
      	* src/preprocessing/Makefile.am: Add a new target.
      
      	* src/preprocessing/rotate.cc: New.
      8fed6fb9
    • Guillaume Lazzara's avatar
      Remove deprecated references to object_image. · cb1501f5
      Guillaume Lazzara authored
      	* 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.
      cb1501f5
    • Guillaume Lazzara's avatar
      Cleanup Makefiles. · 4aec8b7d
      Guillaume Lazzara authored
      	* src/Makefile.am: Disable tests and remove deprecated ones.
      
      	* src/preprocessing/Makefile.am: Use MAGICKXX_* flags.
      4aec8b7d
    • Guillaume Lazzara's avatar
      Cleanup and improve text recognition. · 6626ff4c
      Guillaume Lazzara authored
      	* src/text_recognition_in_picture.cc: Use new routines. Cleanup
      	useless comments. Use a height ratio filter to improve OCR
      	results.
      6626ff4c
    • Guillaume Lazzara's avatar
      Cleanup and make use of the new routines. · 5a13b71e
      Guillaume Lazzara authored
      	* src/text_in_picture.cc: Here.
      5a13b71e
    • Guillaume Lazzara's avatar
      Make use of the new component_set interface. · 8bd91269
      Guillaume Lazzara authored
      	* filter/internal/compute.hh,
      	* filter/objects_small.hh,
      	* filter/objects_thick.hh,
      	* filter/objects_thin.hh,
      	* primitive/group/from_double_link.hh,
      	* primitive/link/compute_several.hh,
      	* table/align_lines_horizontaly.hh,
      	* table/erase.hh,
      	* table/extract.hh: Here.
      8bd91269
    • Guillaume Lazzara's avatar
      Fix compilation of Scribo tools. · c05d4df5
      Guillaume Lazzara authored
      	* src/debug/show_links_bbox_overlap.cc,
      	* src/debug/show_links_center_aligned.cc,
      	* src/debug/show_links_non_h_aligned.cc,
      	* src/debug/show_links_several_right.cc,
      	* src/debug/show_links_several_right_overlap.cc,
      	* src/debug/show_links_single_down.cc,
      	* src/debug/show_links_single_down_left_aligned.cc,
      	* src/debug/show_links_single_down_right_aligned.cc,
      	* src/debug/show_links_single_left.cc,
      	* src/debug/show_links_single_left_dmax_ratio.cc,
      	* src/debug/show_links_single_right.cc,
      	* src/debug/show_links_single_right_dmax_ratio.cc,
      	* src/debug/show_links_single_up.cc,
      	* src/debug/show_links_single_up_left_aligned.cc,
      	* src/debug/show_links_single_up_right_aligned.cc,
      	* src/debug/show_objects_large.cc,
      	* src/debug/show_objects_large_small.cc,
      	* src/debug/show_objects_small.cc,
      	* src/debug/show_objects_thick.cc,
      	* src/debug/show_objects_thin.cc,
      	* src/filter/objects_large.cc,
      	* src/filter/objects_small.cc,
      	* src/filter/objects_thick.cc,
      	* src/filter/objects_thin.cc,
      	* src/filter/objects_with_holes.cc,
      	* src/filter/objects_with_holes_pgm.cc,
      	* src/preprocessing/preprocess.cc,
      	* src/preprocessing/split_bg_fg.cc,
      	* src/preprocessing/unskew.cc,
      	* src/primitive/extract/extract_discontinued_hlines.cc,
      	* src/primitive/extract/extract_discontinued_lines.cc,
      	* src/primitive/extract/extract_discontinued_vlines.cc,
      	* src/primitive/extract/extract_thick_hlines.cc,
      	* src/primitive/extract/extract_thick_vlines.cc,
      	* src/primitive/find/find_discontinued_lines.cc,
      	* src/primitive/find/find_single_lines.cc,
      	* src/primitive/find/find_thick_and_single_lines.cc,
      	* src/primitive/find/find_thick_lines.cc,
      	* src/primitive/group/Makefile.am,
      	* src/primitive/group/group_from_double_link.cc,
      	* src/primitive/group/group_from_double_several_links.cc,
      	* src/primitive/group/group_from_several_left_links.cc,
      	* src/primitive/group/group_from_single_link.cc,
      	* src/table/erase.cc,
      	* src/text/cleantxt.cc: Here.
      c05d4df5
    • Guillaume Lazzara's avatar
      Catch up with the current interface of scribo::debug::usage. · a0961e1c
      Guillaume Lazzara authored
      	* src/debug/show_links_bottom_aligned.cc,
      	* src/debug/show_links_top_aligned.cc,
      	* src/misc/negate.cc,
      	* src/misc/superpose.cc,
      	* src/preprocessing/rotate_90.cc,
      	* src/primitive/extract/lines_pattern.cc,
      	* src/primitive/find/find_pattern_lines.cc,
      	* src/table/extract.cc: Here.
      a0961e1c
    • Guillaume Lazzara's avatar
      Replace the use of object_image with component_set. · 08771586
      Guillaume Lazzara authored
      	* core/erase_objects.hh,
      	* debug/several_links_decision_image.hh,
      	* filter/object_groups_size_ratio.hh,
      	* filter/object_links_bbox_w_ratio.hh,
      	* filter/object_links_center_aligned.hh,
      	* filter/object_links_left_aligned.hh,
      	* filter/object_links_right_aligned.hh,
      	* filter/objects_h_thick.hh,
      	* filter/objects_h_thin.hh,
      	* filter/objects_size_ratio.hh,
      	* filter/objects_v_thick.hh,
      	* filter/objects_v_thin.hh,
      	* primitive/extract/lines_h_thick_and_single.hh,
      	* primitive/extract/lines_v_thick_and_single.hh,
      	* primitive/group/from_graph.hh,
      	* primitive/internal/find_graph_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_single_down_link.hh,
      	* primitive/link/with_single_up_link.hh: Replace the use of
      	object_image with component_set.
      08771586
    • Guillaume Lazzara's avatar
      Small fixes in Scribo. · 8283ce59
      Guillaume Lazzara authored
      	* core/component_info.hh (is_valid): Check the bounding box
      	validity.
      
      	* core/macros.hh: Add a new macro.
      
      	* debug/decision_image.hh: Remove deprecated preconditions and add
      	missing includes.
      
      	* debug/save_linked_bboxes_image.hh: Add the anchor type as
      	argument.
      
      	* draw/bounding_box_links.hh: Add the anchor type as argument and
      	make use of component information.
      
      	* draw/bounding_boxes.hh: Check the component validity.
      
      	* filter/object_links_non_aligned_simple.hh: Update doc.
      
      	* filter/objects_with_holes.hh: Remove debug and timers. Add
      	missing includes.
      
      	* primitive/extract/lines_pattern.hh: Use the window template
      	parameter instead of an exact window type.
      
      	* primitive/link/internal/find_several_links.hh: Update code with
      	new interfaces.
      
      	* primitive/link/internal/link_functor_base.hh
      	(nanchors()): Remove this method.
      	(labeled_image()): Add a const version.
      
      	* primitive/link/internal/link_several_dmax_base.hh
      	(nanchors(), anchors()): New methods.
      	Introduce 'direction_' attribute.
      
      	* debug/several_links_decision_image.hh: Remove deprecated
      	preconditions.
      
      	* src/debug/show_links_single_left.cc: Update include.
      
      	* table/internal/align_lines.hh,
      	* table/rebuild.hh: Make use of component_set structure.
      
      	* debug/text_areas_image.hh,
      	* primitive/regroup/from_single_left_link_wrt_h_ratio.hh: Add
      	missing includes.
      
      	* src/contest/hdibco-2010/Makefile.am: Do not consider this tool
      	as a test anymore.
      8283ce59
  3. 09 Aug, 2010 5 commits
    • Guillaume Lazzara's avatar
      Add missing includes and headers in AFP's dedicated code. · 8559cd77
      Guillaume Lazzara authored
      	* src/afp/components.hh,
      	* src/afp/link.hh,
      	* src/afp/regroup.hh: Add missing includes and headers.
      8559cd77
    • Guillaume Lazzara's avatar
      Add new routines in Scribo. · 6b43c063
      Guillaume Lazzara authored
      	* debug/highlight_text_area.hh,
      	* debug/save_bboxes_image.hh: Add a new overload.
      
      	* debug/save_comp_diff.hh,
      	* debug/text_areas_image.hh,
      	* primitive/regroup/from_single_left_link_wrt_h_ratio.hh: New.
      6b43c063
    • Guillaume Lazzara's avatar
      Remove deprecated files. · 52112930
      Guillaume Lazzara authored
      	* core/internal/link_functor_base.hh,
      	* debug/save_object_diff.hh,
      	* make/text.hh,
      	* primitive/internal/update_link_array.hh,
      	* primitive/link/internal/anchors_3.hh,
      	* primitive/link/internal/link_ms_dmax_base.hh,
      	* primitive/link/internal/link_ms_dmax_ratio_base.hh,
      	* src/pbm_lines_in_doc.cc: Remove.
      52112930
    • Guillaume Lazzara's avatar
      Small changes in Milena. · c3c62f22
      Guillaume Lazzara authored
      	* mln/accu/internal/base.hh,
      	* mln/accu/math/sum.hh: Aesthetic changes.
      
      	* mln/data/paste_without_localization.hh: Add a missing include.
      
      	* mln/geom/rotate.hh: Add a new overload taking a box as argument.
      c3c62f22
    • Guillaume Lazzara's avatar
      Fix many tests in Scribo. · 26c8584d
      Guillaume Lazzara authored
      	* all.hh,
      	* binarization/all.hh,
      	* binarization/internal/first_pass_functor.hh,
      	* convert/from_qimage.hh,
      	* core/tag/component.hh,
      	* core/tag/line.hh,
      	* debug/links_decision_image.hh,
      	* debug/mean_and_base_lines_image.hh,
      	* filter/object_groups_with_holes.hh,
      	* io/xml/save.hh,
      	* make/all.hh,
      	* postprocessing/all.hh,
      	* postprocessing/fill_object_holes.hh,
      	* preprocessing/all.hh,
      	* preprocessing/crop_without_localization.hh,
      	* preprocessing/denoise_bg.hh,
      	* preprocessing/denoise_fg.hh,
      	* preprocessing/deskew.hh,
      	* preprocessing/deskew_crop.hh,
      	* preprocessing/split_bg_fg.hh,
      	* primitive/extract/all.hh,
      	* primitive/extract/lines_h_single.hh,
      	* primitive/extract/lines_pattern.hh,
      	* primitive/extract/lines_v_single.hh,
      	* primitive/group/all.hh,
      	* primitive/internal/all.hh,
      	* primitive/internal/is_link_valid.hh,
      	* primitive/link/all.hh,
      	* primitive/link/internal/compute_anchor.hh,
      	* primitive/link/internal/dmax_functor_base.hh,
      	* primitive/regroup/from_single_left_link.hh,
      	* primitive/remove/separators.hh,
      	* subsampling/bilinear.hh,
      	* text/merging.hh,
      	* toolchain/nepomuk/text_extraction.hh,
      	* upsampling/eagle.hh: Add missing headers in order to fix
      	unit-tests.
      
      	* tests/Makefile.am: Disable "table" directory's tests.
      
      	* tests/core/Makefile.am: Remove object_image test.
      
      	* tests/core/object_image.cc: Remove. Deprecated.
      
      	* tests/filter/objects_with_holes.cc,
      	* tests/filter/small_and_large_bboxes.cc: Write a real test.
      
      	* tests/unit_test/Makefile.am: Add specific flags for unit-tests
      	using tesseract and image magick.
      26c8584d
  4. 04 Aug, 2010 4 commits
  5. 03 Aug, 2010 2 commits
  6. 06 Jul, 2010 6 commits
    • Guillaume Lazzara's avatar
      Small fixes in milena. · 984412ef
      Guillaume Lazzara authored
      	* doc/figures/ima2d-rot-2.ppm: Update generated output.
      
      	* mln/core/alias/window2d.hh: Aesthetic changes in the header.
      
      	* mln/core/point.hh: Add mln:: prefix.
      
      	* headers.mk,
      	* tests/unit_test/unit-tests.mk: Regen.
      984412ef
    • Guillaume Lazzara's avatar
      Compilation related fixes in Scribo. · d4ca44ab
      Guillaume Lazzara authored
      	* core/line_info.hh: Rename hidden as is_hidden.
      
      	* core/object_links.hh: Add duplicate().
      
      	* filter/object_links_bbox_ratio.hh: Use object_links::duplicate.
      
      	* debug/links_decision_image.hh,
      	* src/debug/show_info_median_inter_characters.cc,
      	* src/debug/show_info_x_height.cc,
      	* src/debug/show_links_bbox_h_ratio.cc,
      	* src/debug/show_links_left_right_links_validation.cc: Make
      	compile again.
      
      	* tests/unit_test/unit-tests.mk: Regen.
      
      	* text/extract_lines.hh: Update with latest changes.
      
      	* text/recognition.hh: Check whether a line is hidden or not.
      d4ca44ab
    • Guillaume Lazzara's avatar
      Add new debug routines. · 2ae99ffe
      Guillaume Lazzara authored
      	* debug/char_space_image.hh,
      	* debug/line_info_image.hh: New.
      2ae99ffe
    • Guillaume Lazzara's avatar
      Disable some debug output. · e31b7016
      Guillaume Lazzara authored
      	* text/clean_inplace.hh,
      	* text/recognition.hh: Disable some debug output.
      e31b7016
    • Guillaume Lazzara's avatar
      Add a tool for text recognition in natural pictures. · 9e66b0bc
      Guillaume Lazzara authored
      	scribo/src/Makefile.am: Add a new rule.
      
      	scribo/src/text_recognition_in_picture.cc: New.
      9e66b0bc
    • Guillaume Lazzara's avatar
      Add text::look_like_text_lines. · ee180d60
      Guillaume Lazzara authored
      	* scribo/text/look_like_text_lines.hh: New.
      
      	* scribo/text/merging.hh: Make use of
      	text::look_like_text_lines.
      ee180d60
  7. 01 Jul, 2010 2 commits
    • Guillaume Lazzara's avatar
      Merge branch 'exp/scribo-z' into exp/next · 4d14a475
      Guillaume Lazzara authored
      Conflicts:
      	milena/ChangeLog
      	milena/mln/core/point.hh
      	milena/tests/io/magick/save.cc
      	scribo/Makefile.am
      	scribo/core/def/lbl_type.hh
      	scribo/core/object_image.hh
      	scribo/demo/Makefile.am
      	scribo/src/binarization/sauvola_ms.cc
      	scribo/src/debug/Makefile.am
      	scribo/table/internal/connect_lines.hh
      	scribo/test.cc
      	scribo/tests/toolchain/Makefile.am
      	scribo/text/clean.hh
      4d14a475
    • Guillaume Lazzara's avatar
      Fix a few tests. · fd16f7ee
      Guillaume Lazzara authored
      	* tests/core/other/box_runstart_piter.cc,
      	* tests/geom/translate.cc: Fix test.
      fd16f7ee