* src/Makefile.am: update. * src/text/Makefile.am, * src/text/grouping/Makefile.am: New. * src/extract_text_double_link.cc, * src/extract_text_double_several_links.cc, * src/extract_text_graph.cc, * src/extract_text_several_graph.cc, * src/extract_text_several_left_links.cc, * src/extract_text_single_link.cc: Move... * src/text/grouping/group_from_double_link.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: ... here. --- scribo/ChangeLog | 23 +++++++++++ scribo/src/Makefile.am | 18 ++------ scribo/src/text/Makefile.am | 1 + scribo/src/text/grouping/Makefile.am | 40 ++++++++++++++++++++ .../grouping/group_from_double_link.cc} | 0 .../grouping/group_from_double_several_links.cc} | 2 +- .../grouping/group_from_graph.cc} | 2 +- .../grouping/group_from_several_graph.cc} | 2 +- .../grouping/group_from_several_left_links.cc} | 2 +- .../grouping/group_from_single_link.cc} | 2 +- 10 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 scribo/src/text/Makefile.am create mode 100644 scribo/src/text/grouping/Makefile.am rename scribo/src/{extract_text_double_link.cc => text/grouping/group_from_double_link.cc} (100%) rename scribo/src/{extract_text_double_several_links.cc => text/grouping/group_from_double_several_links.cc} (97%) rename scribo/src/{extract_text_graph.cc => text/grouping/group_from_graph.cc} (97%) rename scribo/src/{extract_text_several_graph.cc => text/grouping/group_from_several_graph.cc} (97%) rename scribo/src/{extract_text_several_left_links.cc => text/grouping/group_from_several_left_links.cc} (97%) rename scribo/src/{extract_text_single_link.cc => text/grouping/group_from_single_link.cc} (98%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4aab740..3ab33cd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,26 @@ +2009-08-24 Guillaume Lazzara <lazzara@lrde.epita.fr> + + Move example files. + + * src/Makefile.am: update. + + * src/text/Makefile.am, + * src/text/grouping/Makefile.am: New. + + * src/extract_text_double_link.cc, + * src/extract_text_double_several_links.cc, + * src/extract_text_graph.cc, + * src/extract_text_several_graph.cc, + * src/extract_text_several_left_links.cc, + * src/extract_text_single_link.cc: Move... + + * src/text/grouping/group_from_double_link.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: ... here. + 2009-08-19 Guillaume Lazzara <lazzara@lrde.epita.fr> * src/Makefile.am: Link 'recognition' example to libtiff. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index a7a5259..7f39191 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -24,16 +24,11 @@ SUBDIRS = \ extract \ filter \ preprocessing \ - table + table \ + text bin_PROGRAMS = \ dmap \ - extract_text_double_link \ - extract_text_double_several_links \ - extract_text_graph \ - extract_text_several_graph \ - extract_text_several_left_links \ - extract_text_single_link \ morpho \ negate \ preprocess \ @@ -42,16 +37,11 @@ bin_PROGRAMS = \ table_rebuild_opening \ table_rebuild_rank \ text_in_photo \ + text_in_photo_invert \ thin_bboxes dmap_SOURCES = dmap.cc -extract_text_double_link_SOURCES = extract_text_double_link.cc -extract_text_double_several_links_SOURCES = extract_text_double_several_links.cc -extract_text_graph_SOURCES = extract_text_graph.cc -extract_text_several_graph_SOURCES = extract_text_several_graph.cc -extract_text_several_left_links_SOURCES = extract_text_several_left_links.cc -extract_text_single_link_SOURCES = extract_text_single_link.cc morpho_SOURCES = morpho.cc negate_SOURCES = negate.cc preprocess_SOURCES = preprocess.cc @@ -60,9 +50,11 @@ superpose_SOURCES = superpose.cc table_rebuild_opening_SOURCES = table_rebuild_opening.cc table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc +text_in_photo_invert_SOURCES = text_in_photo_invert.cc thin_bboxes_SOURCES = thin_bboxes.cc + if HAVE_TESSERACT if HAVE_TIFF diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am new file mode 100644 index 0000000..5f5ed81 --- /dev/null +++ b/scribo/src/text/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = grouping diff --git a/scribo/src/text/grouping/Makefile.am b/scribo/src/text/grouping/Makefile.am new file mode 100644 index 0000000..83c2306 --- /dev/null +++ b/scribo/src/text/grouping/Makefile.am @@ -0,0 +1,40 @@ +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. +# + +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/scribo/scribo.mk + +bin_PROGRAMS = \ + group_from_double_link \ + group_from_double_link_filter_non_aligned \ + group_from_double_several_links \ + group_from_graph \ + group_from_rag \ + group_from_several_graph \ + group_from_several_left_links \ + group_from_single_link + +group_from_double_link_SOURCES = group_from_double_link.cc +group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc +group_from_double_several_links_SOURCES = group_from_double_several_links.cc +group_from_graph_SOURCES = group_from_graph.cc +group_from_rag_SOURCES = group_from_rag.cc +group_from_several_graph_SOURCES = group_from_several_graph.cc +group_from_several_left_links_SOURCES = group_from_several_left_links.cc +group_from_single_link_SOURCES = group_from_single_link.cc + diff --git a/scribo/src/extract_text_double_link.cc b/scribo/src/text/grouping/group_from_double_link.cc similarity index 100% rename from scribo/src/extract_text_double_link.cc rename to scribo/src/text/grouping/group_from_double_link.cc diff --git a/scribo/src/extract_text_double_several_links.cc b/scribo/src/text/grouping/group_from_double_several_links.cc similarity index 97% rename from scribo/src/extract_text_double_several_links.cc rename to scribo/src/text/grouping/group_from_double_several_links.cc index c220e77..e22239d 100644 --- a/scribo/src/extract_text_double_several_links.cc +++ b/scribo/src/text/grouping/group_from_double_several_links.cc @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) if (argc < 1) return usage(argv[0]); - scribo::make::internal::debug_filename_prefix = "extract_text_double_several_links"; + scribo::make::internal::debug_filename_prefix = "group_with_double_several_links"; mln::util::timer t, t2; image2d<bool> input; diff --git a/scribo/src/extract_text_graph.cc b/scribo/src/text/grouping/group_from_graph.cc similarity index 97% rename from scribo/src/extract_text_graph.cc rename to scribo/src/text/grouping/group_from_graph.cc index 91bd799..de98ff9 100644 --- a/scribo/src/extract_text_graph.cc +++ b/scribo/src/text/grouping/group_from_graph.cc @@ -55,7 +55,7 @@ int main(int argc, char* argv[]) if (argc < 1) return usage(argv[0]); - scribo::make::internal::debug_filename_prefix = "extract_text_graph"; + scribo::make::internal::debug_filename_prefix = "group_with_graph"; image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/extract_text_several_graph.cc b/scribo/src/text/grouping/group_from_several_graph.cc similarity index 97% rename from scribo/src/extract_text_several_graph.cc rename to scribo/src/text/grouping/group_from_several_graph.cc index bc0d3e0..1db26a7 100644 --- a/scribo/src/extract_text_several_graph.cc +++ b/scribo/src/text/grouping/group_from_several_graph.cc @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) if (argc < 1) return usage(argv[0]); - scribo::make::internal::debug_filename_prefix = "extract_text_several_graph"; + scribo::make::internal::debug_filename_prefix = "group_with_several_graph"; image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/extract_text_several_left_links.cc b/scribo/src/text/grouping/group_from_several_left_links.cc similarity index 97% rename from scribo/src/extract_text_several_left_links.cc rename to scribo/src/text/grouping/group_from_several_left_links.cc index 6e6f1fa..cdc65ae 100644 --- a/scribo/src/extract_text_several_left_links.cc +++ b/scribo/src/text/grouping/group_from_several_left_links.cc @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) if (argc < 1) return usage(argv[0]); - scribo::make::internal::debug_filename_prefix = "extract_text_several_left_links"; + scribo::make::internal::debug_filename_prefix = "group_with_several_left_links"; image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/extract_text_single_link.cc b/scribo/src/text/grouping/group_from_single_link.cc similarity index 98% rename from scribo/src/extract_text_single_link.cc rename to scribo/src/text/grouping/group_from_single_link.cc index e29b1c4..58a7f2f 100644 --- a/scribo/src/extract_text_single_link.cc +++ b/scribo/src/text/grouping/group_from_single_link.cc @@ -62,7 +62,7 @@ int main(int argc, char* argv[]) if (argc != 2) return usage(argv); - scribo::make::internal::debug_filename_prefix = "extract_text_single_link"; + scribo::make::internal::debug_filename_prefix = "group_with_single_link"; image2d<bool> input; io::pbm::load(input, argv[1]); -- 1.5.6.5