Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena-2.0-403-gb261c2b configure.ac: Aesthetic changes.

by Roland Levillain

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

11 years, 9 months

olena-2.0-402-g57d6bf8 scribo/src/contest/Makefile.am: Aesthetic changes.

by Roland Levillain

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

11 years, 9 months

olena-2.0-446-gd8058ce Add constant Boolean functions.

by Guillaume Lazzara

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

11 years, 9 months

olena-2.0-449-ga744093 configure.ac: Allow tarballs with long filenames.

by Guillaume Lazzara

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

11 years, 9 months

olena-2.0-448-ge0089be mln/world/binary_2d/subsample.hh: Cleanup code. Fix a memory leak.

by Guillaume Lazzara

--- milena/ChangeLog | 5 +++++ milena/mln/world/binary_2d/subsample.hh | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1b7691e..4e1f088 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/binary_2d/subsample.hh: Cleanup code. Fix a memory + leak. + +2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add constant Boolean functions. * mln/fun/v2b/always_false.hh, diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index b8bee40..d8d1aa3 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2011, 2012 EPITA Research and Development +// Copyright (C) 2009, 2011, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -33,6 +33,7 @@ /// /// FIXME: not enough generic. Does not work on image having /// the top left corner different from (0,0). +/// FIXME: To be removed ? # include <mln/core/image/image2d.hh> # include <mln/core/alias/dpoint2d.hh> @@ -63,7 +64,7 @@ namespace mln inline image2d<value::int_u8> - subsample(image2d<bool>& input, unsigned n) + subsample(const image2d<bool>& input, unsigned n) { mln_trace("world::binary_2d::subsample"); @@ -79,21 +80,13 @@ namespace mln return output; } - const bool** ptr = new const bool*[n]; + const bool** ptr; const unsigned nrows = input.nrows() / n; const unsigned ncols = input.ncols() / n; - algebra::vec<2, unsigned int> vmin; - algebra::vec<2, unsigned int> vmax; - vmin[0] = 0; - vmin[1] = 0; - vmax[0] = nrows - 1; - vmax[1] = ncols - 1; - point2d pmin(vmin); - point2d pmax(vmax); - image2d<int_u8> output(box<point2d>(pmin, pmax)); - - dpoint2d dp_row(1, 0); - const unsigned delta_row = input.delta_offset(dp_row); + image2d<int_u8> output; + initialize(output, input); + + const unsigned delta_row = input.delta_offset(down); unsigned count = 0; for (unsigned row = 0; row < nrows; ++row) -- 1.7.2.5

11 years, 9 months

branch unstable/scribo updated: olena-2.0-447-gc6262b2

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 c6262b2dd178ba0b4cb6e6b9135d3006b287b98b (commit) via d8058ce8214e68759c706366cb5d331d9eb38f91 (commit) from fd193702df57265383453bbf942b1fa651ed3caf (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 ----------------------------------------------------------------- c6262b2 Small fixes in scribo. d8058ce Add constant Boolean functions. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/mln/fun/v2b/{lnot.hh => always_false.hh} | 23 ++++++++++++----------- milena/mln/fun/v2b/{lnot.hh => always_true.hh} | 23 ++++++++++++----------- scribo/ChangeLog | 13 +++++++++++++ scribo/scribo/core/line_set.hh | 19 ++++++++++++++++++- scribo/scribo/core/paragraph_info.hh | 4 +++- scribo/scribo/core/paragraph_set.hh | 7 +++++++ scribo/scribo/text/link_lines.hh | 8 ++++++-- 8 files changed, 78 insertions(+), 26 deletions(-) copy milena/mln/fun/v2b/{lnot.hh => always_false.hh} (80%) mode change 100644 => 100755 copy milena/mln/fun/v2b/{lnot.hh => always_true.hh} (80%) mode change 100644 => 100755 hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-447-gc6262b2 Small fixes in scribo.

by Guillaume Lazzara

* scribo/core/line_set.hh: Add update_types(). * scribo/core/paragraph_info.hh: Set paragraph as valid when a line is added. * scribo/core/paragraph_set.hh: Add a forward declaration. * scribo/text/link_lines.hh: Add more documentation. --- scribo/ChangeLog | 13 +++++++++++++ scribo/scribo/core/line_set.hh | 19 ++++++++++++++++++- scribo/scribo/core/paragraph_info.hh | 4 +++- scribo/scribo/core/paragraph_set.hh | 7 +++++++ scribo/scribo/text/link_lines.hh | 8 ++++++-- 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f356280..a438ae0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2013-03-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes in scribo. + + * scribo/core/line_set.hh: Add update_types(). + + * scribo/core/paragraph_info.hh: Set paragraph as valid when a + line is added. + + * scribo/core/paragraph_set.hh: Add a forward declaration. + + * scribo/text/link_lines.hh: Add more documentation. + +2013-03-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/binarization/Makefile.am: Fix EXTRA_DIST file names. 2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 4880a77..26bbb6d 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -133,6 +133,10 @@ namespace scribo template <typename F> void update_tags(const mln::Function_v2b<F>& f, line::Tag tag); + /// Update Type of lines set to 'false' in \p f with \p tag. + template <typename F> + void update_types(const mln::Function_v2b<F>& f, line::Type type); + /// Create a copy of this line_set<L> line_set<L> duplicate() const; @@ -345,6 +349,19 @@ namespace scribo data_->infos_[i].update_tag(tag); } + template <typename L> + template <typename F> + inline + void + line_set<L>::update_types(const mln::Function_v2b<F>& f_, + line::Type type) + { + const F& f = exact(f_); + + for_all_lines_info(i, data_->infos_) + if (!f(i)) + data_->infos_[i].update_type(type); + } template <typename L> inline diff --git a/scribo/scribo/core/paragraph_info.hh b/scribo/scribo/core/paragraph_info.hh index 31e5aa0..1bbf101 100644 --- a/scribo/scribo/core/paragraph_info.hh +++ b/scribo/scribo/core/paragraph_info.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -128,6 +129,7 @@ namespace scribo // More data may need to be updated! tag_ = paragraph::Needs_Precise_Stats_Update; + is_valid_ = true; } template <typename L> diff --git a/scribo/scribo/core/paragraph_set.hh b/scribo/scribo/core/paragraph_set.hh index 69194be..42bf4a3 100644 --- a/scribo/scribo/core/paragraph_set.hh +++ b/scribo/scribo/core/paragraph_set.hh @@ -116,6 +116,13 @@ namespace scribo scribo::paragraph_set<L> paragraph(const scribo::line_set<L>& lines); + + /// \brief Construct a paragraph set from line links information. + template <typename L> + scribo::paragraph_set<L> + paragraph(const line_links<L>& llinks); + + } // end of namespace scribo::make diff --git a/scribo/scribo/text/link_lines.hh b/scribo/scribo/text/link_lines.hh index a1e746e..0c5e733 100644 --- a/scribo/scribo/text/link_lines.hh +++ b/scribo/scribo/text/link_lines.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -52,6 +52,10 @@ namespace scribo /*! \brief Link text lines to prepare paragraph construction. + + Lines MUST be tagged as line::Text to be considered in this + processing. + \ingroup grptext */ template <typename L> -- 1.7.2.5

11 years, 9 months

olena-2.0-404-g1f16156 Move the ICDAR 2013 table competition code into the `contest' directory.

by Roland Levillain

* scribo/sandbox/icdar_13_table/: Move... * scribo/src/contest/table-2013/: ...here. --- .../contest/table-2013}/Makefile | 0 .../contest/table-2013}/README_ROLAND | 0 .../icdar_13_table => src/contest/table-2013}/TODO | 0 .../originals/competition-entry-region-model.xsd | 0 .../contest/table-2013}/src/disjoint_set.hh | 0 .../contest/table-2013}/src/main.cc | 0 .../contest/table-2013}/src/new.cc | 0 .../contest/table-2013}/src/xml.cc | 0 .../contest/table-2013}/src/xml.hh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/Makefile (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/README_ROLAND (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/TODO (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/originals/competition-entry-region-model.xsd (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/disjoint_set.hh (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/main.cc (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/new.cc (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/xml.cc (100%) rename scribo/{sandbox/icdar_13_table => src/contest/table-2013}/src/xml.hh (100%) diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/src/contest/table-2013/Makefile similarity index 100% rename from scribo/sandbox/icdar_13_table/Makefile rename to scribo/src/contest/table-2013/Makefile diff --git a/scribo/sandbox/icdar_13_table/README_ROLAND b/scribo/src/contest/table-2013/README_ROLAND similarity index 100% rename from scribo/sandbox/icdar_13_table/README_ROLAND rename to scribo/src/contest/table-2013/README_ROLAND diff --git a/scribo/sandbox/icdar_13_table/TODO b/scribo/src/contest/table-2013/TODO similarity index 100% rename from scribo/sandbox/icdar_13_table/TODO rename to scribo/src/contest/table-2013/TODO diff --git a/scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd b/scribo/src/contest/table-2013/originals/competition-entry-region-model.xsd similarity index 100% rename from scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd rename to scribo/src/contest/table-2013/originals/competition-entry-region-model.xsd diff --git a/scribo/sandbox/icdar_13_table/src/disjoint_set.hh b/scribo/src/contest/table-2013/src/disjoint_set.hh similarity index 100% rename from scribo/sandbox/icdar_13_table/src/disjoint_set.hh rename to scribo/src/contest/table-2013/src/disjoint_set.hh diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/src/contest/table-2013/src/main.cc similarity index 100% rename from scribo/sandbox/icdar_13_table/src/main.cc rename to scribo/src/contest/table-2013/src/main.cc diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/src/contest/table-2013/src/new.cc similarity index 100% rename from scribo/sandbox/icdar_13_table/src/new.cc rename to scribo/src/contest/table-2013/src/new.cc diff --git a/scribo/sandbox/icdar_13_table/src/xml.cc b/scribo/src/contest/table-2013/src/xml.cc similarity index 100% rename from scribo/sandbox/icdar_13_table/src/xml.cc rename to scribo/src/contest/table-2013/src/xml.cc diff --git a/scribo/sandbox/icdar_13_table/src/xml.hh b/scribo/src/contest/table-2013/src/xml.hh similarity index 100% rename from scribo/sandbox/icdar_13_table/src/xml.hh rename to scribo/src/contest/table-2013/src/xml.hh -- 1.7.2.5

11 years, 9 months

branch unstable/scribo updated: olena-2.0-445-gfd19370

by git＠lrde.epita.fr

11 years, 9 months

olena-2.0-445-gfd19370 tests/binarization/Makefile.am: Fix EXTRA_DIST file names.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/tests/binarization/Makefile.am | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7f238b3..f356280 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/binarization/Makefile.am: Fix EXTRA_DIST file names. + 2013-03-04 Roland Levillain <roland(a)lrde.epita.fr> Fix inclusion paths. diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index 3a3aefb..7458b1c 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -18,19 +18,18 @@ include $(top_srcdir)/scribo/tests/tests.mk EXTRA_DIST = \ - kim.res.pbm \ + kim.ref.pbm \ kim_wodd_heven.ref.pbm \ kim_weven_hodd.ref.pbm \ kim_wodd_hodd.ref.pbm \ - niblack.res.pbm \ + niblack.ref.pbm \ niblack_wodd_heven.ref.pbm \ niblack_weven_hodd.ref.pbm \ niblack_wodd_hodd.ref.pbm \ - niblack_fast.res.pbm \ + niblack_fast.ref.pbm \ niblack_fast_wodd_heven.ref.pbm \ niblack_fast_weven_hodd.ref.pbm \ niblack_fast_wodd_hodd.ref.pbm \ - niblack.ref.pbm \ sauvola_ms.ref.pbm \ sauvola_ms_wodd_heven.ref.pbm \ sauvola_ms_weven_hodd.ref.pbm \ -- 1.7.2.5

11 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches