Olena-patches March 2013

olena-patches@lrde.epita.fr

5 participants
214 discussions

Start a nNew thread

branch unstable/scribo updated: olena-2.0-429-g62fccd1

by git＠lrde.epita.fr

11 years, 1 month

olena-2.0-429-g62fccd1 Fix some preconditions.

by Guillaume Lazzara

* scribo/core/document.hh: Relax some preconditions. * scribo/primitive/extract/alignments.hh: New precondition. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo/core/document.hh | 6 +++--- scribo/scribo/primitive/extract/alignments.hh | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f73238c..5cb86af 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix some preconditions. + + * scribo/core/document.hh: Relax some preconditions. + + * scribo/primitive/extract/alignments.hh: New precondition. + +2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Add overloads. 2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 7ca7a23..1250dcb 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -221,7 +221,7 @@ namespace scribo const char * document<L>::filename() const { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); return data_->filename_.c_str(); } @@ -239,7 +239,7 @@ namespace scribo void document<L>::open() { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); mln::io::magick::load(data_->image_, data_->filename_); } @@ -248,7 +248,7 @@ namespace scribo bool document<L>::is_open() const { - mln_precondition(is_valid()); + mln_precondition(data_ != 0); return data_->image_.is_valid(); } diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 27e2ad6..7bd9b94 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -575,6 +575,7 @@ namespace scribo mln_precondition(doc.is_valid()); mln_precondition(doc.has_text()); const mln_ch_value(L,bool)& input = doc.binary_image(); + mln_assertion(input.is_valid()); unsigned min_card = 3; unsigned delta = 5; -- 1.7.2.5

11 years, 1 month

branch unstable/scribo updated: olena-2.0-428-g2fe026c

by git＠lrde.epita.fr

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 unstable/scribo has been updated discards 275b60f548221f4df2457804b2211065d45fec13 (commit) via 2fe026c16ad4d9df4266c16993684576ba8b495d (commit) via f92264244ca22751936f2f909ab911a2e6d9753f (commit) via 81bdc8aae8645f38551682ac4ac8e2657cc7b3d9 (commit) via b375ab3e82b52e4a07a4590c02272c718f8ffa6c (commit) via 4938c8d839f9d4994cf577d8dd57906636d9d25d (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (275b60f548221f4df2457804b2211065d45fec13) \ N -- N -- N (2fe026c16ad4d9df4266c16993684576ba8b495d) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 2fe026c scribo/binarization/sauvola_ms.hh: Add overloads. f922642 scribo/core/document.hh: Add more assertions. 81bdc8a scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: Fix an invalid forward declaration. b375ab3 doc/Makefile.am: Fix EXTRA_DIST. 4938c8d Small fixes. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++ milena/doc/Makefile.am | 25 ++++++--- scribo/ChangeLog | 16 ++++++- scribo/scribo/binarization/sauvola_ms.hh | 19 +++++++ scribo/scribo/core/document.hh | 53 +++++++++++++++++++- .../with_single_left_link_dmax_ratio_aligned.hh | 11 ++-- 6 files changed, 112 insertions(+), 16 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 1 month

olena-2.0-428-g2fe026c scribo/binarization/sauvola_ms.hh: Add overloads.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_ms.hh | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9e05883..f73238c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Add overloads. + +2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/document.hh: Add more assertions. 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 979a4e9..6a9751c 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -141,6 +141,17 @@ namespace scribo sauvola_ms(const Image<I>& input_1, unsigned w_1, unsigned s); /// \overload + /// The integral image is not returned. + /// K is set to 0.34. + /// s is set to 3. + /// + /// \ingroup grpalgobinsauvola + // + template <typename I> + mln_ch_value(I,bool) + sauvola_ms(const Image<I>& input_1, unsigned w_1); + + /// \overload /// Allow to specify a different k parameter for each scale. // template <typename I> @@ -1064,6 +1075,14 @@ namespace scribo template <typename I> mln_ch_value(I,bool) + sauvola_ms(const Image<I>& input_1, unsigned w_1) + { + return sauvola_ms(input_1, w_1, 3); + } + + + template <typename I> + mln_ch_value(I,bool) sauvola_ms(const Image<I>& input_1, unsigned w_1, unsigned s, double k2, double k3, double k4) { -- 1.7.2.5

11 years, 1 month

olena-2.0-427-gf922642 scribo/core/document.hh: Add more assertions.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 +++ scribo/scribo/core/document.hh | 53 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 137da91..9e05883 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-03-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/core/document.hh: Add more assertions. + 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh: diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 0a6ca5a..7ca7a23 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -157,7 +157,6 @@ namespace scribo const mln::image2d<bool>& binary_image_wo_seps() const; void set_binary_image_wo_seps(const mln::image2d<bool>& binary_image_wo_seps); - private: mln::util::tracked_ptr<data_t> data_; }; @@ -198,6 +197,7 @@ namespace scribo template <typename L> document<L>::document() + : data_(0) { } @@ -221,6 +221,7 @@ namespace scribo const char * document<L>::filename() const { + mln_precondition(is_valid()); return data_->filename_.c_str(); } @@ -229,6 +230,7 @@ namespace scribo void document<L>::set_filename(const char *filename) { + mln_precondition(is_valid()); data_->filename_ = filename; } @@ -237,6 +239,7 @@ namespace scribo void document<L>::open() { + mln_precondition(is_valid()); mln::io::magick::load(data_->image_, data_->filename_); } @@ -245,6 +248,7 @@ namespace scribo bool document<L>::is_open() const { + mln_precondition(is_valid()); return data_->image_.is_valid(); } @@ -253,7 +257,7 @@ namespace scribo bool document<L>::is_valid() const { - return data_->image_.is_valid(); + return data_ != 0 && data_->image_.is_valid(); } @@ -261,6 +265,8 @@ namespace scribo mln::def::coord document<L>::width() const { + mln_precondition(is_valid()); + mln_precondition(data_->image_.is_valid()); return data_->image_.ncols(); } @@ -269,6 +275,8 @@ namespace scribo mln::def::coord document<L>::height() const { + mln_precondition(is_valid()); + mln_precondition(data_->image_.is_valid()); return data_->image_.nrows(); } @@ -277,6 +285,7 @@ namespace scribo bool document<L>::has_text() const { + mln_precondition(is_valid()); return data_->parset_.is_valid(); } @@ -285,6 +294,8 @@ namespace scribo const line_set<L>& document<L>::lines() const { + mln_precondition(is_valid()); + mln_precondition(data_->parset_.is_valid()); return data_->parset_.lines(); } @@ -292,6 +303,7 @@ namespace scribo const paragraph_set<L>& document<L>::paragraphs() const { + mln_precondition(is_valid()); return data_->parset_; } @@ -300,6 +312,8 @@ namespace scribo void document<L>::set_paragraphs(const paragraph_set<L>& parset) { + mln_precondition(is_valid()); + mln_precondition(parset.is_valid()); data_->parset_ = parset; } @@ -308,6 +322,7 @@ namespace scribo const component_set<L>& document<L>::elements() const { + mln_precondition(is_valid()); return data_->elements_; } @@ -316,6 +331,7 @@ namespace scribo bool document<L>::has_elements() const { + mln_precondition(is_valid()); return data_->elements_.is_valid(); } @@ -324,6 +340,8 @@ namespace scribo void document<L>::set_elements(const component_set<L>& elements) { + mln_precondition(is_valid()); + mln_precondition(elements.is_valid()); data_->elements_ = elements; } @@ -331,6 +349,7 @@ namespace scribo bool document<L>::has_whitespace_seps() const { + mln_precondition(is_valid()); return data_->whitespace_seps_.is_valid(); } @@ -339,6 +358,7 @@ namespace scribo const mln::image2d<bool>& document<L>::whitespace_seps() const { + mln_precondition(is_valid()); return data_->whitespace_seps_; } @@ -347,6 +367,7 @@ namespace scribo const component_set<L>& document<L>::whitespace_seps_comps() const { + mln_precondition(is_valid()); return data_->whitespace_seps_comps_; } @@ -356,6 +377,9 @@ namespace scribo document<L>::set_whitespace_separators(const image2d<bool>& whitespace_seps, const component_set<L>& whitespace_seps_comps) { + mln_precondition(is_valid()); + mln_precondition(whitespace_seps.is_valid()); + mln_precondition(whitespace_seps_comps.is_valid()); data_->whitespace_seps_ = whitespace_seps; data_->whitespace_seps_comps_ = whitespace_seps_comps; } @@ -365,6 +389,7 @@ namespace scribo bool document<L>::has_hline_seps() const { + mln_precondition(is_valid()); return data_->hline_seps_.is_valid(); } @@ -373,6 +398,7 @@ namespace scribo const mln::image2d<bool>& document<L>::hline_seps() const { + mln_precondition(is_valid()); return data_->hline_seps_; } @@ -381,6 +407,7 @@ namespace scribo const component_set<L>& document<L>::hline_seps_comps() const { + mln_precondition(is_valid()); return data_->hline_seps_comps_; } @@ -389,6 +416,8 @@ namespace scribo void document<L>::set_hline_separators(const image2d<bool>& hline_seps) { + mln_precondition(is_valid()); + mln_precondition(hline_seps.is_valid()); data_->hline_seps_ = hline_seps; mln_value(L) ncomps; @@ -404,6 +433,9 @@ namespace scribo document<L>::set_hline_separators(const image2d<bool>& hline_seps, const component_set<L>& hline_seps_comps) { + mln_precondition(is_valid()); + mln_precondition(hline_seps.is_valid()); + mln_precondition(hline_seps_comps.is_valid()); data_->hline_seps_ = hline_seps; data_->hline_seps_comps_ = hline_seps_comps; } @@ -413,6 +445,7 @@ namespace scribo bool document<L>::has_vline_seps() const { + mln_precondition(is_valid()); return data_->vline_seps_.is_valid(); } @@ -421,6 +454,7 @@ namespace scribo const mln::image2d<bool>& document<L>::vline_seps() const { + mln_precondition(is_valid()); return data_->vline_seps_; } @@ -429,6 +463,7 @@ namespace scribo const component_set<L>& document<L>::vline_seps_comps() const { + mln_precondition(is_valid()); return data_->vline_seps_comps_; } @@ -437,6 +472,8 @@ namespace scribo void document<L>::set_vline_separators(const image2d<bool>& vline_seps) { + mln_precondition(is_valid()); + mln_precondition(vline_seps.is_valid()); data_->vline_seps_ = vline_seps; mln_value(L) ncomps; @@ -452,6 +489,9 @@ namespace scribo document<L>::set_vline_separators(const image2d<bool>& vline_seps, const component_set<L>& vline_seps_comps) { + mln_precondition(is_valid()); + mln_precondition(vline_seps.is_valid()); + mln_precondition(vline_seps_comps.is_valid()); data_->vline_seps_ = vline_seps; data_->vline_seps_comps_ = vline_seps_comps; } @@ -461,6 +501,7 @@ namespace scribo const mln::image2d<value::rgb8>& document<L>::image() const { + mln_precondition(is_valid()); return data_->image_; } @@ -469,6 +510,8 @@ namespace scribo void document<L>::set_image(const mln::image2d<value::rgb8>& image) { + mln_precondition(data_ != 0); + mln_precondition(image.is_valid()); data_->image_ = image; } @@ -477,6 +520,7 @@ namespace scribo const mln::image2d<bool>& document<L>::binary_image() const { + mln_precondition(is_valid()); return data_->binary_image_; } @@ -485,6 +529,8 @@ namespace scribo void document<L>::set_binary_image(const mln::image2d<bool>& binary_image) { + mln_precondition(is_valid()); + mln_precondition(binary_image.is_valid()); data_->binary_image_ = binary_image; } @@ -493,6 +539,7 @@ namespace scribo const mln::image2d<bool>& document<L>::binary_image_wo_seps() const { + mln_precondition(is_valid()); return data_->binary_image_wo_seps_; } @@ -502,6 +549,8 @@ namespace scribo document<L>::set_binary_image_wo_seps( const mln::image2d<bool>& binary_image_wo_seps) { + mln_precondition(is_valid()); + mln_precondition(binary_image_wo_seps.is_valid()); data_->binary_image_wo_seps_ = binary_image_wo_seps; } -- 1.7.2.5

11 years, 1 month

branch table-graph created: olena-2.0-400-g023cbf5

by git＠lrde.epita.fr

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 created at 023cbf59ff759cee729101b2fa1a3e859f49d14b (commit) - Log ----------------------------------------------------------------- 023cbf5 Build the set of detected columns during table recognition. 51f7eab Build spatial relations between text boxes as directed graphs. bbdd9a7 Fix various issues in the table detection experiment. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 1 month

olena-2.0-400-g023cbf5 Build the set of detected columns during table recognition.

by Roland Levillain

* scribo/sandbox/icdar_13_table/src/new.cc: Here. * scribo/sandbox/icdar_13_table/src/disjoint_set.hh: New. --- scribo/sandbox/icdar_13_table/src/disjoint_set.hh | 54 +++++++++++++++++++++ scribo/sandbox/icdar_13_table/src/new.cc | 36 ++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/src/disjoint_set.hh diff --git a/scribo/sandbox/icdar_13_table/src/disjoint_set.hh b/scribo/sandbox/icdar_13_table/src/disjoint_set.hh new file mode 100644 index 0000000..b8ae409 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/src/disjoint_set.hh @@ -0,0 +1,54 @@ +#ifndef DISJOINT_SET_HH +# define DISJOINT_SET_HH + +/// \file +/// Implementation of a disjoint-set forest. + +# include <limits> +# include <vector> + +template <typename T> +struct disjoint_set +{ + disjoint_set(size_t size) + // The maximum value of T is considered an ``invalid value''. + : parent(size, std::numeric_limits<T>::max()) + { + for (unsigned i = 0; i < parent.size(); ++i) + make_set(i); + } + + /// Create initial sets (singletons). + void make_set(T x) + { + parent[x] = x; + } + + bool is_root(T x) + { + return parent[x] == x; + } + + /// Find the root of the set containing \a x. + T find(T x) + { + if (!is_root(x)) + // Path compression. + parent[x] = find(parent[x]); + return parent[x]; + } + + /// Merge the set containing \a y into the set containing \a x. + void make_union(T x, T y) + { + T x_root = find(x); + T y_root = find(y); + parent[y_root] = x_root; + } + + /// Parent relationship. A node with is its own parent is a + /// root (representative of a component). + std::vector<T> parent; +}; + +#endif // ! DISJOINT_SET_HH diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 2c41e31..bcf127e 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -54,6 +54,8 @@ #include <scribo/text/extract_paragraphs.hh> #include <scribo/text/merging.hh> +#include "disjoint_set.hh" + using namespace mln; // Draw weighted boxes (red < orange < cyan < green) @@ -558,6 +560,39 @@ int main(int argc, char** argv) } } + // Build the columns. + // First pass. + disjoint_set<node_id> columns_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) + columns_set.make_union(i, *j); + } + // Second pass: assign labels. Label 0 is unused and means + // ``default''. + std::vector<group_set> 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); + } + + // Visualization: columns. + image2d<value::rgb8> ima_columns = 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); + } + // Write images and close XML std::ostringstream path; unsigned number = 0; @@ -572,6 +607,7 @@ 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); } delete xml; -- 1.7.2.5

11 years, 1 month

olena-2.0-399-g51f7eab Build spatial relations between text boxes as directed graphs.

by Roland Levillain

* scribo/sandbox/icdar_13_table/src/new.cc: Here. --- scribo/sandbox/icdar_13_table/src/new.cc | 89 ++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 02e7594..2c41e31 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -469,6 +469,95 @@ int main(int argc, char** argv) draw_links_rl(groups, ima_groups, balance, vlines); draw_adjacency_boxes(balance, ima_valid, groups); + /* FIXME: The code below duplicates some of the code in the + draw_links_* routines. Factor. */ + // Adjacencies between nodes. Of course, an actual digraph data + // structure would be better. + typedef unsigned node_id; + typedef std::set<node_id> group_set; + typedef std::vector<group_set> adjacencies; + adjacencies nodes_below(groups.nelements()); + adjacencies nodes_above(groups.nelements()); + adjacencies nodes_right(groups.nelements()); + adjacencies nodes_left(groups.nelements()); + + // Draw vertical links (red) + for (unsigned i = 1; i < groups.nelements(); ++i) + { + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + unsigned max_height = std::max(b1.height(), b2.height()); + unsigned min_height = std::min(b1.height(), b2.height()); + + if (/* p1[0] < p2[0] // Avoid redundancy + && */ + max_height * 2 < bin_merged.ncols() + && min_height + 3 >= max_height // Same heights + && b1.width() < 2 * average_width && b2.width() < 2 * average_width // Regular width + && (b1.pmin()[1] == b2.pmin()[1] + || (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 + { + // Build the above/below adjacencies. + node_id top_node, bottom_node; + if (p1.row() < p2.col()) + { + top_node = i; + bottom_node = j; + } + else + { + top_node = j; + bottom_node = i; + } + nodes_below[top_node].insert(bottom_node); + nodes_above[bottom_node].insert(top_node); + } + } + } + + // Draw horizontal links (green) + for (unsigned i = 1; i < groups.nelements(); ++i) + { + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + if (/* p1[1] < p2[1] // Avoid redundancy + && */ + (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 + { + // Build the right/left adjacencies. + node_id left_node, right_node; + if (p1.col() < p2.col()) + { + left_node = i; + right_node = j; + } + else + { + left_node = j; + right_node = i; + } + nodes_right[left_node].insert(right_node); + nodes_left[right_node].insert(left_node); + } + } + } + // Write images and close XML std::ostringstream path; unsigned number = 0; -- 1.7.2.5

11 years, 1 month

olena-2.0-398-gbbdd9a7 Fix various issues in the table detection experiment.

by Roland Levillain

* scribo/sandbox/icdar_13_table/src/new.cc: Use the multiscale version of the Sauvola binarization. (main): Remove an unused variable. Remove superfluous `return' statement. --- scribo/sandbox/icdar_13_table/src/new.cc | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index b13696e..02e7594 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -26,7 +26,6 @@ #include <tesseract/baseapi.h> // INCLUDES SCRIBO -#include <scribo/binarization/sauvola.hh> #include <scribo/binarization/sauvola_ms.hh> #include <scribo/core/component_set.hh> @@ -353,8 +352,7 @@ int main(int argc, char** argv) { I8 original = pdf[page]; image2d<value::int_u8> filtered = data::transform(original, fun::v2v::rgb_to_luma<value::int_u8>()); - IB bin = scribo::binarization::sauvola(filtered, 81, 0.44); - //IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); + IB bin = scribo::binarization::sauvola_ms(filtered, 81, 2); // Reverse selection IB reverse = logical::not_(bin); @@ -378,7 +376,6 @@ int main(int argc, char** argv) // Find separators IB bin_without_separators = duplicate(bin); - IB separators = separators; V nhlines, nvlines; unsigned min_width = 31; unsigned min_height = 71; @@ -489,6 +486,4 @@ int main(int argc, char** argv) } delete xml; - - return 0; } -- 1.7.2.5

11 years, 1 month

branch sandbox/anthony updated: olena-2.0-397-gf16ceed

by git＠lrde.epita.fr

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 sandbox/anthony has been updated via f16ceed7137269e1b484609389d59713a8a1cc2b (commit) from d276a4c40057677a7e0871dcc50ec004b068b620 (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 ----------------------------------------------------------------- f16ceed [ICDAR_13] Refactore and use of sauvola_ms instead of sauvola ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/src/new.cc | 93 +++++++++++++++++------------- 1 files changed, 53 insertions(+), 40 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2013