March 2011 - Olena-patches

last-svn-commit-814-g91a93e8 build-aux/build_unit_test.sh: Define HAVE_* for unit-tests.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30f8b74..f634518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Define HAVE_* for unit-tests. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: scribo/src/primitive/remove. 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 8492d64..8f7bd97 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -115,7 +115,7 @@ EOF cppflags="${NAME}_CPPFLAGS=" ldflags="${NAME}_LDFLAGS=" for i in $IFDEF; do - cppflags="${cppflags} \${${i}_CPPFLAGS} " + cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}" ldflags="${ldflags} \${${i}_LDFLAGS} " done echo "$cppflags \${AM_CPPFLAGS}" >>"$output" -- 1.5.6.5

1 0

last-svn-commit-814-g1e74eb5 build-aux/build_unit_test.sh: Define HAVE_* for unit-tests.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30f8b74..f634518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Define HAVE_* for unit-tests. + +2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: scribo/src/primitive/remove. 2011-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 8492d64..8f7bd97 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -115,7 +115,7 @@ EOF cppflags="${NAME}_CPPFLAGS=" ldflags="${NAME}_LDFLAGS=" for i in $IFDEF; do - cppflags="${cppflags} \${${i}_CPPFLAGS} " + cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}" ldflags="${ldflags} \${${i}_LDFLAGS} " done echo "$cppflags \${AM_CPPFLAGS}" >>"$output" -- 1.5.6.5

1 0

last-svn-commit-814-g843b5b3 Regen generated files.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 24 ++++++++++++++++++++---- scribo/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6298fec..f84156c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/headers.mk b/scribo/headers.mk index 0b21a3f..ebe14ee 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -29,7 +29,7 @@ scribo/core/def/lbl_type.hh \ scribo/core/document.hh \ scribo/core/erase_objects.hh \ scribo/core/init_integral_image.hh \ -scribo/core/internal/doc_xml_serializer.hh \ +scribo/core/internal/doc_serializer.hh \ scribo/core/line_info.hh \ scribo/core/line_links.hh \ scribo/core/line_set.hh \ @@ -44,19 +44,20 @@ scribo/core/tag/line.hh \ scribo/debug/alignment_decision_image.hh \ scribo/debug/all.hh \ scribo/debug/bboxes_enlarged_image.hh \ +scribo/debug/bboxes_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/linked_bboxes_image.hh \ scribo/debug/links_decision_image.hh \ +scribo/debug/links_image.hh \ +scribo/debug/logger.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 \ @@ -74,6 +75,7 @@ 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_aligned.hh \ scribo/filter/object_links_bbox_h_ratio.hh \ scribo/filter/object_links_bbox_overlap.hh \ scribo/filter/object_links_bbox_ratio.hh \ @@ -97,17 +99,27 @@ 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/fun/v2v/highlight.hh \ +scribo/io/img/internal/debug_img_visitor.hh \ +scribo/io/img/internal/draw_edges.hh \ +scribo/io/img/internal/full_img_visitor.hh \ +scribo/io/img/internal/non_text_img_visitor.hh \ +scribo/io/img/internal/text_img_visitor.hh \ +scribo/io/img/save.hh \ scribo/io/text_boxes/save.hh \ scribo/io/xml/internal/extended_page_xml_visitor.hh \ scribo/io/xml/internal/full_xml_visitor.hh \ scribo/io/xml/internal/page_xml_visitor.hh \ scribo/io/xml/internal/print_box_coords.hh \ +scribo/io/xml/internal/print_image_coords.hh \ scribo/io/xml/internal/print_page_preambule.hh \ scribo/io/xml/load.hh \ scribo/io/xml/save.hh \ scribo/make/all.hh \ scribo/make/debug_filename.hh \ scribo/make/influence_zone_graph.hh \ +scribo/make/text_blocks_image.hh \ +scribo/make/text_components_image.hh \ scribo/postprocessing/all.hh \ scribo/postprocessing/fill_object_holes.hh \ scribo/preprocessing/all.hh \ @@ -127,6 +139,7 @@ scribo/primitive/extract/canvas.hh \ scribo/primitive/extract/cells.hh \ scribo/primitive/extract/components.hh \ scribo/primitive/extract/horizontal_separators.hh \ +scribo/primitive/extract/internal/union.hh \ scribo/primitive/extract/lines_discontinued.hh \ scribo/primitive/extract/lines_h_discontinued.hh \ scribo/primitive/extract/lines_h_pattern.hh \ @@ -141,6 +154,7 @@ 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/non_text.hh \ +scribo/primitive/extract/non_text_kmean.hh \ scribo/primitive/extract/separators.hh \ scribo/primitive/extract/separators_nonvisible.hh \ scribo/primitive/extract/vertical_separators.hh \ @@ -171,6 +185,7 @@ 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_aligned_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 \ @@ -183,6 +198,7 @@ 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_left_link_dmax_ratio_aligned.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 \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index b0f5982..3785fab 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -280,6 +280,7 @@ scribo_primitive_link_with_several_right_links \ scribo_primitive_link_with_single_down_link \ scribo_primitive_link_with_single_left_link \ scribo_primitive_link_with_single_left_link_dmax_ratio \ +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned \ scribo_primitive_link_with_single_right_link \ scribo_primitive_link_with_single_right_link_bottom \ scribo_primitive_link_with_single_right_link_dmax_ratio \ @@ -511,6 +512,7 @@ scribo_primitive_link_with_several_right_links_SOURCES = scribo_primitive_link_w 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 scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio.cc +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio_aligned.cc 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 -- 1.5.6.5

1 0

last-svn-commit-813-gabbc1e6 Regen generated files.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 24 ++++++++++++++++++++---- scribo/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2ab2f5c..4a08433 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/headers.mk b/scribo/headers.mk index 0b21a3f..ebe14ee 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -29,7 +29,7 @@ scribo/core/def/lbl_type.hh \ scribo/core/document.hh \ scribo/core/erase_objects.hh \ scribo/core/init_integral_image.hh \ -scribo/core/internal/doc_xml_serializer.hh \ +scribo/core/internal/doc_serializer.hh \ scribo/core/line_info.hh \ scribo/core/line_links.hh \ scribo/core/line_set.hh \ @@ -44,19 +44,20 @@ scribo/core/tag/line.hh \ scribo/debug/alignment_decision_image.hh \ scribo/debug/all.hh \ scribo/debug/bboxes_enlarged_image.hh \ +scribo/debug/bboxes_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/linked_bboxes_image.hh \ scribo/debug/links_decision_image.hh \ +scribo/debug/links_image.hh \ +scribo/debug/logger.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 \ @@ -74,6 +75,7 @@ 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_aligned.hh \ scribo/filter/object_links_bbox_h_ratio.hh \ scribo/filter/object_links_bbox_overlap.hh \ scribo/filter/object_links_bbox_ratio.hh \ @@ -97,17 +99,27 @@ 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/fun/v2v/highlight.hh \ +scribo/io/img/internal/debug_img_visitor.hh \ +scribo/io/img/internal/draw_edges.hh \ +scribo/io/img/internal/full_img_visitor.hh \ +scribo/io/img/internal/non_text_img_visitor.hh \ +scribo/io/img/internal/text_img_visitor.hh \ +scribo/io/img/save.hh \ scribo/io/text_boxes/save.hh \ scribo/io/xml/internal/extended_page_xml_visitor.hh \ scribo/io/xml/internal/full_xml_visitor.hh \ scribo/io/xml/internal/page_xml_visitor.hh \ scribo/io/xml/internal/print_box_coords.hh \ +scribo/io/xml/internal/print_image_coords.hh \ scribo/io/xml/internal/print_page_preambule.hh \ scribo/io/xml/load.hh \ scribo/io/xml/save.hh \ scribo/make/all.hh \ scribo/make/debug_filename.hh \ scribo/make/influence_zone_graph.hh \ +scribo/make/text_blocks_image.hh \ +scribo/make/text_components_image.hh \ scribo/postprocessing/all.hh \ scribo/postprocessing/fill_object_holes.hh \ scribo/preprocessing/all.hh \ @@ -127,6 +139,7 @@ scribo/primitive/extract/canvas.hh \ scribo/primitive/extract/cells.hh \ scribo/primitive/extract/components.hh \ scribo/primitive/extract/horizontal_separators.hh \ +scribo/primitive/extract/internal/union.hh \ scribo/primitive/extract/lines_discontinued.hh \ scribo/primitive/extract/lines_h_discontinued.hh \ scribo/primitive/extract/lines_h_pattern.hh \ @@ -141,6 +154,7 @@ 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/non_text.hh \ +scribo/primitive/extract/non_text_kmean.hh \ scribo/primitive/extract/separators.hh \ scribo/primitive/extract/separators_nonvisible.hh \ scribo/primitive/extract/vertical_separators.hh \ @@ -171,6 +185,7 @@ 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_aligned_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 \ @@ -183,6 +198,7 @@ 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_left_link_dmax_ratio_aligned.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 \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index b0f5982..3785fab 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -280,6 +280,7 @@ scribo_primitive_link_with_several_right_links \ scribo_primitive_link_with_single_down_link \ scribo_primitive_link_with_single_left_link \ scribo_primitive_link_with_single_left_link_dmax_ratio \ +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned \ scribo_primitive_link_with_single_right_link \ scribo_primitive_link_with_single_right_link_bottom \ scribo_primitive_link_with_single_right_link_dmax_ratio \ @@ -511,6 +512,7 @@ scribo_primitive_link_with_several_right_links_SOURCES = scribo_primitive_link_w 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 scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio.cc +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio_aligned.cc 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 -- 1.5.6.5

1 0

last-svn-commit-813-g2d12896 Regen generated files.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 24 ++++++++++++++++++++---- scribo/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2ab2f5c..4a08433 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/headers.mk b/scribo/headers.mk index 0b21a3f..ebe14ee 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -29,7 +29,7 @@ scribo/core/def/lbl_type.hh \ scribo/core/document.hh \ scribo/core/erase_objects.hh \ scribo/core/init_integral_image.hh \ -scribo/core/internal/doc_xml_serializer.hh \ +scribo/core/internal/doc_serializer.hh \ scribo/core/line_info.hh \ scribo/core/line_links.hh \ scribo/core/line_set.hh \ @@ -44,19 +44,20 @@ scribo/core/tag/line.hh \ scribo/debug/alignment_decision_image.hh \ scribo/debug/all.hh \ scribo/debug/bboxes_enlarged_image.hh \ +scribo/debug/bboxes_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/linked_bboxes_image.hh \ scribo/debug/links_decision_image.hh \ +scribo/debug/links_image.hh \ +scribo/debug/logger.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 \ @@ -74,6 +75,7 @@ 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_aligned.hh \ scribo/filter/object_links_bbox_h_ratio.hh \ scribo/filter/object_links_bbox_overlap.hh \ scribo/filter/object_links_bbox_ratio.hh \ @@ -97,17 +99,27 @@ 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/fun/v2v/highlight.hh \ +scribo/io/img/internal/debug_img_visitor.hh \ +scribo/io/img/internal/draw_edges.hh \ +scribo/io/img/internal/full_img_visitor.hh \ +scribo/io/img/internal/non_text_img_visitor.hh \ +scribo/io/img/internal/text_img_visitor.hh \ +scribo/io/img/save.hh \ scribo/io/text_boxes/save.hh \ scribo/io/xml/internal/extended_page_xml_visitor.hh \ scribo/io/xml/internal/full_xml_visitor.hh \ scribo/io/xml/internal/page_xml_visitor.hh \ scribo/io/xml/internal/print_box_coords.hh \ +scribo/io/xml/internal/print_image_coords.hh \ scribo/io/xml/internal/print_page_preambule.hh \ scribo/io/xml/load.hh \ scribo/io/xml/save.hh \ scribo/make/all.hh \ scribo/make/debug_filename.hh \ scribo/make/influence_zone_graph.hh \ +scribo/make/text_blocks_image.hh \ +scribo/make/text_components_image.hh \ scribo/postprocessing/all.hh \ scribo/postprocessing/fill_object_holes.hh \ scribo/preprocessing/all.hh \ @@ -127,6 +139,7 @@ scribo/primitive/extract/canvas.hh \ scribo/primitive/extract/cells.hh \ scribo/primitive/extract/components.hh \ scribo/primitive/extract/horizontal_separators.hh \ +scribo/primitive/extract/internal/union.hh \ scribo/primitive/extract/lines_discontinued.hh \ scribo/primitive/extract/lines_h_discontinued.hh \ scribo/primitive/extract/lines_h_pattern.hh \ @@ -141,6 +154,7 @@ 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/non_text.hh \ +scribo/primitive/extract/non_text_kmean.hh \ scribo/primitive/extract/separators.hh \ scribo/primitive/extract/separators_nonvisible.hh \ scribo/primitive/extract/vertical_separators.hh \ @@ -171,6 +185,7 @@ 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_aligned_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 \ @@ -183,6 +198,7 @@ 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_left_link_dmax_ratio_aligned.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 \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index b0f5982..3785fab 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -280,6 +280,7 @@ scribo_primitive_link_with_several_right_links \ scribo_primitive_link_with_single_down_link \ scribo_primitive_link_with_single_left_link \ scribo_primitive_link_with_single_left_link_dmax_ratio \ +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned \ scribo_primitive_link_with_single_right_link \ scribo_primitive_link_with_single_right_link_bottom \ scribo_primitive_link_with_single_right_link_dmax_ratio \ @@ -511,6 +512,7 @@ scribo_primitive_link_with_several_right_links_SOURCES = scribo_primitive_link_w 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 scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio.cc +scribo_primitive_link_with_single_left_link_dmax_ratio_aligned_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio_aligned.cc 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 -- 1.5.6.5

1 0

last-svn-commit-813-gc737a60 tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/tests/toolchain/nepomuk/Makefile.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index df9110d..6298fec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 67a594b..331fb6f 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -32,10 +33,12 @@ text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ -lpthread text_extraction_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5

1 0

last-svn-commit-812-g1027aef tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/tests/toolchain/nepomuk/Makefile.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d504c2..2ab2f5c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 67a594b..331fb6f 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -32,10 +33,12 @@ text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ -lpthread text_extraction_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5

1 0

last-svn-commit-812-g6adf703 tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/tests/toolchain/nepomuk/Makefile.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8d504c2..2ab2f5c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 67a594b..331fb6f 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -32,10 +33,12 @@ text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ -lpthread text_extraction_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5

1 0

last-svn-commit-812-g3e86cf3 scribo/core/def/lbl_type.hh: Use int_u<n> as label type.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/def/lbl_type.hh | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e79e597..df9110d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Set unit tests dependencies. * tests/unit_test/Makefile.am: Add new conditional test file. diff --git a/scribo/scribo/core/def/lbl_type.hh b/scribo/scribo/core/def/lbl_type.hh index 6434bbe..90cc932 100644 --- a/scribo/scribo/core/def/lbl_type.hh +++ b/scribo/scribo/core/def/lbl_type.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,7 +31,8 @@ /// /// Global type definition for labels. -# include <mln/value/label.hh> +# include <mln/value/int_u.hh> +//# include <mln/value/label.hh> namespace scribo @@ -39,7 +41,11 @@ namespace scribo namespace def { - typedef mln::value::label<30u> lbl_type; + // FIXME: we would like to use label type. We have got problems + // with types conversions and data computation (no arithmetic + // operators on labels!) + typedef mln::value::int_u<30u> lbl_type; +// typedef mln::value::label<30u> lbl_type; } // end of namespace scribo::def -- 1.5.6.5

1 0

last-svn-commit-811-g794a820 scribo/core/def/lbl_type.hh: Use int_u<n> as label type.
by Guillaume Lazzara 14 Mar '11

14 Mar '11

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/def/lbl_type.hh | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 60d1277..8d504c2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. + +2011-03-14 Guillaume Lazzara <z(a)lrde.epita.fr> + Set unit tests dependencies. * tests/unit_test/Makefile.am: Add new conditional test file. diff --git a/scribo/scribo/core/def/lbl_type.hh b/scribo/scribo/core/def/lbl_type.hh index 6434bbe..90cc932 100644 --- a/scribo/scribo/core/def/lbl_type.hh +++ b/scribo/scribo/core/def/lbl_type.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,7 +31,8 @@ /// /// Global type definition for labels. -# include <mln/value/label.hh> +# include <mln/value/int_u.hh> +//# include <mln/value/label.hh> namespace scribo @@ -39,7 +41,11 @@ namespace scribo namespace def { - typedef mln::value::label<30u> lbl_type; + // FIXME: we would like to use label type. We have got problems + // with types conversions and data computation (no arithmetic + // operators on labels!) + typedef mln::value::int_u<30u> lbl_type; +// typedef mln::value::label<30u> lbl_type; } // end of namespace scribo::def -- 1.5.6.5

1 0