- Olena-patches

last-svn-commit-901-gf53b7d4 Precise outline correction
by Julien Marquegnies 30 May '11

30 May '11

--- scribo/scribo/util/component_precise_outline.hh | 91 ++++++++++------------- 1 files changed, 40 insertions(+), 51 deletions(-) diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index f147293..1e447a3 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -103,20 +103,15 @@ namespace scribo const I& input, const point2d& cur_pt) { - if (i < 3) + const point2d p2(cur_pt.row() + offset[direction][5][1], + cur_pt.col() + offset[direction][5][0]); + const point2d p3(cur_pt.row() + offset[direction][7][1], + cur_pt.col() + offset[direction][7][0]); + + if (!input(p2) && input(p3)) { - const point2d p1(cur_pt.row() + offset[direction][0][1], - cur_pt.col() + offset[direction][0][0]); - const point2d p2(cur_pt.row() + offset[direction][5][1], - cur_pt.col() + offset[direction][5][0]); - const point2d p3(cur_pt.row() + offset[direction][7][1], - cur_pt.col() + offset[direction][7][0]); - - if (input(p1) && !input(p2) && input(p3)) - { - direction = 3; - return; - } + direction = 3; + return; } if (i == 3 || i == 4) @@ -135,20 +130,20 @@ namespace scribo const I& input, const point2d& cur_pt) { - if (i < 3) + const point2d p1(cur_pt.row() + offset[direction][0][1], + cur_pt.col() + offset[direction][0][0]); + const point2d p2(cur_pt.row() + offset[direction][5][1], + cur_pt.col() + offset[direction][5][0]); + const point2d p3(cur_pt.row() + offset[direction][7][1], + cur_pt.col() + offset[direction][7][0]); + + if (!input(p2) && (input(p1) || input(p3))) { - const point2d p2(cur_pt.row() + offset[direction][5][1], - cur_pt.col() + offset[direction][5][0]); - const point2d p3(cur_pt.row() + offset[direction][7][1], - cur_pt.col() + offset[direction][7][0]); - - if (!input(p2) && input(p3)) - { - direction = 0; - return; - } + direction = 0; + return; } + if (i == 3 || i == 4) direction = 2; else if (i == 5 || i == 6) @@ -165,20 +160,15 @@ namespace scribo const I& input, const point2d& cur_pt) { - if (i < 3) + const point2d p2(cur_pt.row() + offset[direction][5][1], + cur_pt.col() + offset[direction][5][0]); + const point2d p3(cur_pt.row() + offset[direction][7][1], + cur_pt.col() + offset[direction][7][0]); + + if (!input(p2) && input(p3)) { - const point2d p1(cur_pt.row() + offset[direction][0][1], - cur_pt.col() + offset[direction][0][0]); - const point2d p2(cur_pt.row() + offset[direction][5][1], - cur_pt.col() + offset[direction][5][0]); - const point2d p3(cur_pt.row() + offset[direction][7][1], - cur_pt.col() + offset[direction][7][0]); - - if (input(p1) && !input(p2) && input(p3)) - { - direction = 1; - return; - } + direction = 1; + return; } if (i == 3 || i == 4) @@ -197,18 +187,17 @@ namespace scribo const I& input, const point2d& cur_pt) { - if (i < 3) + const point2d p1(cur_pt.row() + offset[direction][0][1], + cur_pt.col() + offset[direction][0][0]); + const point2d p2(cur_pt.row() + offset[direction][5][1], + cur_pt.col() + offset[direction][5][0]); + const point2d p3(cur_pt.row() + offset[direction][7][1], + cur_pt.col() + offset[direction][7][0]); + + if (!input(p2) && (input(p1) || input(p3))) { - const point2d p2(cur_pt.row() + offset[direction][5][1], - cur_pt.col() + offset[direction][5][0]); - const point2d p3(cur_pt.row() + offset[direction][7][1], - cur_pt.col() + offset[direction][7][0]); - - if (!input(p2) && input(p3)) - { - direction = 2; - return; - } + direction = 2; + return; } if (i == 3 || i == 4) @@ -346,11 +335,11 @@ namespace scribo } } - mln::p_array waypoints; - internal::filter_points(points, waypoints); + // mln::p_array waypoints; + // internal::filter_points(points, waypoints); trace::exiting("scribo::util::component_precise_outline"); - return waypoints; + return points; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

last-svn-commit-900-gb39473e Paragraphs correction
by Julien Marquegnies 30 May '11

30 May '11

--- scribo/scribo/text/paragraphs.hh | 77 ++++++++++++-------------------------- 1 files changed, 24 insertions(+), 53 deletions(-) diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 620faa7..8fd89be 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -486,7 +486,16 @@ namespace scribo cline_col_min > rline_col_min && cline_col_min > lline_col_min) { - output(right_nbh) = right_nbh; + const line_id_t out_right_nbh = output(right_nbh); + + if (out_right_nbh != l) + { + if (output(out_right_nbh) == l) + output(out_right_nbh) = out_right_nbh; + right(l) = l; + } + else + output(right_nbh) = right_nbh; continue; } } @@ -548,57 +557,6 @@ namespace scribo //----------------------------------------------------------------------------- // ___________________________ // |___________________________| -// ________________________ -// |________________________| -// ___________________________ -// |___________________________| -// ___________________________ -// |___________________________| -// -// Simple case : paragraphs are justified on the left. We try to find any -// indentation like above. -// -//----------------------------------------------------------------------------- - - { - // Check if the current line neighbors are aligned - bool left_right_aligned = false; - bool left_lol_aligned = false; - const int dx_lr = std::abs(lline_col_min - rline_col_min); - const int dx_llol = std::abs(lline_col_min - lolline_col_min); - - if (dx_lr < delta_alignment) - left_right_aligned = true; - - if (dx_llol < delta_alignment) - left_lol_aligned = true; - - if (left_right_aligned && left_lol_aligned) - { - const int left_right_col_min = std::min(lline_col_min, rline_col_min); - const int dx_lrc = std::abs(left_right_col_min - cline_col_min); - const float l_char_width = 1.5f * lines(l).char_width(); - - if (dx_lrc > l_char_width && - !may_have_another_left_link(right, right_nbh, l, lines) && - dx_lrc < 10.0f * l_char_width && - cline_col_min > rline_col_min && - cline_col_min > lline_col_min) - { - const line_id_t out_right_nbh = output(right_nbh); - - if (out_right_nbh != l) - right(l) = l; - else - output(right_nbh) = right_nbh; - continue; - } - } - } - -//----------------------------------------------------------------------------- -// ___________________________ -// |___________________________| // ___________________________ // |___________________________| // ________________________ @@ -643,7 +601,11 @@ namespace scribo const line_id_t out_right_nbh = output(right_nbh); if (out_right_nbh != l) + { + if (output(out_right_nbh) == l) + output(out_right_nbh) = out_right_nbh; right(l) = l; + } else output(right_nbh) = right_nbh; continue; @@ -748,7 +710,16 @@ namespace scribo cline_col_min > rline_col_min && cline_col_max >= rline_col_max) { - output(right_nbh) = right_nbh; + const line_id_t out_right_nbh = output(right_nbh); + + if (out_right_nbh != l) + { + if (output(out_right_nbh) == l) + output(out_right_nbh) = out_right_nbh; + right(l) = l; + } + else + output(right_nbh) = right_nbh; continue; } } -- 1.5.6.5

1 0

branch icdar/hdlac2011 updated: last-svn-commit-899-gcb2e9b2
by git＠lrde.epita.fr 27 May '11

27 May '11

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 icdar/hdlac2011 has been updated via cb2e9b223ae8f832b885889d92429cf16c7e1219 (commit) from d777dff6866692be0fd5311f6c950011e0d86318 (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 ----------------------------------------------------------------- cb2e9b2 Changing points to segments in component precise outline ----------------------------------------------------------------------- Summary of changes: scribo/scribo/util/component_precise_outline.hh | 52 ++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-899-gcb2e9b2 Changing points to segments in component precise outline
by Julien Marquegnies 27 May '11

27 May '11

--- scribo/scribo/util/component_precise_outline.hh | 52 ++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/scribo/scribo/util/component_precise_outline.hh b/scribo/scribo/util/component_precise_outline.hh index 6637dc9..f147293 100644 --- a/scribo/scribo/util/component_precise_outline.hh +++ b/scribo/scribo/util/component_precise_outline.hh @@ -252,6 +252,53 @@ namespace scribo cur_pt = tmp; } + void + filter_points(mln::p_array<point2d>& points, + mln::p_array<point2d>& waypoints) + { + const unsigned nelements = points.nsites(); + + if (nelements > 2) + { + const point2d* first_pt = & points[0]; + const point2d* last_pt = first_pt; + waypoints.append(*first_pt); + unsigned i = 1; + const point2d* cur_pt = & points[i]; + + while (i < nelements) + { + while (cur_pt->row() == first_pt->row() + || cur_pt->col() == first_pt->col()) + { + ++i; + if (i == nelements) + break; + + const point2d* llast_pt = last_pt; + last_pt = cur_pt; + cur_pt = & points[i]; + + if (llast_pt->col() == last_pt->col() && last_pt->col() == cur_pt->col()) + { + if (llast_pt->row() == cur_pt->row()) + break; + } + else if(llast_pt->row() == last_pt->row() && last_pt->row() == cur_pt->row()) + { + if (llast_pt->col() == cur_pt->col()) + break; + } + } + + waypoints.append(*last_pt); + first_pt = last_pt; + last_pt = first_pt; + } + + waypoints.append(*cur_pt); + } + } } // end of namespace scribo::util::internal @@ -299,8 +346,11 @@ namespace scribo } } + mln::p_array waypoints; + internal::filter_points(points, waypoints); + trace::exiting("scribo::util::component_precise_outline"); - return points; + return waypoints; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

last-svn-commit-832-g9d2089b Added a choose function, to be used with handle_collisions.
by Sylvain Lobry 27 May '11

27 May '11

--- scribo/ChangeLog | 9 ++ scribo/scribo/inverse_video/choose.hh | 118 ++++++++++++++++++++++ scribo/scribo/inverse_video/handle_collisions.hh | 15 ++-- scribo/scribo/inverse_video/nb_comps.hh | 103 +++++++++++++++++++ scribo/scribo/inverse_video/ratio_area.hh | 93 +++++++++++++++++ 5 files changed, 331 insertions(+), 7 deletions(-) create mode 100644 scribo/scribo/inverse_video/choose.hh create mode 100644 scribo/scribo/inverse_video/nb_comps.hh create mode 100644 scribo/scribo/inverse_video/ratio_area.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0c7b65f..3fbee9e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-05-27 Sylvain Lobry <lobry(a)lrde.epita.fr> + + Added a choose function, to be used with handle_collisions. + + * scribo/inverse_video/handle_collisions.hh: Prototype fixed. + * scribo/inverse_video/choose.hh, + * scribo/inverse_video/nb_comps.hh, + * scribo/inverse_video/ratio_area.hh: New. + 2011-05-26 Coddy Levi <levi(a)lrde.epita.fr> Bug corrected, several improvements, interface modified. diff --git a/scribo/scribo/inverse_video/choose.hh b/scribo/scribo/inverse_video/choose.hh new file mode 100644 index 0000000..9b0d46e --- /dev/null +++ b/scribo/scribo/inverse_video/choose.hh @@ -0,0 +1,118 @@ +// Copyright (C) 2011 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. + +#ifndef SCRIBO_INVERSE_VIDEO_CHOOSE_HH +# define SCRIBO_INVERSE_VIDEO_CHOOSE_HH + +/// \file +/// +/// \brief Choose beetwen two lines. + +# include <scribo/core/line_set.hh> +# include <scribo/inverse_video/nb_comps.hh> +# include <scribo/inverse_video/ratio_area.hh> +# include <iostream> + +namespace scribo +{ + + namespace inverse_video + { + /// Choose the most meaningful line between two. + /*! + ** \param[in] input The input image. + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return void + */ + template <typename L, typename I> + static inline + void + choose (mln::image2d& input, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + template <typename I, typename L> + static inline + void + handle_score (double score, + I& image, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + if (score > 0.5) + { + mln::draw::box(image, line.bbox(), mln::literal::green); + mln::draw::box(image, line_inverse.bbox(), mln::literal::red); + line_inverse.update_tag(scribo::line::Ignored); + line_inverse.set_hidden(true); + std::cout << "normal choosed" << std::endl; + } + else + { + mln::draw::box(image, line_inverse.bbox(), mln::literal::green); + mln::draw::box(image, line.bbox(), mln::literal::red); + line.update_tag(scribo::line::Ignored); + line.set_hidden(true); + std::cout << "inverse choosed" << std::endl; + } + } + } // end of namespace scribo::text::internal + + template <typename L, typename I> + static inline + void + choose (mln::image2d& input, + scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::choose"); + + double score = 0; + + double score_nb_comps = scribo::inverse_video::nb_comps(line, line_inverse); + double score_ratio_area = scribo::inverse_video::ratio_area(line, line_inverse); + + score = + score_nb_comps * 0.5 + + score_ratio_area * 0.5; + + scribo::inverse_video::internal::handle_score (score, input, line, line_inverse); + + mln::trace::exiting("scribo::inverse_video::choose"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_CHOOSE_HH diff --git a/scribo/scribo/inverse_video/handle_collisions.hh b/scribo/scribo/inverse_video/handle_collisions.hh index 4a772c3..3d27599 100644 --- a/scribo/scribo/inverse_video/handle_collisions.hh +++ b/scribo/scribo/inverse_video/handle_collisions.hh @@ -44,14 +44,14 @@ namespace scribo { template <typename I, - typename L, - typename F> + typename L> void - handle_collisions(const image2d& input, + handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - F choose); - + void (*choose)(image2d&, + scribo::line_info<L>&, + scribo::line_info<L>&)); # ifndef MLN_INCLUDE_ONLY namespace internal @@ -90,7 +90,8 @@ namespace scribo handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - void (*choose)(scribo::line_info<L>&, + void (*choose)(image2d&, + scribo::line_info<L>&, scribo::line_info<L>&)) { mln::trace::entering("scribo::inverse_video::handle_collisions"); @@ -158,7 +159,7 @@ namespace scribo || !l_tested.is_valid() || l_tested.is_hidden()) continue; - choose(ls(l), l_tested); + choose(input, ls(l), l_tested); if (ls(l).is_hidden()) break; diff --git a/scribo/scribo/inverse_video/nb_comps.hh b/scribo/scribo/inverse_video/nb_comps.hh new file mode 100644 index 0000000..e067d1a --- /dev/null +++ b/scribo/scribo/inverse_video/nb_comps.hh @@ -0,0 +1,103 @@ +// Copyright (C) 2011 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. + +#ifndef SCRIBO_INVERSE_VIDEO_NB_COMPS_HH +# define SCRIBO_INVERSE_VIDEO_NB_COMPS_HH + +/// \file +/// +/// \brief Choose beetwen two lines according to the number of +/// components they have. + +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + namespace inverse_video + { + /// Count the number of big enough components in each line and + /// choose the one which have the most. + /*! + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return A double : if it is close to 0, it means the second line is + ** more likely to be the right one. As opposite, if it is closer + ** to 1, it means the first one should be the good one. + */ + template <typename L> + double + nb_comps (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + double + nb_comps (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::nb_comps"); + unsigned max_normal = 0; + unsigned nb_comps_normal = 0; + unsigned max_inverse = 0; + unsigned nb_comps_inverse = 0; + + + const scribo::component_set<L> comps_normal = line.holder ().components (); + const scribo::component_set<L> comps_inverse = line_inverse.holder ().components (); + + + for (unsigned i = 0; i < line.component_ids().nelements(); ++i) + if (comps_normal((line.component_ids())[i]).bbox().nsites() > max_normal) + max_normal = comps_normal((line.component_ids())[i]).bbox().nsites(); + + for (unsigned i = 0; i < line_inverse.component_ids().nelements(); ++i) + if (comps_inverse((line_inverse.component_ids())[i]).bbox().nsites() > max_inverse) + max_inverse = comps_inverse((line_inverse.component_ids())[i]).bbox().nsites(); + + + + for (unsigned i = 0; i < line.component_ids().nelements(); ++i) + if (comps_normal((line.component_ids())[i]).bbox().nsites() > max_normal / 30) + ++nb_comps_normal; + + for (unsigned i = 0; i < line_inverse.component_ids().nelements(); ++i) + if (comps_inverse((line_inverse.component_ids())[i]).bbox().nsites() > max_inverse / 30) + ++nb_comps_inverse; + + + mln::trace::exiting("scribo::inverse_video::nb_comps"); + return (double)(nb_comps_normal) / (double)((nb_comps_normal + nb_comps_inverse)); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_NB_COMPS_HH diff --git a/scribo/scribo/inverse_video/ratio_area.hh b/scribo/scribo/inverse_video/ratio_area.hh new file mode 100644 index 0000000..db39f36 --- /dev/null +++ b/scribo/scribo/inverse_video/ratio_area.hh @@ -0,0 +1,93 @@ +// Copyright (C) 2011 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. + +#ifndef SCRIBO_INVERSE_VIDEO_RATIO_AREA_HH +# define SCRIBO_INVERSE_VIDEO_RATIO_AREA_HH + +/// \file +/// +/// \brief Choose beetwen two lines according to the ratio of +/// components area on the total area. + +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + namespace inverse_video + { + /// Choose the line where the ratio of components area is the highest + /*! + ** \param[in] line The first line. + ** \param[in] line_inverse The second line + ** + ** \return A double : if it is close to 0, it means the second line is + ** more likely to be the right one. As opposite, if it is closer + ** to 1, it means the first one should be the good one. + */ + template <typename L> + double + ratio_area (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse); + +# ifndef MLN_INCLUDE_ONLY + + template <typename L> + double + ratio_area (scribo::line_info<L>& line, + scribo::line_info<L>& line_inverse) + { + mln::trace::entering("scribo::inverse_video::ratio_area"); + + double area_comps_normal = 0; + double area_comps_inverse = 0; + + const scribo::component_set<L> comps_normal = line.holder ().components (); + const scribo::component_set<L> comps_inverse = line_inverse.holder ().components (); + + const mln::util::array<scribo::component_id_t>& comps_id_normal = line.component_ids(); + const mln::util::array<scribo::component_id_t>& comps_id_inverse = line_inverse.component_ids(); + + for (unsigned i = 0; i < comps_id_normal.nelements(); ++i) + area_comps_normal += comps_normal(comps_id_normal[i]).bbox().nsites(); + + for (unsigned i = 0; i < comps_id_inverse.nelements(); ++i) + area_comps_inverse += comps_inverse(comps_id_inverse[i]).bbox().nsites(); + + area_comps_inverse /= line_inverse.bbox().nsites(); + area_comps_normal /= line.bbox().nsites(); + + mln::trace::exiting("scribo::inverse_video::ratio_area"); + + return (area_comps_normal / (area_comps_normal + area_comps_inverse)); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::inverse_video + +} // end of namespace scribo + +#endif // ! SCRIBO_INVERSE_VIDEO_RATIO_AREA_HH -- 1.5.6.5

1 0

branch coddy updated: last-svn-commit-831-g48ee1a9
by git＠lrde.epita.fr 26 May '11

26 May '11

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 coddy has been updated via 48ee1a9e41f4ae7bbea18551d5cf69bc88e82ac0 (commit) from 9a5768720038f180173bc7c600fdf6b77bbfe7ab (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 ----------------------------------------------------------------- 48ee1a9 Bug corrected, several improvements, interface modified. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 +++ scribo/scribo/inverse_video/handle_collisions.hh | 50 +++++++-------------- 2 files changed, 23 insertions(+), 33 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-831-g48ee1a9 Bug corrected, several improvements, interface modified.
by Coddy Levi 26 May '11

26 May '11

* scribo/inverse_video/handle_collisions.hh: Here. --- scribo/ChangeLog | 6 +++ scribo/scribo/inverse_video/handle_collisions.hh | 50 +++++++-------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e868468..0c7b65f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2011-05-26 Coddy Levi <levi(a)lrde.epita.fr> + + Bug corrected, several improvements, interface modified. + + * scribo/inverse_video/handle_collisions.hh: Here. + 2011-05-25 Coddy Levi <levi(a)lrde.epita.fr> New algorithm to detect superpositions between two line sets. diff --git a/scribo/scribo/inverse_video/handle_collisions.hh b/scribo/scribo/inverse_video/handle_collisions.hh index 54e585c..4a772c3 100644 --- a/scribo/scribo/inverse_video/handle_collisions.hh +++ b/scribo/scribo/inverse_video/handle_collisions.hh @@ -81,18 +81,17 @@ namespace scribo unsigned ls1_size_; const scribo::line_set<L>& ls1_; const scribo::line_set<L>& ls2_; - }; + }; } // end of namespace scribo::text::internal // Facade - template <typename I, - typename L, - typename F> + template <typename I, typename L> void handle_collisions(image2d& input, scribo::line_set<L>& ls1, scribo::line_set<L>& ls2, - F choose) + void (*choose)(scribo::line_info<L>&, + scribo::line_info<L>&)) { mln::trace::entering("scribo::inverse_video::handle_collisions"); @@ -122,7 +121,7 @@ namespace scribo : v[i]; if (!scribo::text::internal::looks_like_a_text_line(ls(l)) - || !ls(l).is_valid()) + || !ls(l).is_valid() || ls(l).is_hidden()) continue; unsigned tl, tr, bl, br; @@ -136,11 +135,10 @@ namespace scribo std::set<unsigned> labels; labels.insert(tl); - labels.insert(tl); + labels.insert(tr); labels.insert(bl); labels.insert(br); - bool chosen = true; for (std::set<unsigned>::const_iterator it = labels.begin(); it != labels.end(); ++it) @@ -150,38 +148,24 @@ namespace scribo bool inverse_video_tested = (*it > ls1_size); - const scribo::line_info<L>& l_tested = + if (inverse_video_tested == inverse_video) + break; + + scribo::line_info<L>& l_tested = (inverse_video_tested ? ls2(*it - ls1_size + 1) : ls1(*it)); if (!scribo::text::internal::looks_like_a_text_line(l_tested) - || !l_tested.is_valid()) + || !l_tested.is_valid() || l_tested.is_hidden()) continue; - chosen = choose(ls(l), l_tested); - /* - if (inverse_video != inverse_video_tested) - { - if (inverse_video_tested) - mln::draw::box(input, - l_tested.bbox(), - mln::literal::blue); - else - mln::draw::box(input, - l_tested.bbox(), - mln::literal::green); - - if (inverse_video) - mln::draw::box(input, - ls(l).bbox(), - mln::literal::blue); - else - mln::draw::box(input, - ls(l).bbox(), - mln::literal::green); - }*/ + choose(ls(l), l_tested); + + if (ls(l).is_hidden()) + break; } - scribo::text::internal::draw_box(billboard, b, v[i]); + if (!ls(l).is_hidden()) + scribo::text::internal::draw_box(billboard, b, v[i]); } mln::trace::exiting("scribo::inverse_video::handle_collisions"); -- 1.5.6.5

1 0

branch icdar/hdlac2011 updated: last-svn-commit-898-gd777dff
by git＠lrde.epita.fr 26 May '11

26 May '11

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 icdar/hdlac2011 has been updated via d777dff6866692be0fd5311f6c950011e0d86318 (commit) from 7415119f80fca7ad9dd1b015c8c91e15030d0588 (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 ----------------------------------------------------------------- d777dff Paragraphs closing ----------------------------------------------------------------------- Summary of changes: scribo/scribo/core/line_info.hh | 2 - scribo/scribo/core/paragraph_info.hh | 18 +++ scribo/scribo/core/paragraph_set.hh | 84 +++++++++++- scribo/scribo/core/stats.hh | 40 ++++-- scribo/scribo/draw/line_components.hh | 113 ++++++++++++++++ scribo/scribo/text/paragraphs.hh | 65 +--------- scribo/scribo/text/paragraphs_closing.hh | 208 ++++++++++++++++++++++++++++++ 7 files changed, 443 insertions(+), 87 deletions(-) create mode 100644 scribo/scribo/draw/line_components.hh create mode 100644 scribo/scribo/text/paragraphs_closing.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-898-gd777dff Paragraphs closing
by Julien Marquegnies 26 May '11

26 May '11

--- scribo/scribo/core/line_info.hh | 2 - scribo/scribo/core/paragraph_info.hh | 18 +++ scribo/scribo/core/paragraph_set.hh | 84 +++++++++++- scribo/scribo/core/stats.hh | 40 ++++-- scribo/scribo/draw/line_components.hh | 113 ++++++++++++++++ scribo/scribo/text/paragraphs.hh | 65 +--------- scribo/scribo/text/paragraphs_closing.hh | 208 ++++++++++++++++++++++++++++++ 7 files changed, 443 insertions(+), 87 deletions(-) create mode 100644 scribo/scribo/draw/line_components.hh create mode 100644 scribo/scribo/text/paragraphs_closing.hh diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index 9017174..9320416 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -61,8 +61,6 @@ # include <scribo/core/internal/sort_comp_ids.hh> # include <scribo/core/concept/serializable.hh> -// DEBUG - # include <scribo/core/stats.hh> namespace scribo diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh index af619dd..90db7da 100644 --- a/scribo/scribo/core/paragraph_info.hh +++ b/scribo/scribo/core/paragraph_info.hh @@ -76,6 +76,9 @@ namespace scribo bool needs_stats_update() const; void force_stats_update(); + void set_delta_baseline(const int delta_baseline); + int delta_baseline() const; + private: mln::util::array<line_id_t> line_ids_; mln::accu::shape::bbox<mln_site(L)> bbox_; @@ -84,6 +87,7 @@ namespace scribo mln::value::rgb8 color_; float color_reliability_; + int delta_baseline_; bool needs_stats_update_; bool is_valid_; }; @@ -259,6 +263,20 @@ namespace scribo } template <typename L> + void + paragraph_info<L>::set_delta_baseline(const int delta_baseline) + { + delta_baseline_ = delta_baseline; + } + + template <typename L> + int + paragraph_info<L>::delta_baseline() const + { + return delta_baseline_; + } + + template <typename L> bool operator==(const paragraph_info<L>& lhs, const paragraph_info<L>& rhs) { diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 65e17c6..9214f20 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -33,6 +33,7 @@ # include <scribo/core/line_links.hh> # include <scribo/core/line_set.hh> # include <scribo/core/paragraph_info.hh> +# include <scribo/core/stats.hh> # include <scribo/core/concept/serializable.hh> # include <scribo/core/tag/paragraph.hh> @@ -106,7 +107,8 @@ namespace scribo /// \brief Construct a paragraph set from line links information. template <typename L> scribo::paragraph_set<L> - paragraph(const line_links<L>& llinks); + paragraph(const line_links<L>& llinks, + const line_links<L>& rlinks); /// \brief Construct a paragraph set from line set information. template <typename L> @@ -267,24 +269,62 @@ namespace scribo unsigned find_root(line_links<L>& parent, unsigned x) { - if (parent(x) == x) - return x; - else - return parent(x) = find_root(parent, parent(x)); + unsigned tmp_x = x; + + while (parent(tmp_x) != tmp_x) + tmp_x = parent(tmp_x); + + while (parent(x) != x) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = tmp_x; + } + + return x; + } + + template <typename L> + inline + void + set_root(line_links<L>& parent, unsigned x, const unsigned root) + { + while (parent(x) != x && parent(x) != root) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = root; + } + + parent(x) = root; } + } // end of namespace scribo::make::internal // FIXME: move that code into paragraph_set constructor? template <typename L> scribo::paragraph_set<L> - paragraph(const line_links<L>& llinks) + paragraph(const line_links<L>& llinks, + const line_links<L>& rlinks) { line_links<L> links = llinks.duplicate(); for_all_links(l, links) + { + const line_id_t current_neighbor = llinks(l); links(l) = internal::find_root(links, l); + const line_id_t root_index = links(l); + + for (unsigned j = 0; j < rlinks.nelements(); ++j) + { + if (l != j && + current_neighbor != l && + rlinks(j) == l) + internal::set_root(links, j, root_index); + } + } unsigned npars; mln::fun::i2v::array<unsigned> @@ -301,7 +341,37 @@ namespace scribo } for_all_paragraphs(p, parset) - parset(p).force_stats_update(); + { + paragraph_info<L>& current_par = parset(p); + stats< float > delta(current_par.nlines()); + + // Update stats + current_par.force_stats_update(); + + // Compute paragraph's delta baseline + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); + const unsigned nelements = line_ids.nelements(); + + for (unsigned i = 0; i < nelements; ++i) + { + const line_id_t& current_id = line_ids(i); + + if (llinks(current_id) != current_id) + { + const line_info<L>& current_line = lines(current_id); + const line_info<L>& left_line = lines(llinks(current_id)); + + delta.take(left_line.baseline() - current_line.baseline()); + } + } + + int median = delta.median(); + + if (!median) + median = lines(current_par.line_ids()(0)).x_height(); + + current_par.set_delta_baseline(median); + } return parset; } diff --git a/scribo/scribo/core/stats.hh b/scribo/scribo/core/stats.hh index ea00da9..0fcb983 100644 --- a/scribo/scribo/core/stats.hh +++ b/scribo/scribo/core/stats.hh @@ -79,10 +79,13 @@ public: { mean_ = 0; - for (unsigned i = 0; i < size_; ++i) - mean_ += data_[i]; + if (size_ > 0) + { + for (unsigned i = 0; i < size_; ++i) + mean_ += data_[i]; - mean_ /= size_; + mean_ /= size_; + } mean_needs_update_ = false; } @@ -93,10 +96,16 @@ public: { if (median_needs_update_) { - std::vector< T >& data = data_.hook_std_vector_(); - std::sort(data.begin(), data.end(), compare_values< T >()); + median_ = 0; + + if (size_ > 0) + { + std::vector< T >& data = data_.hook_std_vector_(); + std::sort(data.begin(), data.end(), compare_values< T >()); + + median_ = data[(size_ - 1) >> 1]; + } - median_ = data[(size_ - 1) >> 1]; median_needs_update_ = false; } @@ -110,15 +119,18 @@ public: mean(); variance_ = 0; - for (unsigned i = 0; i < size_; ++i) + if (size_ > 0) { - const T tmp = mean_ - data_[i]; + for (unsigned i = 0; i < size_; ++i) + { + const T tmp = mean_ - data_[i]; - variance_ += (tmp * tmp); - } + variance_ += (tmp * tmp); + } - variance_ /= size_; - std_ = sqrt(variance_); + variance_ /= size_; + std_ = sqrt(variance_); + } variance_needs_update_ = false; std_needs_update_ = false; @@ -135,8 +147,8 @@ public: return std_; } - T min() { return min_; } - T max() { return max_; } + T min() { return (size_ > 0) ? min_ : 0; } + T max() { return (size_ > 0) ? max_ : 0; } void sort() { diff --git a/scribo/scribo/draw/line_components.hh b/scribo/scribo/draw/line_components.hh new file mode 100644 index 0000000..878b2c1 --- /dev/null +++ b/scribo/scribo/draw/line_components.hh @@ -0,0 +1,113 @@ +// Copyright (C) 2009, 2010 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. + +#ifndef SCRIBO_DRAW_LINE_COMPONENTS_HH +# define SCRIBO_DRAW_LINE_COMPONENTS_HH + +/// \file +/// +/// Draw the components of a line +# include <mln/util/object_id.hh> + +# include <scribo/core/line_set.hh> +# include <scribo/core/component_set.hh> + + +namespace scribo +{ + namespace draw + { + + using namespace mln; + + template <typename L, typename I> + void + line_components(Image& input_, + const line_info<L>& line, + const mln_value(I)& value); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L, typename I> + void + line_components(Image& input_, + const line_info<L>& line, + const mln_value(I)& value) + { + trace::entering("scribo::draw::line_components"); + + I& input = exact(input_); + + mln_precondition(input.is_valid()); + + const line_set<L>& holder = line.holder(); + const component_set<L>& comp_set = holder.components(); + const L& labeled_image = holder.components().labeled_image(); + + const mln::util::array<component_id_t>& component_ids = line.component_ids(); + + for_all_elements(i, component_ids) + { + const unsigned c = component_ids(i); + const mln_value(L) v = c; + const box2d& bbox = comp_set(c).bbox(); + + const unsigned index = labeled_image.index_of_point(bbox.pmin()); + const unsigned index2 = input.index_of_point(bbox.pmin()); + const mln_value(L)* ptr_in = &(labeled_image.element(index)); + mln_value(I)* ptr_out = &(input.element(index2)); + const unsigned nrows = bbox.height(); + const unsigned ncols = bbox.width(); + const int delta = labeled_image.delta_index(dpoint2d(+1, -ncols)); + const int delta2 = input.delta_index(dpoint2d(+1, -ncols)); + + for (unsigned k = 0; k < nrows; ++k) + { + for (unsigned j = 0; j < ncols; ++j) + { + if (*ptr_in == v) + *ptr_out = value; + ++ptr_out; + ++ptr_in; + } + + ptr_out += delta2; + ptr_in += delta; + } + } + + trace::exiting("scribo::draw::line_components"); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::draw +} // end of namespace scribo + +#endif // ! SCRIBO_DRAW_LINE_COMPONENTS_HH diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 37817af..620faa7 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -23,50 +23,6 @@ using namespace mln; namespace scribo { - - namespace internal - { - -//------------------------------------- -// Extracting root of links -//------------------------------------- - template <typename L> - inline - unsigned - find_root(line_links<L>& parent, unsigned x) - { - unsigned tmp_x = x; - - while (parent(tmp_x) != tmp_x) - tmp_x = parent(tmp_x); - - while (parent(x) != x) - { - const unsigned tmp = parent(x); - x = parent(x); - parent(tmp) = tmp_x; - } - - return x; - } - - template <typename L> - inline - void - set_root(line_links<L>& parent, unsigned x, const unsigned root) - { - while (parent(x) != x && parent(x) != root) - { - const unsigned tmp = parent(x); - x = parent(x); - parent(tmp) = root; - } - - parent(x) = root; - } - - } - namespace filter { @@ -799,25 +755,6 @@ namespace scribo } } - // Post link processing - - const line_links<L> backup = output.duplicate(); - for (unsigned i = 0; i < output.nelements(); ++i) - { - const line_id_t current_neighbor = backup(i); - output(i) = scribo::internal::find_root(output, i); - const line_id_t root_index = output(i); - - for (unsigned j = 0; j < right.nelements(); ++j) - { - if (i != j && - current_neighbor != i && - right(j) == i) - scribo::internal::set_root(output, j, root_index); - } - } - - // Only debug // { // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); @@ -1352,7 +1289,7 @@ namespace scribo // std::cout << "Extracting paragraphs" << std::endl; filter::paragraph_links(left, right, output, lines); - paragraph_set<L> par_set = make::paragraph(output); + paragraph_set<L> par_set = make::paragraph(output, right); return par_set; } } diff --git a/scribo/scribo/text/paragraphs_closing.hh b/scribo/scribo/text/paragraphs_closing.hh new file mode 100644 index 0000000..ec1d5c8 --- /dev/null +++ b/scribo/scribo/text/paragraphs_closing.hh @@ -0,0 +1,208 @@ +// Copyright (C) 2009, 2010, 2011 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. + +#ifndef SCRIBO_TEXT_PARAGRAPHS_CLOSING_HH +# define SCRIBO_TEXT_PARAGRAPHS_CLOSING_HH + +/// \file +/// +/// Paragraphs closing using CRLA. + +namespace scribo +{ + + namespace text + { + + using namespace mln; + + template< typename L, typename V > + void + paragraphs_closing(image2d<V>& output, + const paragraph_set<L>& par_set, + const box2d& domain); + +# ifndef MLN_INCLUDE_ONLY + + template< typename V > + inline + void horizontal_CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas) + { + mln_piter(image2d<V>) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + V last_pixel_value = 0; + + for (unsigned i = 0; i < nrows; ++i) + { + for (unsigned j = 0; j < ncols; ++j) + { + const V& current_pixel = input.at_(i, j); + + if (!current_pixel) + { + if (last_pixel_value) + { + unsigned k = j + 1; + for (; !input.at_(i, k) && (k < ncols); ++k); + + count = k - j; + const int threshold = deltas(last_pixel_value - 1); + + if (last_pixel_value == input.at_(i, k) && count < threshold) + for (unsigned l = j; l <= k; ++l) + output.at_(i, l) = last_pixel_value; + + j = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; + } + } + } + } + + template< typename V > + inline + void vertical_CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas) + { + mln_piter(image2d<V>) p(input.domain()); + int count = 0; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + V last_pixel_value = 0; + + for (unsigned j = 0; j < ncols; ++j) + { + for (unsigned i = 0; i < nrows; ++i) + { + const V& current_pixel = input.at_(i, j); + + if (!current_pixel) + { + if (last_pixel_value) + { + unsigned k = i + 1; + for (; !input.at_(k, j) && (k < nrows); ++k); + + count = k - i; + const int threshold = deltas(last_pixel_value - 1); + + if (last_pixel_value == input.at_(k, j) + && count < threshold) + for (unsigned l = i; l <= k; ++l) + output.at_(l, j) = last_pixel_value; + + i = k; + last_pixel_value = 0; + } + } + else + { + output.at_(i, j) = current_pixel; + last_pixel_value = current_pixel; + } + } + } + } + + template< typename V > + inline + void CRLA(const image2d<V>& input, + image2d<V>& output, + const mln::util::array<int>& deltas, + const mln::util::array<int>& deltas_factor) + { + horizontal_CRLA(input, output, deltas_factor); + vertical_CRLA(output, output, deltas); + horizontal_CRLA(output, output, deltas_factor); + } + + template< typename L, typename V > + void + paragraphs_closing(image2d<V>& output, + const paragraph_set<L>& par_set, + const box2d& domain) + { + trace::entering("scribo::text::paragraphs_closing"); + + image2d<V> debug(domain); + + mln::util::array<int> deltas; + deltas.reserve(par_set.nelements()); + mln::util::array<int> deltas_factor; + deltas_factor.reserve(par_set.nelements()); + + data::fill(debug, 0); + data::fill(output, 0); + + const line_set<L>& lines = par_set.lines(); + + for_all_paragraphs(p, par_set) + { + const paragraph_info<L>& current_par = par_set(p); + const mln::util::array<line_id_t>& line_ids = current_par.line_ids(); + const unsigned nelements = line_ids.nelements(); + + for (unsigned i = 0; i < nelements; ++i) + { + const line_id_t& line_id = line_ids(i); + const line_info<L>& current_line = lines(line_id); + + draw::line_components(debug, current_line, p); + } + + int delta_baseline = current_par.delta_baseline(); + + if (delta_baseline % 2 == 0) + --delta_baseline; + + deltas.append(delta_baseline); + deltas_factor.append(3 * delta_baseline); + } + CRLA(debug, output, deltas, deltas_factor); + + trace::exiting("scribo::draw::line_components"); + } + +# endif + + } // end of namespace scribo::text + +} // end of namespace scribo + + +#endif // ! SCRIBO_TEXT_PARAGRAPHS_CLOSING_HH + -- 1.5.6.5

1 0

branch icdar/hdlac2011 updated: last-svn-commit-897-g7415119
by lazzara＠lrde.epita.fr 26 May '11

26 May '11

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 icdar/hdlac2011 has been updated via 7415119f80fca7ad9dd1b015c8c91e15030d0588 (commit) from 58b6a662ab8baecf54514930cebe761fbd9e0e32 (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 ----------------------------------------------------------------- 7415119 scribo/util/component_precise_outline.hh: Fix namespace ambiguity. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 5 +++++ scribo/scribo/util/component_precise_outline.hh | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0