1. 15 Mar, 2010 19 commits
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Introduce new Scribo core classes and start using them. · 03f61d76
      Guillaume Lazzara authored
      	* scribo/core/component_info.hh,
      	* scribo/core/component_set.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: New core classes.
      
      	* scribo/core/object_image.hh: Remove.
      
      	* scribo/core/anchors.hh
      	* scribo/primitive/extract/objects.hh: Rename as...
      
      	* scribo/primitive/link/internal/compute_anchor.hh,
      	* scribo/primitive/extract/components.hh: ... this.
      
      	* scribo/draw/bounding_box_links.hh,
      	* scribo/filter/object_links_bbox_h_ratio.hh,
      	* scribo/filter/object_links_bbox_ratio.hh,
      	* scribo/filter/objects_small.hh,
      	* scribo/fun/v2b/objects_small_filter.hh,
      	* scribo/primitive/group/apply.hh,
      	* scribo/primitive/group/from_single_link.hh,
      	* scribo/primitive/internal/find_root.hh,
      	* scribo/primitive/internal/init_link_array.hh,
      	* scribo/primitive/link/compute.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_single_left_link_dmax_ratio.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: Make use of
      	the new core classes.
      03f61d76
    • Guillaume Lazzara's avatar
      Add anchor support in debug routines. · 92a937fa
      Guillaume Lazzara authored
      	* scribo/debug/alignment_decision_image.hh,
      	* scribo/debug/links_decision_image.hh,
      	* scribo/debug/save_linked_bboxes_image.hh,
      	* scribo/draw/bounding_box_links.hh: Make use of anchor points to
      	draw debug outputs.
      92a937fa
    • Guillaume Lazzara's avatar
      Add new link filters. · 10172dec
      Guillaume Lazzara authored
      	* scribo/filter/object_links_non_aligned_simple.hh: Handle new
      	cases.
      
      	* scribo/filter/object_links_left_aligned.hh,
      	* scribo/filter/object_links_right_aligned.hh: New filters.
      10172dec
    • Guillaume Lazzara's avatar
      Improve object linking backend. · 3894a51d
      Guillaume Lazzara authored
      	* scribo/primitive/internal/find_left_link.hh,
      	* scribo/primitive/internal/find_right_link.hh,
      	* scribo/primitive/internal/is_invalid_link.hh: Remove.
      
      	* scribo/primitive/link/internal/compute_anchor.hh,
      	* scribo/primitive/link/internal/link_ms_dmax_base.hh,
      	* scribo/primitive/link/internal/link_ms_dmax_ratio_base.hh,
      	* scribo/primitive/link/internal/link_single_dmax_base.hh,
      	* scribo/primitive/link/internal/link_single_dmax_ratio_base.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_dmax_ratio.hh,
      	* scribo/primitive/link/with_single_up_link.hh: Introduce the
      	anchor concept and make use of it.
      3894a51d
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Add dedicated routines for AFP's use case. · b31f2f59
      Guillaume Lazzara authored
      	* scribo/src/afp/components.hh,
      	* scribo/src/afp/link.hh,
      	* scribo/src/afp/regroup.hh: New.
      b31f2f59
    • Guillaume Lazzara's avatar
      Add new tools in Scribo. · 9fca6595
      Guillaume Lazzara authored
      	* src/preprocessing/Makefile.am,
      	* src/filter/Makefile.am,
      	* src/debug/Makefile.am: Add new targets.
      
      	* src/debug/show_info_median_inter_characters.cc,
      	* src/debug/show_info_x_height.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_up.cc,
      	* src/debug/show_links_single_up_left_aligned.cc,
      	* src/debug/show_links_single_up_right_aligned.cc,
      	* src/filter/objects_with_holes.cc,
      	* src/filter/objects_with_holes_pgm.cc,
      	* src/pbm_lines_in_doc.cc,
      	* src/preprocessing/split_bg_fg_ms.cc,
      	* src/text_in_article.cc,
      	* src/text_in_photo_ppm_fast.cc: New tools.
      
      	* src/debug/show_left_right_links_validation.cc: Rename as...
      	* src/debug/show_links_left_right_links_validation.cc: ...this.
      
      	* src/debug/show_links_bbox_h_ratio.cc: Add a missing argument.
      9fca6595
    • Guillaume Lazzara's avatar
      619f727a
    • Guillaume Lazzara's avatar
      Cleanup and avoid warnings in Sauvola related files. · ca034dd5
      Guillaume Lazzara authored
      	* scribo/binarization/sauvola_ms.hh,
      	* scribo/binarization/sauvola_threshold.hh,
      	* scribo/canvas/integral_browsing.hh,
      	* scribo/src/binarization/sauvola_ms.cc,
      	* scribo/src/binarization/sauvola_pgm.cc,x
      	* scribo/subsampling/integral_single_image.hh: Cleanup and avoir
      	warnings.
      ca034dd5
    • Guillaume Lazzara's avatar
      Add a new test for object_image. · 07c83125
      Guillaume Lazzara authored
      	* tests/Makefile.am,
      	* tests/core/Makefile.am: Update build system.
      
      	* tests/core/object_image.cc: New test.
      07c83125
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Fix object links filters. · 3151875d
      Guillaume Lazzara authored
      	* filter/object_links_bottom_aligned.hh,
      	* filter/object_links_center_aligned.hh,
      	* filter/object_links_non_aligned_simple.hh,
      	* filter/object_links_top_aligned.hh: Pass the proper dimension as
      	routine argument.
      3151875d
    • Guillaume Lazzara's avatar
      Cleanup Sauvola's binarization code. · 74ae8cb3
      Guillaume Lazzara authored
      	* binarization/sauvola_threshold.hh,
      	* binarization/sauvola.hh: Use fun::v2v::rgb_to_int_u8.
      
      	* binarization/sauvola_ms.hh: New. Sauvola multi-scale routine.
      
      	* src/binarization/sauvola.cc: Make the window size a program
      	argument.
      
      	* src/binarization/sauvola_ms.cc: Use Sauvola multi-scale routine.
      74ae8cb3
    • Guillaume Lazzara's avatar
    • Guillaume Lazzara's avatar
      Improve linking routines. · 906f2366
      Guillaume Lazzara authored
      	* core/anchors.hh: New. Add anchor types.
      
      	* filter/objects_thin.hh: Use filter::internal::compute.
      
      	* primitive/link/internal/find_several_links.hh,
      	* primitive/link/internal/find_link.hh,
      	* primitive/link/compute.hh: Update functor interface in order to
      	specify anchors.
      
      	* primitive/link/compute_several.hh: Fix an invalid namespace.
      
      	* primitive/link/internal/anchors_3.hh: Move...
      
      	* primitive/link/internal/compute_anchor.hh: ... here.
      
      	* primitive/link/internal/link_functor_base.hh: Use anchor type.
      
      	* primitive/link/internal/link_several_dmax_base.hh: New.
      
      	* primitive/link/internal/link_center_dmax_base.hh,
      	* primitive/link/internal/link_center_dmax_ratio_base.hh: Removed.
      
      	* primitive/link/with_several_right_links_overlap.hh: Fix includes.
      
      	* primitive/link/with_single_right_link_bottom.hh,
      	* primitive/link/with_single_right_link_top.hh,
      	* primitive/link/with_single_left_link.hh,
      	* primitive/link/with_single_right_link.hh: Use
      	link_single_dmax_base functor.
      
      	* src/debug/show_links_several_right_overlap.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: Update functor
      	interface.
      906f2366
    • Guillaume Lazzara's avatar
      Improve stats computation in Sauvola Multi-scale. · 542fcf95
      Guillaume Lazzara authored
      	* binarization/internal/first_pass_functor.hh: Use
      	sauvola_threshold routine.
      
      	* binarization/sauvola_threshold.hh: Remove debug and fix invalid
      	read in integral image.
      
      	* canvas/integral_browsing.hh,
      	* subsampling/integral_single_image.hh: Fix stats computation.
      
      	* src/binarization/sauvola_ms.cc: Fix window parameter and make
      	debug output optional.
      542fcf95
    • Guillaume Lazzara's avatar
      Optimize Sauvola's multiscale binarization. · 32e461a6
      Guillaume Lazzara authored
      	* core/init_integral_image.hh: New.
      
      	* src/binarization/sauvola_ms.cc: Optimize and make it more
      	robust.
      
      	* canvas/integral_browsing.hh: New canvas to browse and compute
      	data in an integral image.
      
      	* binarization/internal/first_pass_functor.hh: New functor to be
      	used in the integral browsing.
      
      	* binarization/sauvola_threshold.hh: Add new overloads.
      
      	* subsampling/integral_single_image.hh: Subsample an image and
      	compute integral images at the same time.
      32e461a6
  2. 03 Nov, 2009 6 commits
    • Guillaume Lazzara's avatar
      Add a new example in Scribo. · 05014efe
      Guillaume Lazzara authored
      	* scribo/src/primitive/extract/Makefile.am: Add a new target.
      
      	* scribo/src/primitive/extract/lines_pattern.cc: New.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4712 4aad255d-cdde-0310-9447-f3009e2ae8c0
      05014efe
    • Guillaume Lazzara's avatar
      First draft of multiscale Sauvola's binarization. · 696cae71
      Guillaume Lazzara authored
      	* scribo/src/binarization/Makefile.am: Add new target.
      
      	* scribo/src/binarization/sauvola_ms.cc: New.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4711 4aad255d-cdde-0310-9447-f3009e2ae8c0
      696cae71
    • Guillaume Lazzara's avatar
      Improve line pattern recognition routine. · 0436370f
      Guillaume Lazzara authored
      	* primitive/extract/lines_pattern.hh: Make it less tolerant.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4708 4aad255d-cdde-0310-9447-f3009e2ae8c0
      0436370f
    • Guillaume Lazzara's avatar
      Add new debug tools. · aa3bd636
      Guillaume Lazzara authored
      	* src/debug/Makefile.am: Add new targets.
      
      	* src/debug/show_links_bbox_h_ratio.cc,
      	* src/debug/show_links_bbox_overlap.cc,
      	* src/debug/show_links_bottom_aligned.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_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_top_aligned.cc,
      	* src/debug/show_objects_large_small.cc,
      	* src/debug/show_objects_thick.cc: New debug tools.
      
      	* src/debug/show_objects_thin.cc: Write it.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4707 4aad255d-cdde-0310-9447-f3009e2ae8c0
      aa3bd636
    • Guillaume Lazzara's avatar
      Add new link filters. · 602810cd
      Guillaume Lazzara authored
      	* filter/internal/compute.hh: New routine to compute filter
      	results.
      
      	* filter/object_links_center_aligned.hh,
      	* filter/object_links_top_aligned.hh,
      	* filter/objects_h_thick.hh,
      	* filter/objects_v_thick.hh: New filters.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4706 4aad255d-cdde-0310-9447-f3009e2ae8c0
      602810cd
    • Guillaume Lazzara's avatar
      Revamp code related to object linking. · 6181ecd5
      Guillaume Lazzara authored
      	* core/concept/link_functor.hh: New concept.
      
      	* core/internal/link_functor_base.hh: New Base class for link
      	functor.
      
      	* 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/with_several_right_closest_links.hh,
      	* primitive/link/with_several_right_links_overlap.hh,
      	* primitive/link/with_single_left_link_dmax_ratio.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: New routines.
      
      	* 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: New functors.
      
      	* primitive/link/with_several_left_links.hh,
      	* primitive/link/with_several_right_links.hh: Use the new routines.
      
      	* primitive/link/with_single_left_link.hh,
      	* primitive/link/with_single_right_link.hh: Revamp and use the new
      	routines.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4705 4aad255d-cdde-0310-9447-f3009e2ae8c0
      6181ecd5
  3. 28 Oct, 2009 2 commits
  4. 26 Oct, 2009 1 commit
  5. 05 Oct, 2009 1 commit
  6. 01 Oct, 2009 3 commits
  7. 28 Sep, 2009 5 commits
    • Guillaume Lazzara's avatar
      Add a first draft of a multi-scale process. · 1186014c
      Guillaume Lazzara authored
      	* src/multi_scale/Makefile.am,
      	* src/multi_scale/find_lines.cc: New.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4560 4aad255d-cdde-0310-9447-f3009e2ae8c0
      1186014c
    • Guillaume Lazzara's avatar
      Cleanup scribo/src directory. · dcccb9f5
      Guillaume Lazzara authored
      	* src/text/Makefile.am,
      	* src/Makefile.am,
      	* src/filter/Makefile.am,
      	* src/table/Makefile.am,
      	* src/preprocessing/Makefile.am: Add new targets.
      
      	* src/dmap.cc,
      	* src/extract/Makefile.am,
      	* src/extract/Makefile.am,
      	* src/extract/primitive/Makefile.am,
      	* src/extract/primitive/Makefile.am,
      	* src/extract/primitive/extract_discontinued_hlines.cc,
      	* src/extract/primitive/extract_discontinued_lines.cc,
      	* src/extract/primitive/extract_discontinued_vlines.cc,
      	* src/extract/primitive/extract_thick_hlines.cc,
      	* src/extract/primitive/extract_thick_vlines.cc,
      	* src/extract/primitive/find_discontinued_lines.cc,
      	* src/extract/primitive/find_pattern_lines.cc,
      	* src/extract/primitive/find_single_lines.cc,
      	* src/extract/primitive/find_thick_and_single_lines.cc,
      	* src/extract/primitive/find_thick_lines.cc,
      	* src/filter/large_objects.cc,
      	* src/filter/small_objects.cc,
      	* src/filter/thick_objects.cc,
      	* src/filter/thin_objects.cc,
      	* src/morpho.cc,
      	* src/negate.cc,
      	* src/preprocess.cc,
      	* src/recognition.cc,
      	* src/rectangularity.cc,
      	* src/superpose.cc,
      	* src/table_rebuild_opening.cc,
      	* src/table_rebuild_rank.cc,
      	* src/text/grouping/Makefile.am,
      	* src/text/grouping/group_from_double_link.cc,
      	* src/text/grouping/group_from_double_link_filter_non_aligned.cc,
      	* src/text/grouping/group_from_double_several_links.cc,
      	* src/text/grouping/group_from_graph.cc,
      	* src/text/grouping/group_from_several_graph.cc,
      	* src/text/grouping/group_from_several_left_links.cc,
      	* src/text/grouping/group_from_single_link.cc: Move ...
      
      	* src/filter/objects_large.cc,
      	* src/filter/objects_small.cc,
      	* src/filter/objects_thick.cc,
      	* src/filter/objects_thin.cc,
      	* src/misc/Makefile.am,
      	* src/misc/dmap.cc,
      	* src/misc/morpho.cc,
      	* src/misc/negate.cc,
      	* src/misc/rectangularity.cc,
      	* src/misc/superpose.cc,
      	* src/preprocessing/preprocess.cc,
      	* src/primitive/Makefile.am,
      	* src/primitive/extract/Makefile.am,
      	* 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/Makefile.am,
      	* src/primitive/find/find_discontinued_lines.cc,
      	* src/primitive/find/find_pattern_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_link_filter_non_aligned.cc,
      	* src/primitive/group/group_from_double_several_links.cc,
      	* src/primitive/group/group_from_graph.cc,
      	* src/primitive/group/group_from_rag.cc,
      	* src/primitive/group/group_from_several_graph.cc,
      	* src/primitive/group/group_from_several_left_links.cc,
      	* src/primitive/group/group_from_single_link.cc,
      	* src/table/rebuild_opening.cc,
      	* src/table/rebuild_rank.cc,
      	* src/text/recognition.cc: ... here.
      
      	* src/table_old.cc: Remove.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4559 4aad255d-cdde-0310-9447-f3009e2ae8c0
      dcccb9f5
    • Guillaume Lazzara's avatar
      Add new filters in Scribo. · 203bb3cc
      Guillaume Lazzara authored
      	* filter/objects_h_thin.hh,
      	* filter/objects_v_thin.hh: New objects filters.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4558 4aad255d-cdde-0310-9447-f3009e2ae8c0
      203bb3cc
    • Guillaume Lazzara's avatar
      Small fixes in Scribo. · bcf2ae48
      Guillaume Lazzara authored
      	* binarization/sauvola.hh: Fix an invalid precondition.
      
      	* filter/objects_size_ratio.hh: Add a "using namespace".
      
      	* primitive/extract/lines_h_pattern.hh,
      	* primitive/extract/lines_v_pattern.hh: Add a parameter.
      
      	* primitive/extract/lines_pattern.hh: Add a todo.
      
      	* tests/unit_test/unit-tests.mk: Regen.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4557 4aad255d-cdde-0310-9447-f3009e2ae8c0
      bcf2ae48
    • Thierry Geraud's avatar
      Fix typo. · 3ee31ca4
      Thierry Geraud authored
      	* text/recognition.hh (recognition): Fix typo in commentary.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4556 4aad255d-cdde-0310-9447-f3009e2ae8c0
      3ee31ca4
  8. 25 Sep, 2009 3 commits