Olena-patches March 2013

olena-patches@lrde.epita.fr

5 participants
214 discussions

olena-2.0-110-g85cf602 Remove references to mln/morpho/meyer_wst.hh in mln/morpho/.

by Roland Levillain

* mln/morpho/all.hh, * mln/morpho/essential.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/morpho/all.hh | 1 - milena/mln/morpho/essential.hh | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 58acf3d..7bdcd1a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2012-07-19 Roland Levillain <roland(a)lrde.epita.fr> + + Remove references to mln/morpho/meyer_wst.hh in mln/morpho/. + + * mln/morpho/all.hh, + * mln/morpho/essential.hh: + Here. + 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> Replace uses morpho::meyer_wst by morpho::watershed::flooding. diff --git a/milena/mln/morpho/all.hh b/milena/mln/morpho/all.hh index c508716..c09cbc8 100644 --- a/milena/mln/morpho/all.hh +++ b/milena/mln/morpho/all.hh @@ -62,7 +62,6 @@ namespace mln # include <mln/morpho/hit_or_miss.hh> # include <mln/morpho/includes.hh> # include <mln/morpho/laplacian.hh> -# include <mln/morpho/meyer_wst.hh> # include <mln/morpho/min.hh> # include <mln/morpho/minus.hh> # include <mln/morpho/plus.hh> diff --git a/milena/mln/morpho/essential.hh b/milena/mln/morpho/essential.hh index 21c1d86..24f208f 100644 --- a/milena/mln/morpho/essential.hh +++ b/milena/mln/morpho/essential.hh @@ -37,7 +37,6 @@ # include <mln/morpho/hit_or_miss.hh> # include <mln/morpho/includes.hh> # include <mln/morpho/laplacian.hh> -# include <mln/morpho/meyer_wst.hh> # include <mln/morpho/rank_filter.hh> # include <mln/morpho/top_hat.hh> -- 1.7.2.5

11 years, 9 months

olena-2.0-106-g22a49ac No longer wrap mln::value::int_u32.

by Roland Levillain

* int_u24.i: Remove. * Makefile.am (wrappers): Remove int_u32.i. * python/Makefile.am: No longer generate Python wrapper from int_u32.i. --- swilena/ChangeLog | 9 +++++++++ swilena/Makefile.am | 1 - swilena/int_u32.i | 40 ---------------------------------------- swilena/python/Makefile.am | 10 ---------- 4 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 swilena/int_u32.i diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f1a243b..7a0142c 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + No longer wrap mln::value::int_u32. + + * int_u24.i: Remove. + * Makefile.am (wrappers): Remove int_u32.i. + * python/Makefile.am: No longer generate Python wrapper from + int_u32.i. + +2012-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Fix Swilena's build. * image2d_int_u8.i: Use int_u24 instead of int_u32 to avoid diff --git a/swilena/Makefile.am b/swilena/Makefile.am index ee2d642..908f016 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -44,7 +44,6 @@ wrappers = \ image2d_int.i \ image2d_int_u8.i \ int_u24.i \ - int_u32.i \ int_u8.i \ neighb2d.i \ point2d.i \ diff --git a/swilena/int_u32.i b/swilena/int_u32.i deleted file mode 100644 index b11662b..0000000 --- a/swilena/int_u32.i +++ /dev/null @@ -1,40 +0,0 @@ -// -*- C++ -*- -// Copyright (C) 2008 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -/// \file int_u32.i -/// \brief A wrapper of mln::value::int_u32. - -%module int_u32 - -%include "int_u.ixx" - -%{ -#include "mln/value/int_u32.hh" -%} - -%include "mln/value/int_u32.hh" - -%template (int_u32) mln::value::int_u<32>; diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 6bdc815..a49b78c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -135,16 +135,6 @@ CLEANFILES += $(nodist__int_u24_la_SOURCES) int_u24.py int_u24.py[co] @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u24-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u24.py -## int_u32. -pyexec_LTLIBRARIES += _int_u32.la -nodist__int_u32_la_SOURCES = int_u32-wrap.cc -_int_u32_la_LIBADD = $(AM_LIBADD) -CLEANFILES += $(nodist__int_u32_la_SOURCES) int_u32.py int_u32.py[co] -## Include the dependency files. Copied from Automake's generated -## case for C++. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u32-wrap.Pcc@am__quote@ -nodist_python_PYTHON += int_u32.py - ## neighb2d. pyexec_LTLIBRARIES += _neighb2d.la nodist__neighb2d_la_SOURCES = neighb2d-wrap.cc -- 1.7.2.5

11 years, 9 months

branch unstable/scribo updated: olena-2.0-323-g23f3b30

by git＠lrde.epita.fr

11 years, 9 months

olena-2.0-323-g23f3b30 tests/unit_test/unit-test.mk: Regen.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ce793fa..4cc359b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-test.mk: Regen. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Import Julien Marquegnies's implementation of XY-Cut layout analysis algorithm. diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 3884146..ec86dde 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -320,6 +320,9 @@ scribo_io_xml_internal_compute_text_colour \ scribo_io_xml_internal_print_box_coords \ scribo_io_xml_internal_print_image_coords \ scribo_io_xml_internal_time_info \ +scribo_layout_internal_hist_info \ +scribo_layout_internal_node \ +scribo_layout_xy_cut \ scribo_make_all \ scribo_make_debug_filename \ scribo_make_influence_zone_graph \ -- 1.7.2.5

11 years, 9 months

olena-2.0-321-gd346c91 Import Julien Marquegnies's implementation of XY-Cut layout analysis algorithm.

by Guillaume Lazzara

* scribo/layout/internal/hist_info.hh, * scribo/layout/internal/node.hh, * scribo/layout/xy_cut.hh, * tests/layout/Makefile.am, * tests/layout/xy_cut.cc: New. * tests/Makefile.am: Add new subdir. --- scribo/ChangeLog | 13 + .../scribo/layout/internal/hist_info.hh | 43 +- scribo/scribo/layout/internal/node.hh | 156 ++++++++ scribo/scribo/layout/xy_cut.hh | 405 ++++++++++++++++++++ scribo/tests/Makefile.am | 1 + scribo/tests/{text => layout}/Makefile.am | 5 +- .../lines_h_pattern.cc => layout/xy_cut.cc} | 32 +- 7 files changed, 615 insertions(+), 40 deletions(-) copy milena/mln/io/abort.hh => scribo/scribo/layout/internal/hist_info.hh (66%) create mode 100644 scribo/scribo/layout/internal/node.hh create mode 100644 scribo/scribo/layout/xy_cut.hh copy scribo/tests/{text => layout}/Makefile.am (87%) copy scribo/tests/{primitive/extract/lines_h_pattern.cc => layout/xy_cut.cc} (71%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 66341a3..ce793fa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Import Julien Marquegnies's implementation of XY-Cut layout + analysis algorithm. + + * scribo/layout/internal/hist_info.hh, + * scribo/layout/internal/node.hh, + * scribo/layout/xy_cut.hh, + * tests/layout/Makefile.am, + * tests/layout/xy_cut.cc: New. + + * tests/Makefile.am: Add new subdir. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove deprecated programs. * demo/demat/demat.pro, diff --git a/milena/mln/io/abort.hh b/scribo/scribo/layout/internal/hist_info.hh similarity index 66% copy from milena/mln/io/abort.hh copy to scribo/scribo/layout/internal/hist_info.hh index 9d06e7b..13de128 100644 --- a/milena/mln/io/abort.hh +++ b/scribo/scribo/layout/internal/hist_info.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,44 +23,46 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_ABORT_HH -# define MLN_IO_ABORT_HH - /// \file +/// +/// \brief Histogram information used in XY-Cut algorithm. -/// Define a function which aborts a process in io module. - -# include <cstdlib> -# include <iostream> +#ifndef SCRIBO_LAYOUT_INTERNAL_HIST_INFO_HH +# define SCRIBO_LAYOUT_INTERNAL_HIST_INFO_HH -namespace mln +namespace scribo { - namespace io + namespace layout { namespace internal { - /// The way to abort when an error occur in io processing. - void abort(); + /// \internal \brief Histogram information used in XY-Cut algorithm. + struct hist_info + { + hist_info(); + + unsigned horizontal; + unsigned vertical; + }; # ifndef MLN_INCLUDE_ONLY - inline - void abort() + hist_info::hist_info() + : horizontal(0), + vertical(0) { - std::cerr << "I/O error, aborting." << std::endl; - std::abort(); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::internal + } // end of namespace scribo::layout::internal - } // end of namespace mln::io + } // end of namespace scribo::layout -} // end of namespace mln +} // end of namespace scribo -#endif // ! MLN_IO_ABORT_HH +#endif // ! SCRIBO_LAYOUT_INTERNAL_HIST_INFO_HH diff --git a/scribo/scribo/layout/internal/node.hh b/scribo/scribo/layout/internal/node.hh new file mode 100644 index 0000000..5d937ea --- /dev/null +++ b/scribo/scribo/layout/internal/node.hh @@ -0,0 +1,156 @@ +// Copyright (C) 2013 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/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// +/// \brief Tree node class used in XY-Cut algorithm. + + +#ifndef SCRIBO_LAYOUT_INTERNAL_NODE_HH +# define SCRIBO_LAYOUT_INTERNAL_NODE_HH + +# include <mln/core/alias/box2d.hh> + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + /// \internal \brief Tree node class used in XY-Cut algorithm. + template <typename B> + class node + { + public: + node(); + node(const B& bbox); + + ~node(); + + const B& get_bbox() const; + + node* get_ls(); + const node* get_ls() const; + node* get_rs(); + const node* get_rs() const; + + bool is_leaf() const; + + void set_ls(node* n); + void set_rs(node* n); + + private: + B bbox_; + node* ls_; + node* rs_; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename B> + node::node() + : ls_(0), + rs_(0) + { + } + + template <typename B> + node::node(const B& bbox) + : bbox_(bbox), + ls_(0), + rs_(0) + { + } + + template <typename B> + node::~node() + { + if (ls_) + delete ls_; + + if (rs_) + delete rs_; + } + + template <typename B> + const B& node::get_bbox() const + { + return bbox_; + } + + template <typename B> + node* node::get_ls() + { + return ls_; + } + + template <typename B> + const node* node::get_ls() const + { + return ls_; + } + + template <typename B> + node* node::get_rs() + { + return rs_; + } + + template <typename B> + const node* node::get_rs() const + { + return rs_; + } + + template <typename B> + bool node::is_leaf() const + { + return ls_ == rs_; + } + + template <typename B> + void node::set_ls(node* n) + { + ls_ = n; + } + + template <typename B> + void node::set_rs(node* n) + { + rs_ = n; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_NODE_HH diff --git a/scribo/scribo/layout/xy_cut.hh b/scribo/scribo/layout/xy_cut.hh new file mode 100644 index 0000000..d6818e9 --- /dev/null +++ b/scribo/scribo/layout/xy_cut.hh @@ -0,0 +1,405 @@ +// Copyright (C) 2013 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/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file +/// +/// \brief XY-Cut layout analysis algorithm. + +#ifndef SCRIBO_LAYOUT_XY_CUT_HH +# define SCRIBO_LAYOUT_XY_CUT_HH + +# include <mln/geom/min_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/max_col.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/macros.hh> +# include <mln/util/array.hh> +# include <scribo/layout/internal/hist_info.hh> +# include <scribo/layout/internal/node.hh> + +namespace scribo +{ + + namespace layout + { + using namespace mln; + + /// \brief XY-Cut layout analysis algorithm. + /*! This algorithm is an implementation made from \cite + nagy.1992.computer7 : "A prototype document image analysis + system for technical journals.". + + It recusively subdivides empty spaces in the document until a + minimum division size is reached. The latter is defined with \p + min_height and \p min_width. + + \input[in] ima A binary image. + \input[in] min_height The minimum height of a subdivision. + \input[in] min_width The minimum width of a subdivision. + + \return An array of component group bounding boxes. + */ + template <typename I> + mln::util::array<mln_box(I)> + xy_cut(const Image& ima, int min_height, int min_width); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + + //------------------------- + // Compute horizontal hist info + //------------------------- + + template <typename I> + void compute_hist_info_h(const Image& input_, + mln_ch_value(I,internal::hist_info)& hist) + { + trace::entering("compute_hist_info_h"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mln_precondition(hist.is_valid()); + + unsigned accumulator = 0; + + for (unsigned i = geom::min_row(input); i <= geom::max_row(input); ++i) + { + accumulator = 0; + for (unsigned j = geom::min_col(input); j <= geom::max_col(input); ++j) + { + if (input.at_(i, j)) + ++accumulator; + + hist.at_(i, j).horizontal = accumulator; + } + } + + trace::exiting("compute_hist_info_h"); + } + + + //------------------------- + // Compute vertical hist info + //------------------------- + + template <typename I> + void compute_hist_info_v(const Image& input_, + mln_ch_value(I,internal::hist_info)& hist) + { + trace::entering("compute_hist_info_v"); + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mln_precondition(hist.is_valid()); + + unsigned accumulator = 0; + + for (unsigned j = geom::min_col(input); j <= geom::max_col(input); ++j) + { + accumulator = 0; + for (unsigned i = geom::min_row(input); i <= geom::max_row(input); ++i) + { + if (input.at_(i, j)) + ++accumulator; + + hist.at_(i, j).vertical = accumulator; + } + } + + trace::exiting("compute_hist_info_v"); + } + + + + template <typename H> + void horizontal_whitespace(const Image<H>& hist_, + const mln_site(H)& pmin, + const mln_site(H)& pmax, + int& max_height, + int& ws_min_row, + int& ws_max_row) + { + trace::entering("horizontal_whitespace"); + + typedef mln_value(H) V; + mlc_is(V,internal::hist_info)::check(); + + const H& hist = exact(hist_); + + mln_precondition(hist.is_valid()); + + const int x_min = pmin.col(); + const int x_max = pmax.col(); + const int y_min = pmin.row(); + const int y_max = pmax.row(); + + for (int y = y_min; y <= y_max; ++y) + { + const int n_white_pixels = hist.at_(y, x_max).horizontal - + hist.at_(y, x_min).horizontal; + + if (!n_white_pixels) + { + int r = y + 1; // r : row + + // While there is a gap in the histogram + for (; r <= y_max && !(hist.at_(r, x_max).horizontal - + hist.at_(r, x_min).horizontal); ++r); + + const int count = r - y; + + if (count > max_height) + { + max_height = count; + ws_min_row = (y == y_min) ? y_min : y - 1; + ws_max_row = r; + } + + y = r; + } + } + + trace::exiting("horizontal_whitespace"); + } + + + template <typename H> + void vertical_whitespace(const Image<H>& hist_, + const mln_site(H)& pmin, + const mln_site(H)& pmax, + int& max_width, + int& ws_min_col, + int& ws_max_col) + { + trace::entering("vertical_whitespace"); + + typedef mln_value(H) V; + mlc_is(V,internal::hist_info)::check(); + + const H& hist = exact(hist_); + + mln_precondition(hist.is_valid()); + + const int x_min = pmin.col(); + const int x_max = pmax.col(); + const int y_min = pmin.row(); + const int y_max = pmax.row(); + + for (int x = x_min; x <= x_max; ++x) + { + const int n_white_pixels = hist.at_(y_max, x).vertical - + hist.at_(y_min, x).vertical; + + if (!n_white_pixels) + { + int c = x + 1; // c : column + + // While there is a gap in the histogram + for (; c <= x_max && !(hist.at_(y_max, c).vertical - + hist.at_(y_min, c).vertical); ++c); + + const int count = c - x; + + if (count > max_width) + { + max_width = count; + ws_min_col = (x == x_min) ? x_min : x - 1; + ws_max_col = c; + } + + x = c; + } + } + + trace::exiting("vertical_whitespace"); + } + + + template <typename H> + void do_xy_cut(const Image<H>& hist_, + node<mln_box(H)>* root, + const mln_box(H)& domain, + const bool horizontal, + const bool should_stop, + const int min_height, + const int min_width) + { + trace::entering("do_xy_cut"); + + typedef mln_value(H) V; + mlc_is(V,internal::hist_info)::check(); + + const H& hist = exact(hist_); + + mln_precondition(hist.is_valid()); + mln_precondition(root != 0); + mln_precondition(domain.is_valid()); + + const mln_site(H)& pmin = domain.pmin(); + const mln_site(H)& pmax = domain.pmax(); + const int x_min = pmin.col(); + const int x_max = pmax.col(); + const int y_min = pmin.row(); + const int y_max = pmax.row(); + + if (horizontal) + { + int max_height = 0; + int ws_min_row = 0; // Whitespace min and max + int ws_max_row = 0; // rows + + horizontal_whitespace(hist, pmin, pmax, max_height, ws_min_row, ws_max_row); + + if (max_height < min_height || max_height == (pmax.row() - pmin.row())) + { + if (should_stop) + return; + + do_xy_cut(hist, root, domain, false, true, min_height, min_width); + } + else + { + typedef mln_box(H) B; + node* ls = (ws_min_row == y_min) ? 0 : + new node(box2d(pmin, point2d(ws_min_row, pmax.col()))); + node* rs = (ws_max_row >= y_max) ? 0 : + new node(box2d(point2d(ws_max_row, pmin.col()), pmax)); + + root->set_ls(ls); + root->set_rs(rs); + + if (ls) + do_xy_cut(hist, ls, ls->get_bbox(), false, false, min_height, min_width); + if (rs) + do_xy_cut(hist, rs, rs->get_bbox(), false, false, min_height, min_width); + } + } + else + { + int max_width = 0; + int ws_min_col = 0; // Whitespace min and max + int ws_max_col = 0; // cols + + vertical_whitespace(hist, pmin, pmax, max_width, ws_min_col, ws_max_col); + + if (max_width < min_width || max_width == (pmax.col() - pmin.col())) + { + if (should_stop) + return; + + do_xy_cut(hist, root, domain, true, true, min_height, min_width); + } + else + { + typedef mln_box(H) B; + node* ls = (ws_min_col == x_min) ? 0 : + new node(box2d(pmin, point2d(pmax.row(), ws_min_col))); + node* rs = (ws_max_col >= x_max) ? 0 : + new node(box2d(point2d(pmin.row(), ws_max_col), pmax)); + + root->set_ls(ls); + root->set_rs(rs); + + if (ls) + do_xy_cut(hist, ls, ls->get_bbox(), true, false, min_height, min_width); + if (rs) + do_xy_cut(hist, rs, rs->get_bbox(), true, false, min_height, min_width); + } + } + + trace::exiting("do_xy_cut"); + } + + + template <typename B> + void xy_dfs(const node* root, util::array& result) + { + if (root->is_leaf()) + { + result.append(root->get_bbox()); + return; + } + + const node* ls = root->get_ls(); + const node* rs = root->get_rs(); + + if (ls) + xy_dfs(root->get_ls(), result); + if (rs) + xy_dfs(root->get_rs(), result); + } + + } // end of namespace scribo::layout::internal + + + + template <typename I> + mln::util::array<mln_box(I)> + xy_cut(const Image& ima_, int min_height, int min_width) + { + trace::entering("scribo::layout::xy_cut"); + + typedef mln_value(I) V; + typedef mln_box(I) B; + mlc_is(V,bool)::check(); + + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + + // Compute histogram + mln_ch_value(I,internal::hist_info) hist(ima.domain()); + internal::compute_hist_info_h(ima, hist); + internal::compute_hist_info_v(ima, hist); + + // XY-Cut + internal::node* n = new internal::node(ima.domain()); + internal::do_xy_cut(hist, n, ima.domain(), true, false, min_height, min_width); + + // Build output. + mln::util::array output; + internal::xy_dfs(n, output); + + // Clear temporary data. + delete n; + + trace::exiting("scribo::layout::xy_cut"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_XY_CUT_HH diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index dd4fd9d..4d6ce66 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -45,6 +45,7 @@ SUBDIRS = \ core \ estim \ filter \ + layout \ preprocessing \ primitive \ table \ diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/layout/Makefile.am similarity index 87% copy from scribo/tests/text/Makefile.am copy to scribo/tests/layout/Makefile.am index 0d48025..09990b1 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/layout/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -16,6 +17,6 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = +check_PROGRAMS = xy_cut TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/primitive/extract/lines_h_pattern.cc b/scribo/tests/layout/xy_cut.cc similarity index 71% copy from scribo/tests/primitive/extract/lines_h_pattern.cc copy to scribo/tests/layout/xy_cut.cc index 64c09f8..3601d64 100644 --- a/scribo/tests/primitive/extract/lines_h_pattern.cc +++ b/scribo/tests/layout/xy_cut.cc @@ -23,29 +23,27 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file +/// \file -#include <mln/core/image/image2d.hh> -#include <mln/data/compare.hh> +#include <iostream> #include <mln/io/pbm/load.hh> -#include <scribo/primitive/extract/lines_h_pattern.hh> +#include <mln/make/box2d.hh> +#include <scribo/layout/xy_cut.hh> #include "tests/data.hh" -int main() +using namespace mln; + +int main(int argc, char** argv) { - using namespace mln; - using namespace scribo; image2d<bool> input; - io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); - - image2d<bool> ref; - io::pbm::load(ref, - SCRIBO_TESTS_DIR "/primitive/extract/lines_h_pattern.ref.pbm"); - - image2d<bool> - vlines = primitive::extract::lines_h_pattern(input, 51, 3); - - mln_assertion(vlines == ref); + io::pbm::load(input, SCRIBO_IMG_DIR "/alignment_3.pbm"); + util::array<box2d> bb = scribo::layout::xy_cut(input, 10, 10); + + mln_assertion(bb.nelements() == 4); + mln_assertion(bb[0] == make::box2d(20,66, 38,140)); + mln_assertion(bb[1] == make::box2d(11,171, 38,221)); + mln_assertion(bb[2] == make::box2d(0,237, 38,384)); + mln_assertion(bb[3] == make::box2d(50,60, 215,402)); } -- 1.7.2.5

11 years, 9 months

branch next updated: olena-2.0-113-g1d131cf

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 next has been updated via 1d131cfacc87cbe0485582a92da949908d46f41f (commit) via af1e2e373ae8d18c3ccef3297aa00547af4ba28e (commit) via cb4de64dddfb5e43bc9a5ba57ffede6cb54a8256 (commit) via 85cf60236cf2f22ca0a263056bb0952321275174 (commit) via 59845993406e6a7db4a4dee30fc2798011d63931 (commit) via 57bfad3c334cbb4e891bf3330531f68b739b5c4a (commit) via 3f878aba04012c1069a3ecc4f240a7c87f76729c (commit) via 22a49ac2882aba28798e8eaf02e8f161f4f0edc3 (commit) from 9352b4dd5c97cc913eabcc31277270c7aa2b9729 (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 ----------------------------------------------------------------- 1d131cf Remove morpho::meyer_wst. af1e2e3 Replace remaining uses of mln::morpho::meyer_wst in Swilena. cb4de64 Replace remaining uses of morpho::meyer_wst in Milena. 85cf602 Remove references to mln/morpho/meyer_wst.hh in mln/morpho/. 5984599 Replace uses morpho::meyer_wst by morpho::watershed::flooding. 57bfad3 Fix tests/core/image/line_graph_image.cc. 3f878ab Use mln::edge_image to implement line graph images in morpho tests. 22a49ac No longer wrap mln::value::int_u32. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 70 +++++++ .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 7 +- milena/apps/mesh-segm-skel/mesh-complex-segm.cc | 7 +- milena/doc/examples/trash/tuto_bis.cc | 8 +- milena/doc/examples/trash/tuto_one.cc | 4 +- milena/headers.mk | 1 - milena/mln/make/region_adjacency_graph.hh | 4 +- milena/mln/morpho/all.hh | 1 - milena/mln/morpho/essential.hh | 1 - milena/mln/morpho/meyer_wst.hh | 215 -------------------- milena/tests/core/image/edge_image.cc | 146 +++++++------ milena/tests/core/image/line_graph_image.cc | 140 +++++++------ milena/tests/morpho/Makefile.am | 8 +- .../morpho/artificial_line_graph_image_wst.cc | 19 +- milena/tests/morpho/graph_image_morpho.cc | 2 +- milena/tests/morpho/graph_image_wst.cc | 15 +- milena/tests/morpho/lena_line_graph_image_wst1.cc | 18 +- milena/tests/morpho/lena_line_graph_image_wst2.cc | 19 +- milena/tests/morpho/line_graph_image_morpho.cc | 49 +++--- milena/tests/morpho/line_graph_image_wst.cc | 57 +++--- milena/tests/morpho/meyer_wst.cc | 56 ----- milena/tests/morpho/meyer_wst_long.cc | 73 ------- milena/tests/unit_test/unit-tests.mk | 1 - milena/tools/area_flooding.cc | 7 +- swilena/ChangeLog | 19 ++ swilena/Makefile.am | 1 - swilena/image2d_int_u8.i | 10 +- swilena/int_u32.i | 40 ---- swilena/morpho.ixx | 20 +- swilena/python/Makefile.am | 10 - swilena/python/morpho-segm.py | 6 +- swilena/python/swilena.py | 5 +- 32 files changed, 367 insertions(+), 672 deletions(-) delete mode 100644 milena/mln/morpho/meyer_wst.hh delete mode 100644 milena/tests/morpho/meyer_wst.cc delete mode 100644 milena/tests/morpho/meyer_wst_long.cc delete mode 100644 swilena/int_u32.i hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-322-ga73499b configure.ac: Configure scribo/tests/layout directory.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e3c184..e83290b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure scribo/tests/layout directory. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Do not configure scribo/demo/review anymore. 2013-02-28 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 75e9037..646ecd4 100644 --- a/configure.ac +++ b/configure.ac @@ -376,6 +376,7 @@ AC_CONFIG_FILES([ scribo/tests/core/Makefile scribo/tests/estim/Makefile scribo/tests/filter/Makefile + scribo/tests/layout/Makefile scribo/tests/preprocessing/Makefile scribo/tests/primitive/Makefile scribo/tests/primitive/extract/Makefile -- 1.7.2.5

11 years, 9 months

branch unstable/scribo updated: olena-2.0-320-ge5c4946

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 via e5c4946ac2cc04f9d06ec2b959cef592d76b68dd (commit) via 4ceffd14a660391922d2e9409d18bea93bc4824d (commit) from ea3b8de392f302d30afc3affb6306a97234d5a9d (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 ----------------------------------------------------------------- e5c4946 configure.ac: Do not configure scribo/demo/review anymore. 4ceffd1 Remove deprecated programs. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 1 - scribo/ChangeLog | 139 +++++ scribo/demo/Makefile.am | 4 - scribo/demo/demat/demat.pro | 42 -- scribo/demo/demat/demat.qrc | 4 - scribo/demo/demat/src/doc_type.hh | 51 -- scribo/demo/demat/src/main.cc | 31 - scribo/demo/demat/src/main_window.cc | 266 -------- scribo/demo/demat/src/main_window.hh | 96 --- scribo/demo/demat/src/mln_widgets.cc | 11 - scribo/demo/demat/src/preprocessing_task.hh | 62 -- scribo/demo/demat/src/process_args.hh | 47 -- scribo/demo/demat/src/runner.cc | 327 ---------- scribo/demo/demat/src/runner.hh | 94 --- scribo/demo/demat/ui/main_window.ui | 381 ------------ scribo/demo/review/Makefile.am | 56 -- scribo/demo/review/icons/document-open.png | Bin 1550 -> 0 bytes scribo/demo/review/icons/edit-find.png | Bin 1636 -> 0 bytes scribo/demo/review/icons/format-indent-more.png | Bin 766 -> 0 bytes scribo/demo/review/icons/go-next.png | Bin 1219 -> 0 bytes scribo/demo/review/icons/image-x-generic.png | Bin 1163 -> 0 bytes scribo/demo/review/icons/list-add.png | Bin 601 -> 0 bytes scribo/demo/review/icons/ocr.png | Bin 14929 -> 0 bytes scribo/demo/review/icons/text-x-generic.png | Bin 744 -> 0 bytes scribo/demo/review/icons/view-refresh.png | Bin 2024 -> 0 bytes scribo/demo/review/icons/x-office-spreadsheet.png | Bin 1518 -> 0 bytes scribo/demo/review/mainwindow.ui | 340 ---------- scribo/demo/review/review.qrc | 13 - scribo/demo/review/src/main.cc | 49 -- scribo/demo/review/src/mainwindow.cc | 569 ----------------- scribo/demo/review/src/mainwindow.hh | 139 ----- scribo/demo/shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 0 bytes scribo/demo/shared/icons/accept-icon.png | Bin 4858 -> 0 bytes scribo/demo/shared/icons/close.gif | Bin 340 -> 0 bytes scribo/demo/shared/icons/crop-icon.png | Bin 228 -> 0 bytes scribo/demo/shared/icons/image-add-icon.png | Bin 2917 -> 0 bytes scribo/demo/shared/icons/image-edit-icon.png | Bin 2305 -> 0 bytes scribo/demo/shared/icons/image-multi-icon.png | Bin 2033 -> 0 bytes scribo/demo/shared/icons/image-next-icon.png | Bin 3008 -> 0 bytes scribo/demo/shared/icons/image-remove-icon.png | Bin 3127 -> 0 bytes scribo/demo/shared/icons/next-icon.png | Bin 4611 -> 0 bytes scribo/demo/shared/icons/olena_smaller.jpg | Bin 8028 -> 0 bytes scribo/demo/shared/icons/page-down-icon.png | Bin 3450 -> 0 bytes scribo/demo/shared/icons/page-search-icon.png | Bin 3101 -> 0 bytes scribo/demo/shared/icons/rotate_ccw.png | Bin 4200 -> 0 bytes scribo/demo/shared/icons/rotate_cw.png | Bin 4161 -> 0 bytes scribo/demo/shared/icons/search-add-icon.png | Bin 4274 -> 0 bytes scribo/demo/shared/icons/search-remove-icon.png | Bin 4196 -> 0 bytes scribo/demo/shared/shared.qrc | 21 - scribo/demo/shared/src/bak/crop_item.cc | 332 ---------- scribo/demo/shared/src/bak/crop_item.hh | 100 --- scribo/demo/shared/src/bak/image_viewer.cc | 242 ------- scribo/demo/shared/src/bak/image_viewer.hh | 116 ---- scribo/demo/shared/src/bak/types.hh | 50 -- scribo/demo/shared/src/browse_widget.cc | 72 --- scribo/demo/shared/src/browse_widget.hh | 78 --- scribo/demo/shared/src/crop_item.cc | 396 ------------ scribo/demo/shared/src/crop_item.hh | 119 ---- scribo/demo/shared/src/image_viewer.cc | 410 ------------ scribo/demo/shared/src/image_viewer.hh | 148 ----- scribo/demo/shared/src/image_viewer.hxx | 31 - .../shared/src/internal.bak/interactive_scene.cc | 286 --------- .../shared/src/internal.bak/interactive_scene.hh | 108 ---- .../shared/src/internal.bak/selection_rectangle.cc | 241 ------- .../shared/src/internal.bak/selection_rectangle.hh | 91 --- .../demo/shared/src/internal/interactive_scene.cc | 94 --- .../demo/shared/src/internal/interactive_scene.hh | 85 --- .../shared/src/internal/selection_rectangle.cc | 241 ------- .../shared/src/internal/selection_rectangle.hh | 91 --- scribo/demo/shared/src/to_mln_image.hh | 77 --- scribo/demo/shared/src/types.hh | 50 -- scribo/demo/shared/ui/browse_widget.ui | 106 ---- scribo/demo/shared/ui/crop_widget.ui | 34 - scribo/demo/shared/ui/image_viewer.ui | 296 --------- scribo/demo/shared/ui/interactive_scene.cc | 143 ----- scribo/demo/shared/ui/interactive_scene.hh | 87 --- scribo/demo/shared/ui/rotate_widget.ui | 34 - scribo/demo/tip/gui.pro | 19 - scribo/demo/tip/gui.qrc | 9 - scribo/demo/tip/icons/next.png | Bin 3337 -> 0 bytes scribo/demo/tip/icons/ok.png | Bin 3953 -> 0 bytes scribo/demo/tip/icons/photos.png | Bin 3750 -> 0 bytes scribo/demo/tip/icons/prev.png | Bin 3334 -> 0 bytes scribo/demo/tip/icons/remove.png | Bin 3704 -> 0 bytes scribo/demo/tip/src/custom_delegate.cc | 105 ---- scribo/demo/tip/src/custom_delegate.hh | 81 --- scribo/demo/tip/src/launch_dialog.cc | 94 --- scribo/demo/tip/src/launch_dialog.hh | 63 -- scribo/demo/tip/src/main.cc | 46 -- scribo/demo/tip/src/main_window.cc | 526 ---------------- scribo/demo/tip/src/main_window.hh | 119 ---- scribo/demo/tip/ui/launch_dialog.ui | 117 ---- scribo/demo/tip/ui/main_window.ui | 656 -------------------- scribo/demo/wizard/images/dematerialization.png | Bin 76309 -> 0 bytes scribo/demo/wizard/src/crop_page.cc | 48 -- scribo/demo/wizard/src/crop_page.hh | 60 -- scribo/demo/wizard/src/crop_widget.cc | 37 -- scribo/demo/wizard/src/crop_widget.hh | 62 -- scribo/demo/wizard/src/doc_type.hh | 51 -- scribo/demo/wizard/src/doc_type_page.cc | 48 -- scribo/demo/wizard/src/doc_type_page.hh | 61 -- scribo/demo/wizard/src/doc_type_widget.cc | 38 -- scribo/demo/wizard/src/doc_type_widget.hh | 64 -- scribo/demo/wizard/src/load_page.cc | 71 --- scribo/demo/wizard/src/load_page.hh | 67 -- scribo/demo/wizard/src/load_widget.cc | 56 -- scribo/demo/wizard/src/load_widget.hh | 64 -- scribo/demo/wizard/src/main.cc | 28 - scribo/demo/wizard/src/main_window.cc | 144 ----- scribo/demo/wizard/src/main_window.hh | 72 --- scribo/demo/wizard/src/mln_widgets.cc | 7 - scribo/demo/wizard/src/preprocessing_page.cc | 61 -- scribo/demo/wizard/src/preprocessing_page.hh | 66 -- scribo/demo/wizard/src/preprocessing_task.hh | 61 -- scribo/demo/wizard/src/preprocessing_widget.cc | 93 --- scribo/demo/wizard/src/preprocessing_widget.hh | 65 -- scribo/demo/wizard/src/process_page.cc | 68 -- scribo/demo/wizard/src/process_page.hh | 64 -- scribo/demo/wizard/src/process_widget.cc | 80 --- scribo/demo/wizard/src/process_widget.hh | 71 --- scribo/demo/wizard/src/result_page.cc | 43 -- scribo/demo/wizard/src/result_page.hh | 60 -- scribo/demo/wizard/src/result_widget.cc | 43 -- scribo/demo/wizard/src/result_widget.hh | 58 -- scribo/demo/wizard/src/rotate_page.cc | 45 -- scribo/demo/wizard/src/rotate_page.hh | 60 -- scribo/demo/wizard/src/rotate_widget.cc | 38 -- scribo/demo/wizard/src/rotate_widget.hh | 62 -- scribo/demo/wizard/src/runner.cc | 296 --------- scribo/demo/wizard/src/runner.hh | 84 --- scribo/demo/wizard/src/test.cc | 16 - scribo/demo/wizard/ui/doc_type_widget.ui | 115 ---- scribo/demo/wizard/ui/load_widget.ui | 110 ---- scribo/demo/wizard/ui/main_window.ui | 216 ------- scribo/demo/wizard/ui/preprocessing_widget.ui | 223 ------- scribo/demo/wizard/wizard.pro | 71 --- scribo/demo/wizard/wizard.qrc | 5 - 138 files changed, 143 insertions(+), 11749 deletions(-) delete mode 100644 scribo/demo/demat/demat.pro delete mode 100644 scribo/demo/demat/demat.qrc delete mode 100644 scribo/demo/demat/src/doc_type.hh delete mode 100644 scribo/demo/demat/src/main.cc delete mode 100644 scribo/demo/demat/src/main_window.cc delete mode 100644 scribo/demo/demat/src/main_window.hh delete mode 100644 scribo/demo/demat/src/mln_widgets.cc delete mode 100644 scribo/demo/demat/src/preprocessing_task.hh delete mode 100644 scribo/demo/demat/src/process_args.hh delete mode 100644 scribo/demo/demat/src/runner.cc delete mode 100644 scribo/demo/demat/src/runner.hh delete mode 100644 scribo/demo/demat/ui/main_window.ui delete mode 100644 scribo/demo/review/Makefile.am delete mode 100644 scribo/demo/review/icons/document-open.png delete mode 100644 scribo/demo/review/icons/edit-find.png delete mode 100644 scribo/demo/review/icons/format-indent-more.png delete mode 100644 scribo/demo/review/icons/go-next.png delete mode 100644 scribo/demo/review/icons/image-x-generic.png delete mode 100644 scribo/demo/review/icons/list-add.png delete mode 100644 scribo/demo/review/icons/ocr.png delete mode 100644 scribo/demo/review/icons/text-x-generic.png delete mode 100644 scribo/demo/review/icons/view-refresh.png delete mode 100644 scribo/demo/review/icons/x-office-spreadsheet.png delete mode 100644 scribo/demo/review/mainwindow.ui delete mode 100644 scribo/demo/review/review.qrc delete mode 100644 scribo/demo/review/src/main.cc delete mode 100644 scribo/demo/review/src/mainwindow.cc delete mode 100644 scribo/demo/review/src/mainwindow.hh delete mode 100644 scribo/demo/shared/icons/Symbols-Delete-icon.png delete mode 100644 scribo/demo/shared/icons/accept-icon.png delete mode 100644 scribo/demo/shared/icons/close.gif delete mode 100644 scribo/demo/shared/icons/crop-icon.png delete mode 100644 scribo/demo/shared/icons/image-add-icon.png delete mode 100644 scribo/demo/shared/icons/image-edit-icon.png delete mode 100644 scribo/demo/shared/icons/image-multi-icon.png delete mode 100644 scribo/demo/shared/icons/image-next-icon.png delete mode 100644 scribo/demo/shared/icons/image-remove-icon.png delete mode 100644 scribo/demo/shared/icons/next-icon.png delete mode 100644 scribo/demo/shared/icons/olena_smaller.jpg delete mode 100644 scribo/demo/shared/icons/page-down-icon.png delete mode 100644 scribo/demo/shared/icons/page-search-icon.png delete mode 100644 scribo/demo/shared/icons/rotate_ccw.png delete mode 100644 scribo/demo/shared/icons/rotate_cw.png delete mode 100644 scribo/demo/shared/icons/search-add-icon.png delete mode 100644 scribo/demo/shared/icons/search-remove-icon.png delete mode 100644 scribo/demo/shared/shared.qrc delete mode 100644 scribo/demo/shared/src/bak/crop_item.cc delete mode 100644 scribo/demo/shared/src/bak/crop_item.hh delete mode 100644 scribo/demo/shared/src/bak/image_viewer.cc delete mode 100644 scribo/demo/shared/src/bak/image_viewer.hh delete mode 100644 scribo/demo/shared/src/bak/types.hh delete mode 100644 scribo/demo/shared/src/browse_widget.cc delete mode 100644 scribo/demo/shared/src/browse_widget.hh delete mode 100644 scribo/demo/shared/src/crop_item.cc delete mode 100644 scribo/demo/shared/src/crop_item.hh delete mode 100644 scribo/demo/shared/src/image_viewer.cc delete mode 100644 scribo/demo/shared/src/image_viewer.hh delete mode 100644 scribo/demo/shared/src/image_viewer.hxx delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/to_mln_image.hh delete mode 100644 scribo/demo/shared/src/types.hh delete mode 100644 scribo/demo/shared/ui/browse_widget.ui delete mode 100644 scribo/demo/shared/ui/crop_widget.ui delete mode 100644 scribo/demo/shared/ui/image_viewer.ui delete mode 100644 scribo/demo/shared/ui/interactive_scene.cc delete mode 100644 scribo/demo/shared/ui/interactive_scene.hh delete mode 100644 scribo/demo/shared/ui/rotate_widget.ui delete mode 100644 scribo/demo/tip/gui.pro delete mode 100644 scribo/demo/tip/gui.qrc delete mode 100644 scribo/demo/tip/icons/next.png delete mode 100644 scribo/demo/tip/icons/ok.png delete mode 100644 scribo/demo/tip/icons/photos.png delete mode 100644 scribo/demo/tip/icons/prev.png delete mode 100644 scribo/demo/tip/icons/remove.png delete mode 100644 scribo/demo/tip/src/custom_delegate.cc delete mode 100644 scribo/demo/tip/src/custom_delegate.hh delete mode 100644 scribo/demo/tip/src/launch_dialog.cc delete mode 100644 scribo/demo/tip/src/launch_dialog.hh delete mode 100644 scribo/demo/tip/src/main.cc delete mode 100644 scribo/demo/tip/src/main_window.cc delete mode 100644 scribo/demo/tip/src/main_window.hh delete mode 100644 scribo/demo/tip/ui/launch_dialog.ui delete mode 100644 scribo/demo/tip/ui/main_window.ui delete mode 100644 scribo/demo/wizard/images/dematerialization.png delete mode 100644 scribo/demo/wizard/src/crop_page.cc delete mode 100644 scribo/demo/wizard/src/crop_page.hh delete mode 100644 scribo/demo/wizard/src/crop_widget.cc delete mode 100644 scribo/demo/wizard/src/crop_widget.hh delete mode 100644 scribo/demo/wizard/src/doc_type.hh delete mode 100644 scribo/demo/wizard/src/doc_type_page.cc delete mode 100644 scribo/demo/wizard/src/doc_type_page.hh delete mode 100644 scribo/demo/wizard/src/doc_type_widget.cc delete mode 100644 scribo/demo/wizard/src/doc_type_widget.hh delete mode 100644 scribo/demo/wizard/src/load_page.cc delete mode 100644 scribo/demo/wizard/src/load_page.hh delete mode 100644 scribo/demo/wizard/src/load_widget.cc delete mode 100644 scribo/demo/wizard/src/load_widget.hh delete mode 100644 scribo/demo/wizard/src/main.cc delete mode 100644 scribo/demo/wizard/src/main_window.cc delete mode 100644 scribo/demo/wizard/src/main_window.hh delete mode 100644 scribo/demo/wizard/src/mln_widgets.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_task.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.hh delete mode 100644 scribo/demo/wizard/src/process_page.cc delete mode 100644 scribo/demo/wizard/src/process_page.hh delete mode 100644 scribo/demo/wizard/src/process_widget.cc delete mode 100644 scribo/demo/wizard/src/process_widget.hh delete mode 100644 scribo/demo/wizard/src/result_page.cc delete mode 100644 scribo/demo/wizard/src/result_page.hh delete mode 100644 scribo/demo/wizard/src/result_widget.cc delete mode 100644 scribo/demo/wizard/src/result_widget.hh delete mode 100644 scribo/demo/wizard/src/rotate_page.cc delete mode 100644 scribo/demo/wizard/src/rotate_page.hh delete mode 100644 scribo/demo/wizard/src/rotate_widget.cc delete mode 100644 scribo/demo/wizard/src/rotate_widget.hh delete mode 100644 scribo/demo/wizard/src/runner.cc delete mode 100644 scribo/demo/wizard/src/runner.hh delete mode 100644 scribo/demo/wizard/src/test.cc delete mode 100644 scribo/demo/wizard/ui/doc_type_widget.ui delete mode 100644 scribo/demo/wizard/ui/load_widget.ui delete mode 100644 scribo/demo/wizard/ui/main_window.ui delete mode 100644 scribo/demo/wizard/ui/preprocessing_widget.ui delete mode 100644 scribo/demo/wizard/wizard.pro delete mode 100644 scribo/demo/wizard/wizard.qrc hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

branch unstable/scribo updated: olena-2.0-318-gea3b8de

by git＠lrde.epita.fr

11 years, 9 months

olena-2.0-318-gea3b8de Fix compilation related problems in viewer.

by Guillaume Lazzara

* demo/viewer/image_view.cc: Fix a warning; * demo/viewer/main.cc: Include sauvola_ms.hh to compile related global variables. --- scribo/ChangeLog | 9 +++++++++ scribo/demo/viewer/image_view.cc | 15 ++++++++------- scribo/demo/viewer/main.cc | 7 ++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 20b7c94..18a73c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation related problems in viewer. + + * demo/viewer/image_view.cc: Fix a warning; + + * demo/viewer/main.cc: Include sauvola_ms.hh to compile related + global variables. + +2013-03-07 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/internal/sauvola_ms_functor.hh: Handle global variables correctly. diff --git a/scribo/demo/viewer/image_view.cc b/scribo/demo/viewer/image_view.cc index bb34eb7..9190227 100644 --- a/scribo/demo/viewer/image_view.cc +++ b/scribo/demo/viewer/image_view.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -34,13 +35,13 @@ ImageView::wheelEvent(QWheelEvent* event) else sc = 1 / (1 - degrees / 100); - QPointF center = mapToScene(width() / 2, height() / 2); - QPointF mouse = mapToScene(event->pos()); + // QPointF center = mapToScene(width() / 2, height() / 2); + // QPointF mouse = mapToScene(event->pos()); - qreal dx = (mouse.x() - center.x()); - qreal dy = (mouse.y() - center.y()); - QPointF newCenter = QPointF (mouse.x() - dx / sc, - mouse.y() - dy / sc); + // qreal dx = (mouse.x() - center.x()); + // qreal dy = (mouse.y() - center.y()); + // QPointF newCenter = QPointF (mouse.x() - dx / sc, + // mouse.y() - dy / sc); scale(sc, sc); scaleUpdate(); } diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index 0c50c7b..d14e36d 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -23,9 +23,10 @@ #include <mln/labeling/colorize.hh> #include <mln/math/pi.hh> #include <mln/io/magick/load.hh> -#include <scribo/make/debug_filename.hh> #include <mln/debug/filename.hh> #include <mln/literal/colors.hh> +#include <scribo/make/debug_filename.hh> +#include <scribo/binarization/sauvola_ms.hh> int main(int argc, char** argv) { -- 1.7.2.5

11 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
21
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