March 2013 - Olena-patches

branch table-graph updated: olena-2.0-409-gd527a65
by git＠lrde.epita.fr 27 Mar '13

27 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch table-graph has been updated via d527a6539a5718adce53ba4b979cd1e38359c6db (commit) via f3438f86a2db833625a83af044405c5d641babd2 (commit) via a3d6d79f8f31fe145dc81c2da3b80205e581f9e4 (commit) via 1ba1a2b54036195d602d77a0f031a2d7651a0ddb (commit) via 46b77de9cbe449148bdcfb1bce75e1e1574f725b (commit) via 1f16156dbee5dc565f7b18c11ea13b0806ca702c (commit) via b261c2b8b09fe5c33cfe50ba6b2d109c430eafd2 (commit) via 57d6bf81d106c01e70983592d6e35f43af96c909 (commit) via 1821109e17f4403e987efefca16fd2f801fcf5df (commit) from 023cbf59ff759cee729101b2fa1a3e859f49d14b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- d527a65 Build the set of detected rows during table recognition. f3438f8 Add support for a scale factor in the table detection application. a3d6d79 Avoid dynamic allocation in the table detection application. 1ba1a2b Configure scribo/src/contest/table-2013/Makefile. 46b77de Equip scribo/src/contest/table-2013/. 1f16156 Move the ICDAR 2013 table competition code into the `contest' directory. b261c2b configure.ac: Aesthetic changes. 57d6bf8 scribo/src/contest/Makefile.am: Aesthetic changes. 1821109 Remove references to external directory. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 ++ Makefile.am | 2 +- configure.ac | 10 +- scribo/sandbox/icdar_13_table/Makefile | 27 ----- scribo/sandbox/icdar_13_table/README_ROLAND | 18 --- scribo/src/contest/Makefile.am | 9 +- .../nepomuk => contest/table-2013}/Makefile.am | 44 ++++---- scribo/src/contest/table-2013/README | 54 +++++++++ .../icdar_13_table => src/contest/table-2013}/TODO | 0 .../originals/competition-entry-region-model.xsd | 0 .../contest/table-2013}/src/disjoint_set.hh | 0 .../contest/table-2013}/src/main.cc | 0 .../contest/table-2013}/src/new.cc | 113 +++++++++++++------- .../contest/table-2013}/src/xml.cc | 0 .../contest/table-2013}/src/xml.hh | 0 15 files changed, 169 insertions(+), 115 deletions(-) delete mode 100644 scribo/sandbox/icdar_13_table/Makefile delete mode 100644 scribo/sandbox/icdar_13_table/README_ROLAND copy scribo/src/{toolchain/nepomuk => contest/table-2013}/Makefile.am (52%) create mode 100644 scribo/src/contest/table-2013/README rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/TODO (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/originals/competition-entry-region-model.xsd (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/disjoint_set.hh (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/main.cc (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/new.cc (86%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/xml.cc (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/xml.hh (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-409-gd527a65 Build the set of detected rows during table recognition.
by Roland Levillain 27 Mar '13

27 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 55 ++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 17 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 24096e6..a40ed07 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -580,38 +580,59 @@ int main(int argc, char** argv) } } - // Build the columns. + // FIXME: We could probably factor a bit more here. + + // Build the columns and rows. // First pass. disjoint_set<node_id> columns_set(groups.nelements()); + disjoint_set<node_id> rows_set(groups.nelements()); for (unsigned i = 0; i < groups.nelements(); ++i) { - const group_set& successors = nodes_below[i]; - for (group_set::const_iterator j = successors.begin(); - j != successors.end(); ++j) + // Look for groups below to build columns. + for (group_set::const_iterator j = nodes_below[i].begin(); + j != nodes_below[i].end(); ++j) columns_set.make_union(i, *j); + // Look for groups on the right to build rows. + for (group_set::const_iterator j = nodes_right[i].begin(); + j != nodes_right[i].end(); ++j) + rows_set.make_union(i, *j); } // Second pass: assign labels. Label 0 is unused and means // ``default''. - std::vector<group_set> descendants(groups.nelements()); + std::vector<group_set> columns_descendants(groups.nelements()); + std::vector<group_set> rows_descendants(groups.nelements()); for (unsigned i = 0; i < groups.nelements(); ++i) { // Process groups in reverse order. unsigned j = groups.nelements() - 1 - i; if (!columns_set.is_root(j)) - descendants[columns_set.find(j)].insert(j); + columns_descendants[columns_set.find(j)].insert(j); + if (!rows_set.is_root(j)) + rows_descendants[rows_set.find(j)].insert(j); } - // Visualization: columns. - image2d<value::rgb8> ima_columns = data::convert(value::rgb8(), bin_merged); + // Visualization: columns and rows + image2d<value::rgb8> ima_cols_rows = + data::convert(value::rgb8(), bin_merged); for (unsigned i = 0; i < groups.nelements(); ++i) - if (!descendants[i].empty()) - { - box2d column_box = groups(i).bbox(); - for (group_set::const_iterator j = descendants[i].begin(); - j != descendants[i].end(); ++j) - column_box.merge(groups(*j).bbox()); - draw::box(ima_columns, column_box, literal::red); - } + { + if (!columns_descendants[i].empty()) + { + box2d column_box = groups(i).bbox(); + for (group_set::const_iterator j = columns_descendants[i].begin(); + j != columns_descendants[i].end(); ++j) + column_box.merge(groups(*j).bbox()); + draw::box(ima_cols_rows, column_box, literal::red); + } + if (!rows_descendants[i].empty()) + { + box2d column_box = groups(i).bbox(); + for (group_set::const_iterator j = rows_descendants[i].begin(); + j != rows_descendants[i].end(); ++j) + column_box.merge(groups(*j).bbox()); + draw::box(ima_cols_rows, column_box, literal::green); + } + } // Write images and close XML std::ostringstream path; @@ -627,6 +648,6 @@ int main(int argc, char** argv) write_image(ima_links, "components", page, number, path); write_image(ima_groups, "groups", page, number, path); write_image(ima_valid, "valid", page, number, path); - write_image(ima_columns, "columns", page, number, path); + write_image(ima_cols_rows, "cols_rows", page, number, path); } } -- 1.7.2.5

1 0

olena-2.0-408-gf3438f8 Add support for a scale factor in the table detection application.
by Roland Levillain 27 Mar '13

27 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 54 ++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 17 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 15004af..24096e6 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -117,7 +117,8 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, unsigned average_width, - const scribo::component_set<L>& hlines) + const scribo::component_set<L>& hlines, + float scale_factor) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -141,7 +142,7 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity + && (unsigned) abs(p1[1] - p2[1]) < 20 * scale_factor) // Vertical proximity { unsigned k = 1; short separators = 0; @@ -176,7 +177,8 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, unsigned average_width, - const scribo::component_set<L>& hlines) + const scribo::component_set<L>& hlines, + float scale_factor) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -200,7 +202,7 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity + && (unsigned) abs(p1[1] - p2[1]) < 20 * scale_factor) // Vertical proximity { unsigned k = 1; short separators = 0; @@ -234,7 +236,8 @@ template<typename L> void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - const scribo::component_set<L>& vlines) + const scribo::component_set<L>& vlines, + float scale_factor) { for (unsigned i = 1; i <= groups.nelements(); ++i) { @@ -251,7 +254,7 @@ void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[0] - p2[0]) < 10 * scale_factor// Reduced gap && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; @@ -286,7 +289,8 @@ template<typename L> void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, std::vector<short>& balance, - const scribo::component_set<L>& vlines) + const scribo::component_set<L>& vlines, + float scale_factor) { for (unsigned i = groups.nelements(); i > 0; --i) { @@ -303,7 +307,7 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10 // Reduced gap + && abs(p1[0] - p2[0]) < 10 * scale_factor // Reduced gap && abs(p1[1] - p2[1]) > (b1.width() + b2.width()) / 4) // Consistent gap { unsigned k = 1; @@ -342,11 +346,25 @@ int main(int argc, char** argv) typedef image2d<bool> IB; typedef scribo::component_set< image2d<unsigned> > CS; + if (argc != 2 && argc != 3) + { + std::cerr << "usage: " << argv[0] << "input.pdf [scale]"; + exit(1); + } + + // Default resolution in DPI. + const unsigned default_res = 72; + // Default rasterization scale. + const float default_scale = 1.0; + + // Magnification factor. + const float scale_factor = argc == 3 ? strtof(argv[2], 0) : default_scale; + // Loading and binarization XML xml("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; - unsigned dpi = 72; + unsigned dpi = default_res * scale_factor; io::pdf::load(pdf, argv[1], dpi); // Iterate over all pages @@ -379,8 +397,8 @@ int main(int argc, char** argv) // Find separators IB bin_without_separators = duplicate(bin); V nhlines, nvlines; - unsigned min_width = 31; - unsigned min_height = 71; + unsigned min_width = 31 * scale_factor; + unsigned min_height = 71 * scale_factor; scribo::component_set<L> hlines = scribo::primitive::extract::lines_h_discontinued(bin_without_separators, c4(), nhlines, min_width, 2); scribo::component_set<L> vlines = scribo::primitive::extract::lines_v_discontinued(bin_without_separators, c4(), nvlines, min_height, 2); for (unsigned i = 1; i <= hlines.nelements(); ++i) @@ -465,10 +483,12 @@ int main(int argc, char** argv) std::vector<short> balance(groups.nelements(), 0); // Draw and count links - draw_links_tb(groups, ima_groups, balance, average_width, hlines); - draw_links_bt(groups, ima_groups, balance, average_width, hlines); - draw_links_lr(groups, ima_groups, balance, vlines); - draw_links_rl(groups, ima_groups, balance, vlines); + draw_links_tb(groups, ima_groups, balance, average_width, hlines, + scale_factor); + draw_links_bt(groups, ima_groups, balance, average_width, hlines, + scale_factor); + draw_links_lr(groups, ima_groups, balance, vlines, scale_factor); + draw_links_rl(groups, ima_groups, balance, vlines, scale_factor); draw_adjacency_boxes(balance, ima_valid, groups); /* FIXME: The code below duplicates some of the code in the @@ -505,7 +525,7 @@ int main(int argc, char** argv) || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && abs(p1[1] - p2[1]) < 20) // Vertical proximity + && abs(p1[1] - p2[1]) < 20 * scale_factor) // Vertical proximity { // Build the above/below adjacencies. node_id top_node, bottom_node; @@ -540,7 +560,7 @@ int main(int argc, char** argv) (b1.pmin()[0] == b2.pmin()[0] || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap + && abs(p1[0] - p2[0]) < 10 * scale_factor) // Reduced gap { // Build the right/left adjacencies. node_id left_node, right_node; -- 1.7.2.5

1 0

olena-2.0-407-ga3d6d79 Avoid dynamic allocation in the table detection application.
by Roland Levillain 27 Mar '13

27 Mar '13

* scribo/sandbox/icdar_13_table/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index bcf127e..15004af 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -343,7 +343,7 @@ int main(int argc, char** argv) typedef scribo::component_set< image2d<unsigned> > CS; // Loading and binarization - XML* xml = new XML("final.xml", argv[1]); + XML xml("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; unsigned dpi = 72; @@ -609,6 +609,4 @@ int main(int argc, char** argv) write_image(ima_valid, "valid", page, number, path); write_image(ima_columns, "columns", page, number, path); } - - delete xml; } -- 1.7.2.5

1 0

olena-2.0-406-g1ba1a2b Configure scribo/src/contest/table-2013/Makefile.
by Roland Levillain 27 Mar '13

27 Mar '13

* configure.ac: Here. --- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index f21e54c..67bfc2c 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,7 @@ AC_CONFIG_FILES([ scribo/src/contest/Makefile scribo/src/contest/hdibco-2010/Makefile scribo/src/contest/hdlac-2011/Makefile + scribo/src/contest/table-2013/Makefile scribo/src/debug/Makefile scribo/src/filter/Makefile scribo/src/misc/Makefile -- 1.7.2.5

1 0

olena-2.0-405-g46b77de Equip scribo/src/contest/table-2013/.
by Roland Levillain 27 Mar '13

27 Mar '13

* scribo/src/contest/table-2013/Makefile.am, * scribo/src/contest/table-2013/README: New. * scribo/src/contest/table-2013/Makefile, * scribo/src/contest/table-2013/README_ROLAND: Remove. * scribo/src/contest/Makefile.am (SUBDIRS): Add table-2013. --- scribo/src/contest/Makefile.am | 3 +- scribo/src/contest/table-2013/Makefile | 27 ---------- .../nepomuk => contest/table-2013}/Makefile.am | 44 ++++++++-------- scribo/src/contest/table-2013/README | 54 ++++++++++++++++++++ scribo/src/contest/table-2013/README_ROLAND | 18 ------- 5 files changed, 77 insertions(+), 69 deletions(-) delete mode 100644 scribo/src/contest/table-2013/Makefile copy scribo/src/{toolchain/nepomuk => contest/table-2013}/Makefile.am (52%) create mode 100644 scribo/src/contest/table-2013/README delete mode 100644 scribo/src/contest/table-2013/README_ROLAND diff --git a/scribo/src/contest/Makefile.am b/scribo/src/contest/Makefile.am index b69291e..2a7e21c 100644 --- a/scribo/src/contest/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -20,4 +20,5 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ DAE-2011 \ hdibco-2010 \ - hdlac-2011 + hdlac-2011 \ + table-2013 diff --git a/scribo/src/contest/table-2013/Makefile b/scribo/src/contest/table-2013/Makefile deleted file mode 100644 index baa9ae1..0000000 --- a/scribo/src/contest/table-2013/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -CCACHE=ccache -CC=g++ -CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG -DMLN_WO_GLOBAL_VARS -CFLAGS_OLD=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG -CLIBS=-I../../../milena/ -I../../ -I/usr/include/poppler -CLEAN=*.o output/* log final.xml - -SRC=src/xml.cc src/new.cc -SRC_OLD=src/main.cc -OUTPUT=table -OUTPUT_OLD=old - -all: table - -table: - $(CCACHE) $(CC) $(CFLAGS) $(CLIBS) $(SRC) -ltesseract -lpoppler-cpp -o $(OUTPUT) - -old: - $(CCACHE) $(CC) $(CFLAGS_OLD) $(CLIBS) $(SRC_OLD) -ltesseract -lpoppler-cpp -o $(OUTPUT_OLD) - -clean: - rm -rf $(CLEAN) - -mrproper: clean - rm -f $(OUTPUT) $(OUTPUT_OLD) - -.PHONY: table clean mrproper diff --git a/scribo/src/toolchain/nepomuk/Makefile.am b/scribo/src/contest/table-2013/Makefile.am similarity index 52% copy from scribo/src/toolchain/nepomuk/Makefile.am copy to scribo/src/contest/table-2013/Makefile.am index 03f0e01..50162a5 100644 --- a/scribo/src/toolchain/nepomuk/Makefile.am +++ b/scribo/src/contest/table-2013/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,29 +16,28 @@ include $(top_srcdir)/scribo/scribo.mk -noinst_PROGRAMS = +all-local: + test -d output || mkdir output -if HAVE_QT -if HAVE_MAGICKXX +EXTRA_DIST = README TODO originals/competition-entry-region-model.xsd + +if HAVE_POPPLER if HAVE_TESSERACT -noinst_PROGRAMS += \ -text_extraction - -text_extraction_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - $(TESSERACT_CPPFLAGS) \ - $(TIFF_CPPFLAGS) \ - $(QT_CPPFLAGS) \ - -I$(top_builddir) -text_extraction_LDFLAGS = $(AM_LDFLAGS) \ - $(MAGICKXX_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - $(TIFF_LDFLAGS) \ - $(QT_LDFLAGS) \ - $(QT_LIBS) \ - -lpthread +AM_CPPFLAGS += $(POPPLER_CPPFLAGS) $(TESSERACT_CPPFLAGS) +AM_CXXFLAGS += -Wall -Werror -O3 -DNDEBUG -DMLN_WO_GLOBAL_VARS +AM_LDFLAGS = $(POPPLER_LDFLAGS) $(TESSERACT_LDFLAGS) + +noinst_PROGRAMS = table old + +table_SOURCES = src/disjoint_set.hh src/xml.hh src/xml.cc src/new.cc +table_CXXFLAGS = $(AM_CXXFLAGS) -DMLN_WO_GLOBAL_VARS +old_SOURCES = src/main.cc endif HAVE_TESSERACT -endif HAVE_MAGICKXX -endif HAVE_QT \ No newline at end of file +endif HAVE_POPPLER + +CLEANFILES = log final.xml + +clean-local: + -rm -rf output diff --git a/scribo/src/contest/table-2013/README b/scribo/src/contest/table-2013/README new file mode 100644 index 0000000..7e2d18c --- /dev/null +++ b/scribo/src/contest/table-2013/README @@ -0,0 +1,54 @@ +* Conference +ICDAR 2013 + +* Contest +Table Competition (location and structure recognition) + +* Description +The problems of table detection and table structure recognition in +documents have attracted much interest not only from the document +analysis community, but also from the database and information +extraction (IE) communities. Whereas traditional methods have worked +on scanned images of pages, a number of approaches from related fields +have used natively-digital document formats. The choice of +born-digital PDF as the format for this competition is designed to +unify both types of approaches, and the objective of this competition +is to measure the state of the art and compare the relative advantages +of both types of approach. + +This competition is split up into two sub-competitions, table +detection or location and table structure recognition. Entrants may +choose to enter either one, or both, sub-competitions. In a previous +publication, we proposed document-generic models for both of these +procedures and generated a publicly available, ground-truthed dataset. +The format for the ground truth, as well as methods for numerically +comparing an algorithm's result to the ground truth, are also +described in this paper. + +This dataset serves as the example dataset, against which all entries +can be tested before submission. Entries will be evaluated using the +methods described in the paper. Our paper also describes the +functional analysis of tables; this does not form part of the present +competition. + +* URL +http://www.tamirhassan.com/competition.html + +* Source code + +Compilation and cleaning : + * make (generates the main program) + * make old (generates the old program (without scribo toolchain)) + * make clean (remove all files expect the binary) + +Usage : + * ./table [your-pdf-file] + Generate debug images in the output/ directory and the final.xml + * ./old [your-pdf-file] + Same thing but old processing (without scribo toolchain) + + +Local Variables: +mode: outline +ispell-local-dictionary: "american" +End: diff --git a/scribo/src/contest/table-2013/README_ROLAND b/scribo/src/contest/table-2013/README_ROLAND deleted file mode 100644 index 89b70dc..0000000 --- a/scribo/src/contest/table-2013/README_ROLAND +++ /dev/null @@ -1,18 +0,0 @@ -#------------------------------------------------------------------------------# - README - ICDAR 2013 - Table competition -#------------------------------------------------------------------------------# - -FIRST OF ALL : - * mkdir output - -Compilation and cleaning : - * make (generates the main program) - * make old (generates the old program (without scribo toolchain)) - * make clean (remove all files expect the binary) - * make mrproper (remove all files) - -Usage : - * ./table [your-pdf-file] - Generate debug images in the output/ directory and the final.xml - * ./old [your-pdf-file] - Same thing but old processing (without scribo toolchain) -- 1.7.2.5

1 0

olena-2.0-403-gb261c2b configure.ac: Aesthetic changes.
by Roland Levillain 27 Mar '13

27 Mar '13

--- configure.ac | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3b5a3aa..f21e54c 100644 --- a/configure.ac +++ b/configure.ac @@ -347,10 +347,10 @@ AC_CONFIG_FILES([ scribo/doc/Makefile scribo/src/Makefile scribo/src/binarization/Makefile - scribo/src/contest/Makefile - scribo/src/contest/hdibco-2010/Makefile - scribo/src/contest/hdlac-2011/Makefile - scribo/src/contest/DAE-2011/Makefile + scribo/src/contest/DAE-2011/Makefile + scribo/src/contest/Makefile + scribo/src/contest/hdibco-2010/Makefile + scribo/src/contest/hdlac-2011/Makefile scribo/src/debug/Makefile scribo/src/filter/Makefile scribo/src/misc/Makefile -- 1.7.2.5

1 0

olena-2.0-402-g57d6bf8 scribo/src/contest/Makefile.am: Aesthetic changes.
by Roland Levillain 27 Mar '13

27 Mar '13

--- scribo/src/contest/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scribo/src/contest/Makefile.am b/scribo/src/contest/Makefile.am index b01804b..b69291e 100644 --- a/scribo/src/contest/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -18,6 +18,6 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ - hdibco-2010 \ - hdlac-2011 \ - DAE-2011 \ No newline at end of file + DAE-2011 \ + hdibco-2010 \ + hdlac-2011 -- 1.7.2.5

1 0

olena-2.0-446-gd8058ce Add constant Boolean functions.
by Guillaume Lazzara 27 Mar '13

27 Mar '13

--- milena/ChangeLog | 7 +++++++ milena/mln/fun/v2b/{lnot.hh => always_false.hh} | 23 ++++++++++++----------- milena/mln/fun/v2b/{lnot.hh => always_true.hh} | 23 ++++++++++++----------- 3 files changed, 31 insertions(+), 22 deletions(-) copy milena/mln/fun/v2b/{lnot.hh => always_false.hh} (80%) mode change 100644 => 100755 copy milena/mln/fun/v2b/{lnot.hh => always_true.hh} (80%) mode change 100644 => 100755 diff --git a/milena/ChangeLog b/milena/ChangeLog index 116e287..1b7691e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add constant Boolean functions. + + * mln/fun/v2b/always_false.hh, + * mln/fun/v2b/always_true.hh: New. + 2013-03-05 Roland Levillain <roland(a)lrde.epita.fr> Remove morpho::meyer_wst. diff --git a/milena/mln/fun/v2b/lnot.hh b/milena/mln/fun/v2b/always_false.hh old mode 100644 new mode 100755 similarity index 80% copy from milena/mln/fun/v2b/lnot.hh copy to milena/mln/fun/v2b/always_false.hh index 73d9ecf..96f843c --- a/milena/mln/fun/v2b/lnot.hh +++ b/milena/mln/fun/v2b/always_false.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_FUN_V2B_LNOT_HH -# define MLN_FUN_V2B_LNOT_HH +#ifndef MLN_FUN_V2V_ALWAYS_FALSE_HH +# define MLN_FUN_V2V_ALWAYS_FALSE_HH /// \file /// @@ -44,21 +44,22 @@ namespace mln /// Functor computing logical-not on a value. template <typename V> - struct lnot : public Function_v2b< lnot<V> > + struct always_false : public Function_v2b< always_false<V> > { - typedef V result; - V operator()(const V& v) const; + typedef bool result; + typedef V argument; + + bool operator()(const V&) const; }; # ifndef MLN_INCLUDE_ONLY template <typename V> - inline - V - lnot<V>::operator()(const V& v) const + bool + always_false<V>::operator()(const V&) const { - return ! v; + return false; } # endif // ! MLN_INCLUDE_ONLY @@ -70,4 +71,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_FUN_V2B_LNOT_HH +#endif // ! MLN_FUN_V2V_ALWAYS_FALSE_HH diff --git a/milena/mln/fun/v2b/lnot.hh b/milena/mln/fun/v2b/always_true.hh old mode 100644 new mode 100755 similarity index 80% copy from milena/mln/fun/v2b/lnot.hh copy to milena/mln/fun/v2b/always_true.hh index 73d9ecf..4226422 --- a/milena/mln/fun/v2b/lnot.hh +++ b/milena/mln/fun/v2b/always_true.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_FUN_V2B_LNOT_HH -# define MLN_FUN_V2B_LNOT_HH +#ifndef MLN_FUN_V2V_ALWAYS_TRUE_HH +# define MLN_FUN_V2V_ALWAYS_TRUE_HH /// \file /// @@ -44,21 +44,22 @@ namespace mln /// Functor computing logical-not on a value. template <typename V> - struct lnot : public Function_v2b< lnot<V> > + struct always_true : public Function_v2b< always_true<V> > { - typedef V result; - V operator()(const V& v) const; + typedef bool result; + typedef V argument; + + bool operator()(const V&) const; }; # ifndef MLN_INCLUDE_ONLY template <typename V> - inline - V - lnot<V>::operator()(const V& v) const + bool + always_true<V>::operator()(const V&) const { - return ! v; + return true; } # endif // ! MLN_INCLUDE_ONLY @@ -70,4 +71,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_FUN_V2B_LNOT_HH +#endif // ! MLN_FUN_V2V_ALWAYS_TRUE_HH -- 1.7.2.5

2 1

olena-2.0-449-ga744093 configure.ac: Allow tarballs with long filenames.
by Guillaume Lazzara 27 Mar '13

27 Mar '13

--- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9f7ffd..f26f566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Allow tarballs with long filenames. + 2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Configure scribo/src/contest/hnla-2013 and diff --git a/configure.ac b/configure.ac index 0f809b4..9502b5b 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ AC_CONFIG_FILES([build-aux/Makefile]) # Disable the -Wextra-portability option until developers can all use # Automake 1.11.2 or newer (Debian GNU/Linux 6 ships Automake 1.11.1 # only), at which point we'll use the new AM_PROG_AR macro instead. -AM_INIT_AUTOMAKE([1.11 subdir-objects check-news tar-ustar dist-bzip2 +AM_INIT_AUTOMAKE([1.11 subdir-objects check-news tar-pax dist-bzip2 parallel-tests nostdinc silent-rules -Wall -Wno-extra-portability]) # By default, let "make" hide the compilation command and display a -- 1.7.2.5

1 0