Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: olena-2.0-622-g3da3ce7 Slightly improve Scribo's tests/primitive/extract/alignments.cc.

by Roland Levillain

* tests/primitive/extract/alignments.cc (main): Pass an actual literal float as second argument to scribo::primitive::extract::alignments. Add a Doxygen header. Cosmetic changes. --- scribo/ChangeLog | 10 ++++++++++ scribo/tests/primitive/extract/alignments.cc | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f254cb..88f7ca5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Slightly improve Scribo's tests/primitive/extract/alignments.cc. + + * tests/primitive/extract/alignments.cc (main): Pass an actual + literal float as second argument to + scribo::primitive::extract::alignments. + Add a Doxygen header. + Cosmetic changes. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/tests/primitive/extract/alignments.cc b/scribo/tests/primitive/extract/alignments.cc index a069149..5c6a10a 100644 --- a/scribo/tests/primitive/extract/alignments.cc +++ b/scribo/tests/primitive/extract/alignments.cc @@ -1,4 +1,4 @@ -// 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. // @@ -23,20 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file +/// \file +/// \brief Exercise scribo::primitive::extract::alignments. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/io/pbm/load.hh> #include <scribo/core/document.hh> + #include <scribo/core/paragraph_set.hh> #include <scribo/text/extract_lines_wo_merge.hh> #include <scribo/primitive/extract/alignments.hh> #include "tests/data.hh" - int main() { using namespace mln; @@ -44,7 +45,7 @@ int main() typedef image2d<scribo::def::lbl_type> L; - for (unsigned i = 1; i < 5; ++i) + for (unsigned i = 1; i <= 4; ++i) { std::ostringstream os; os << SCRIBO_IMG_DIR << "/alignment_" << i << ".pbm"; @@ -53,14 +54,13 @@ int main() doc.open(); doc.set_binary_image(data::convert(bool(), doc.image())); - // Extract lines - line_set<L> - lines = scribo::text::extract_lines_wo_merge(doc, c8()); + // Extract lines. + line_set<L> lines = scribo::text::extract_lines_wo_merge(doc, c8()); doc.set_paragraphs(scribo::make::paragraph(lines)); - // Find alignments - mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> - res = primitive::extract::alignments(doc, 3, 3); + // Find alignments. + mln::util::couple<component_set<L>, mln_ch_value_(L,bool)> res = + primitive::extract::alignments(doc, 3.f, 3); std::ostringstream os_out; image2d<bool> ref; @@ -71,5 +71,4 @@ int main() mln_assertion(ref == res.second()); } - } -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-621-g90a82b6 scribo/primitive/extract/alignments.hh: Fix Doxygen comments.

by Roland Levillain

--- scribo/ChangeLog | 4 ++++ scribo/scribo/primitive/extract/alignments.hh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e9ab8d1..1f254cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + + * scribo/primitive/extract/alignments.hh: Fix Doxygen comments. + 2013-07-31 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution of Scribo. diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 7bd9b94..c06880b 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.hh @@ -92,17 +92,17 @@ namespace scribo \pre Separators should be removed from input document image . - \pre Text in \p doc must be constructed from Components + \pre Text in \p doc must be constructed from components grouped by lines with a very strict criterion in order to keep spaces between words and paragraphs. This first grouping is necessary to avoid false positive (e.g. inside the text blocks). - \pre \p doc must have text (has_text() returns true). + \pre \p doc must have text (doc.has_text() returns true). - Internal description : - ---------------------- + Internal description: + --------------------- 1) Build an image of line bboxes 2) For TOP and BOTTOM -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-621-g49883e6 scribo/primitive/extract/alignments.hh: Fix Doxygen comments.

by Roland Levillain

11 years, 4 months

olena: olena-2.0-620-g9f7a616 mln/core/image/dmorph/sub_image.hh: Fix indentation.

by Roland Levillain

--- milena/ChangeLog | 4 ++++ milena/mln/core/image/dmorph/sub_image.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 60db9ea..7100701 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/image/dmorph/sub_image.hh: Fix indentation. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + Enable tests/fun/v2i. * tests/fun/Makefile.am (SUBDIRS): Add v2i. diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh index 15cf254..253738c 100644 --- a/milena/mln/core/image/dmorph/sub_image.hh +++ b/milena/mln/core/image/dmorph/sub_image.hh @@ -102,8 +102,8 @@ namespace mln // template <typename I, typename S> class sub_image : public internal::image_domain_morpher< I, - S, - sub_image<I,S> > + S, + sub_image<I,S> > { public: /// Skeleton. -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-620-g733069f mln/core/image/dmorph/sub_image.hh: Fix indentation.

by Roland Levillain

11 years, 4 months

olena: olena-2.0-619-g81c6c2e AUTHORS: Update.

by Roland Levillain

--- AUTHORS | 108 ++++++++++++++++++++++++++++++++++++++++++------------------- ChangeLog | 4 +++ 2 files changed, 79 insertions(+), 33 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9bea227..0626b1a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,7 +5,7 @@ This package was written by and with the assistance of Active LRDE Staff. ================== -* **Thierry G�raud** <theo(a)lrde.epita.fr> +* **Thierry G�raud** <theo(a)lrde.epita.fr> - Management of the project in the first place. - Type system. @@ -16,40 +16,50 @@ Active LRDE Staff. - Numerous hours spent thinking about Olena. -* **Guillaume Lazzara** <z(a)lrde.epita.fr> - - - SCRIBO module main author and maintainer. - - Library improvements. +* **Jonathan Fabrizio** <jonathan(a)lrde.epita.fr> -* **Roland Levillain** <roland(a)lrde.epita.fr> +* **Roland Levillain** <roland(a)lrde.epita.fr> - - Project manager. + - Project and release manager. - Theoretical mentor. - - Renovation of Swilena (Olena 0.10a). - - G++ 4.0 and 4.1 compatibility (Olena 0.10a). - - Integration of GNU Libtool (Olena 0.10a). - - SCOOP 2 and Static (Olena pre-1.0). - - Revive the dynamic-static bridge prototype from Olena proto-1.0. + - Renovation of Swilena (Olena 0.10a and later). + - Overhaul of the dynamic-static bridge (Olena proto-1.0 and later). + - Integration of GNU Libtool (Olena 0.10a and later). + - SCOOP 2 and Static (Olena pre-1.0 and later). + - G++ and clang compatibility. + + +* **Myriam Robert-Seidowsky** <myriam.robert-seidowsky(a)lrde.epita.fr> + + +=============== +Ph.D. students. +=============== + +* **Edwin Carlinet** <edwin.carlinet(a)lrde.epita.fr> + + - Accumulators. + - Morphological connected filters. ================================ Past contributors of LRDE Staff. ================================ -* **J�r�me Darbon** <jerome(a)lrde.epita.fr> +* **J�r�me Darbon** <jerome(a)lrde.epita.fr> - Image morphology and Olena morpho. -* **R�da Dehak** <reda(a)lrde.epita.fr> +* **R�da Dehak** <reda(a)lrde.epita.fr> - Management of the project. - Color conversions. - Cleanup the sources. -* **Akim Demaille** <akim(a)lrde.epita.fr> +* **Akim Demaille** <akim(a)lrde.epita.fr> - Configuration system. - Maintenance of code's clearness. @@ -64,28 +74,63 @@ Past contributors of LRDE Staff. - Numerous hours spent on Olena to make it better. -* **Fabien Freling** <fabien.freling(a)lrde.epita.fr> +* **Fabien Freling** <fabien.freling(a)lrde.epita.fr> - Work on Melimage with IGR. - Library improvements. -* **Yann Jacquelet** <jacquelet(a)lrde.epita.fr> +* **Yann Jacquelet** <jacquelet(a)lrde.epita.fr> - SCRIBO-related work. -======== -Interns. -======== +* **Guillaume Lazzara** <z(a)lrde.epita.fr> -* **Arthur Cr�pin-Leblond** + - SCRIBO module main author and former maintainer. + - Many contributions and improvements to Milena and Olena in general. - - SCRIBO structured outputs (XML, HTML, PDF). +========================= +Students from Class 2015. +========================= + +* **Anthony Seure** <anthony.seure(a)lrde.epita.fr> + + - Work on SIFT. -* **Rapha�l Boissel** - - Graph implementation of a DIA toolchain in SCRIBO. + +* **Christophe Escobar** <christophe.escobar(a)lrde.epita.fr> + + - Work on structural document analysis in the SCRIBO module. + +========================= +Students from Class 2014. +========================= + +* **Rapha�l Boissel** <raphael.boissel(a)lrde.epita.fr> + + - Graph implementation of a DIA toolchain in the SCRIBO module. + + +* **S�bastien Crozet** <sebastien.crozet(a)lrde.epita.fr> + + - Work on the tree of shapes. + +========================= +Students from Class 2013. +========================= + +* **Coddy Levi** <coddy.levi(a)lrde.epita.fr> + + - Work on text extraction in inverse video. + - Work on variational image inpainting. + + +* **Sylvain Lobry** <sylvain.lobry(a)lrde.epita.fr> + + - Work on text extraction in inverse video. + - Work on optical flow and video inpainting. ========================= Students from Class 2012. @@ -102,15 +147,6 @@ Students from Class 2012. - Many improvements in SCRIBO layout analysis. ========================= -Students from Class 2011. -========================= - -* **Edwin Carlinet** <edwin.carlinet(a)lrde.epita.fr> - - - Accumulators. - - Morphological connected filters. - -========================= Students from Class 2010. ========================= @@ -377,6 +413,11 @@ Students from Class 2000. Other Contributors. =================== +* **Arthur Cr�pin-Leblond** + + - SCRIBO module structured outputs (XML, HTML, PDF). + + * **Guillaume Duhamel** - Low-level routines. @@ -398,6 +439,7 @@ Other Contributors. - Color system. + .. Local Variables: .. mode: rst .. ispell-local-dictionary: "american" diff --git a/ChangeLog b/ChangeLog index e1e5a35..affb146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * AUTHORS: Update. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * COPYING: Untabify. 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-619-g30dbf82 AUTHORS: Update.

by Roland Levillain

11 years, 4 months

olena: olena-2.0-618-ge615bde COPYING: Untabify.

by Roland Levillain

--- COPYING | 14 +++++++------- ChangeLog | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index d511905..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/ChangeLog b/ChangeLog index 3d3396f..e1e5a35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * COPYING: Untabify. + +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Configure milena/tests/fun/v2i/Makefile. 2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-618-gcde905d COPYING: Untabify.

by Roland Levillain

11 years, 4 months

olena: olena-2.0-617-gc6d8ebc Enable tests/fun/v2i.

by Roland Levillain

* tests/fun/Makefile.am (SUBDIRS): Add v2i. --- milena/ChangeLog | 6 ++++++ milena/tests/fun/Makefile.am | 1 + 2 files changed, 7 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index b1a897b..60db9ea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> + + Enable tests/fun/v2i. + + * tests/fun/Makefile.am (SUBDIRS): Add v2i. + 2012-07-19 Roland Levillain <roland(a)lrde.epita.fr> Various aesthetic changes in Milena. diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index 23e1db6..f8b7c11 100644 --- a/milena/tests/fun/Makefile.am +++ b/milena/tests/fun/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS = \ p2p \ p2v \ stat \ + v2i \ v2v \ vv2v \ x2x -- 1.7.10.4

11 years, 4 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