[Olena-patches] 4489: Small fixes in Scribo.

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. * estim/object_groups_v_thickness.hh, * primitive/extract/lines_h_thick_and_single.hh, * primitive/extract/lines_v_thick_and_single.hh: Add missing headers. * src/text_in_photo.cc: Fix an undeclared variable. --- scribo/ChangeLog | 13 +++++++++++++ scribo/headers.mk | 16 ++++++++++++++++ .../primitive/extract/lines_h_thick_and_single.hh | 1 - .../primitive/extract/lines_v_thick_and_single.hh | 1 - scribo/src/text_in_photo.cc | 3 ++- scribo/tests/unit_test/unit-tests.mk | 16 ++++++++++++++++ 6 files changed, 47 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 82d8a53..47627e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2009-09-15 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Small fixes in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + + * estim/object_groups_v_thickness.hh, + * primitive/extract/lines_h_thick_and_single.hh, + * primitive/extract/lines_v_thick_and_single.hh: Add missing headers. + + * src/text_in_photo.cc: Fix an undeclared variable. + +2009-09-15 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Add new primitive extraction routines. * primitive/extract/lines_h_thick_and_single.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 8ca14cf..15d9b2a 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -2,6 +2,7 @@ scribodir = $(includedir)/scribo nobase_scribo_HEADERS = \ ./all.hh \ +./binarization/sauvola.hh \ ./binarization/simple.hh \ ./core/all.hh \ ./core/central_sites.hh \ @@ -11,6 +12,7 @@ nobase_scribo_HEADERS = \ ./core/object_image.hh \ ./core/object_links.hh \ ./debug/all.hh \ +./debug/decision_image.hh \ ./debug/save_bboxes_image.hh \ ./debug/save_label_image.hh \ ./debug/save_linked_bboxes_image.hh \ @@ -20,9 +22,20 @@ nobase_scribo_HEADERS = \ ./draw/all.hh \ ./draw/bounding_box_links.hh \ ./draw/bounding_boxes.hh \ +./estim/object_groups_v_thickness.hh \ ./filter/all.hh \ +./filter/common/object_groups_photo.hh \ +./filter/common/object_links_photo.hh \ +./filter/common/objects_photo.hh \ ./filter/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_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/objects_large.hh \ @@ -35,6 +48,7 @@ nobase_scribo_HEADERS = \ ./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 \ @@ -45,12 +59,14 @@ nobase_scribo_HEADERS = \ ./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 \ diff --git a/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/primitive/extract/lines_h_thick_and_single.hh index a4803aa..969acf5 100644 --- a/scribo/primitive/extract/lines_h_thick_and_single.hh +++ b/scribo/primitive/extract/lines_h_thick_and_single.hh @@ -103,7 +103,6 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); (void) nlines; } diff --git a/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/primitive/extract/lines_v_thick_and_single.hh index 8c9048c..7ddd25f 100644 --- a/scribo/primitive/extract/lines_v_thick_and_single.hh +++ b/scribo/primitive/extract/lines_v_thick_and_single.hh @@ -102,7 +102,6 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); (void) nlines; } diff --git a/scribo/src/text_in_photo.cc b/scribo/src/text_in_photo.cc index 152e9b2..5426dce 100644 --- a/scribo/src/text_in_photo.cc +++ b/scribo/src/text_in_photo.cc @@ -202,7 +202,8 @@ highlighted."); #ifndef NOUT - image2d<value::rgb8> + image2d<value::rgb8> decision_image; + if (argc == 4) decision_image = scribo::debug::decision_image(input, groups, filtered_groups); #endif diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 51a7da1..6b44ef9 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -21,8 +21,13 @@ scribo_debug_usage \ scribo_draw_all \ scribo_draw_bounding_box_links \ scribo_draw_bounding_boxes \ +scribo_estim_object_groups_v_thickness \ scribo_filter_all \ +scribo_filter_common_object_groups_photo \ +scribo_filter_common_object_links_photo \ +scribo_filter_common_objects_photo \ scribo_filter_object_groups_small \ +scribo_filter_object_groups_v_thickness \ scribo_filter_object_links_bbox_h_ratio \ scribo_filter_object_links_bbox_overlap \ scribo_filter_object_links_bbox_ratio \ @@ -42,6 +47,7 @@ scribo_make_debug_filename \ scribo_make_influence_zone_graph \ scribo_make_text \ scribo_preprocessing_all \ +scribo_preprocessing_split_bg_fg \ scribo_preprocessing_unskew \ scribo_primitive_all \ scribo_primitive_extract_all \ @@ -52,12 +58,14 @@ scribo_primitive_extract_lines_h_discontinued \ scribo_primitive_extract_lines_h_pattern \ scribo_primitive_extract_lines_h_single \ scribo_primitive_extract_lines_h_thick \ +scribo_primitive_extract_lines_h_thick_and_single \ scribo_primitive_extract_lines_pattern \ scribo_primitive_extract_lines_thick \ scribo_primitive_extract_lines_v_discontinued \ scribo_primitive_extract_lines_v_pattern \ scribo_primitive_extract_lines_v_single \ scribo_primitive_extract_lines_v_thick \ +scribo_primitive_extract_lines_v_thick_and_single \ scribo_primitive_extract_objects \ scribo_primitive_group_all \ scribo_primitive_group_apply \ @@ -123,8 +131,13 @@ scribo_debug_usage_SOURCES = scribo_debug_usage.cc scribo_draw_all_SOURCES = scribo_draw_all.cc scribo_draw_bounding_box_links_SOURCES = scribo_draw_bounding_box_links.cc scribo_draw_bounding_boxes_SOURCES = scribo_draw_bounding_boxes.cc +scribo_estim_object_groups_v_thickness_SOURCES = scribo_estim_object_groups_v_thickness.cc scribo_filter_all_SOURCES = scribo_filter_all.cc +scribo_filter_common_object_groups_photo_SOURCES = scribo_filter_common_object_groups_photo.cc +scribo_filter_common_object_links_photo_SOURCES = scribo_filter_common_object_links_photo.cc +scribo_filter_common_objects_photo_SOURCES = scribo_filter_common_objects_photo.cc scribo_filter_object_groups_small_SOURCES = scribo_filter_object_groups_small.cc +scribo_filter_object_groups_v_thickness_SOURCES = scribo_filter_object_groups_v_thickness.cc scribo_filter_object_links_bbox_h_ratio_SOURCES = scribo_filter_object_links_bbox_h_ratio.cc scribo_filter_object_links_bbox_overlap_SOURCES = scribo_filter_object_links_bbox_overlap.cc scribo_filter_object_links_bbox_ratio_SOURCES = scribo_filter_object_links_bbox_ratio.cc @@ -144,6 +157,7 @@ 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_preprocessing_all_SOURCES = scribo_preprocessing_all.cc +scribo_preprocessing_split_bg_fg_SOURCES = scribo_preprocessing_split_bg_fg.cc scribo_preprocessing_unskew_SOURCES = scribo_preprocessing_unskew.cc scribo_primitive_all_SOURCES = scribo_primitive_all.cc scribo_primitive_extract_all_SOURCES = scribo_primitive_extract_all.cc @@ -154,12 +168,14 @@ scribo_primitive_extract_lines_h_discontinued_SOURCES = scribo_primitive_extract scribo_primitive_extract_lines_h_pattern_SOURCES = scribo_primitive_extract_lines_h_pattern.cc scribo_primitive_extract_lines_h_single_SOURCES = scribo_primitive_extract_lines_h_single.cc scribo_primitive_extract_lines_h_thick_SOURCES = scribo_primitive_extract_lines_h_thick.cc +scribo_primitive_extract_lines_h_thick_and_single_SOURCES = scribo_primitive_extract_lines_h_thick_and_single.cc scribo_primitive_extract_lines_pattern_SOURCES = scribo_primitive_extract_lines_pattern.cc scribo_primitive_extract_lines_thick_SOURCES = scribo_primitive_extract_lines_thick.cc scribo_primitive_extract_lines_v_discontinued_SOURCES = scribo_primitive_extract_lines_v_discontinued.cc scribo_primitive_extract_lines_v_pattern_SOURCES = scribo_primitive_extract_lines_v_pattern.cc scribo_primitive_extract_lines_v_single_SOURCES = scribo_primitive_extract_lines_v_single.cc scribo_primitive_extract_lines_v_thick_SOURCES = scribo_primitive_extract_lines_v_thick.cc +scribo_primitive_extract_lines_v_thick_and_single_SOURCES = scribo_primitive_extract_lines_v_thick_and_single.cc scribo_primitive_extract_objects_SOURCES = scribo_primitive_extract_objects.cc scribo_primitive_group_all_SOURCES = scribo_primitive_group_all.cc scribo_primitive_group_apply_SOURCES = scribo_primitive_group_apply.cc -- 1.5.6.5