June 2014 - Olena-patches

olena: branch next updated: olena-2.0-887-g28832f9
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

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 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) via ec75045a8c8c682f4dbb1981670b5348d8e834cd (commit) via e7bfdf7cccbd73ddc40b91dde465aba1c75bdf8b (commit) via 4c2812937c8dde4a8d7d2c15c9ae70cd71fb778a (commit) via 0a4c6e4b702fec0f7d98a43e78d95a7fa3a60ff9 (commit) via b8febd14830bc4059f57bc9d388eb291324a0986 (commit) via 600b8e3d2024a064ab408c4c30cae1a63ce01bdd (commit) from 3c1bf651a333bc132cf27bcdcc600039b44cee6e (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 28 +++++++-------- ChangeLog | 13 ++++++- README | 36 +++++++++---------- doc/Doxyfile.in | 2 +- doc/Makefile.am | 2 +- dynamic-use-of-static-c++/ChangeLog | 12 +++++++ dynamic-use-of-static-c++/swig/run.in | 2 +- milena/ChangeLog | 38 ++++++++++++++++---- milena/apps/morphers/iz.cc | 4 +-- milena/doc/Doxyfile.in | 2 +- milena/doc/oldies/2007__tour.cc | 2 +- milena/doc/tutorial.old/slides.tex | 2 +- milena/mln/accu/shape/volume.hh | 2 +- milena/mln/core/concept/point_site.hh | 4 +-- milena/mln/io/pdf/get_header.hh | 2 +- milena/mln/morpho/watershed/flooding.hh | 2 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 4 +-- .../mln/topo/skeleton/priority_driven_thinning.hh | 4 +-- milena/tests/core/image/complex_image.cc | 2 +- milena/tests/core/image/complex_image.hh | 2 +- milena/tests/core/site_set/p_complex.cc | 2 +- milena/tests/make/attachment.cc | 2 +- milena/tests/make/detachment.cc | 2 +- milena/tests/morpho/complex_image_morpho.cc | 2 +- milena/tests/topo/complex.cc | 8 ++--- milena/tests/topo/is_facet.cc | 2 +- scribo/ChangeLog | 12 ++++++- scribo/doc/Doxyfile.in | 2 +- scribo/doc/mainpage.dox | 4 +-- scribo/scribo/preprocessing/rotate_90.hh | 14 ++++---- swilena/ChangeLog | 12 ++++++- swilena/box2d_piter.i | 2 +- swilena/complex.ixx | 2 +- swilena/dynamic_image2d.i | 2 +- swilena/python/complex2-misc.py | 13 ++++--- 35 files changed, 156 insertions(+), 90 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch utf-8 created: olena-2.0-887-g28832f9
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

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 utf-8 has been created at 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) - Log ----------------------------------------------------------------- 28832f9 Convert old (no longer distributed) files to UTF-8. ec75045 Convert dynamic-use-of-static-c++ to UTF-8. e7bfdf7 Remove extended characters from Swilena. 4c28129 Convert Scribo to UTF-8. 0a4c6e4 Convert Milena to UTF-8. b8febd1 Convert Olena to UTF-8. 600b8e3 Convert ChangeLogs to UTF-8. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-887-g28832f9 Convert old (no longer distributed) files to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

--- milena/doc/oldies/2007__tour.cc | 2 +- milena/doc/tutorial.old/slides.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/milena/doc/oldies/2007__tour.cc b/milena/doc/oldies/2007__tour.cc index 1078cc4..a00c99a 100644 --- a/milena/doc/oldies/2007__tour.cc +++ b/milena/doc/oldies/2007__tour.cc @@ -40,7 +40,7 @@ // in this file. using namespace oln; -// Data types are defined in the Int�gre library, so they are +// Data types are defined in the Intègre library, so they are // in the ntg namespace. // In this file, we will neglect the 'ntg::' prefix. using namespace ntg; diff --git a/milena/doc/tutorial.old/slides.tex b/milena/doc/tutorial.old/slides.tex index 68eddc4..c0f2a6c 100644 --- a/milena/doc/tutorial.old/slides.tex +++ b/milena/doc/tutorial.old/slides.tex @@ -65,7 +65,7 @@ in head/foot}% \usepackage{pgf,pgfarrows,pgfnodes,pgfautomata,pgfheaps,pgfshade} \usepackage{amsmath,amssymb} -\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} \usepackage{colortbl} \usepackage[english]{babel} -- 1.7.10.4

1 0

olena: olena-2.0-886-gec75045 Convert dynamic-use-of-static-c++ to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* swig/run.in: Here. --- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ dynamic-use-of-static-c++/swig/run.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index e199524..c990c1b 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,9 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert dynamic-use-of-static-c++ to UTF-8. + + * swig/run.in: Here. + 2009-11-03 Roland Levillain <roland(a)lrde.epita.fr> Normalize header guards. diff --git a/dynamic-use-of-static-c++/swig/run.in b/dynamic-use-of-static-c++/swig/run.in index 92d54fe..2663c48 100755 --- a/dynamic-use-of-static-c++/swig/run.in +++ b/dynamic-use-of-static-c++/swig/run.in @@ -1,7 +1,7 @@ #! /bin/sh # Copyright (C) 2003, 2004, 2006, 2009 Laboratoire d'Informatique de Paris 6 -# (LIP6), d�partement Syst�mes R�partis Coop�ratifs (SRC), Universit� +# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université # Pierre et Marie Curie. # # This file is part of Spot, a model checking library. -- 1.7.10.4

1 0

olena: olena-2.0-885-ge7bfdf7 Remove extended characters from Swilena.
by Roland Levillain 25 Jun '14

25 Jun '14

* box2d_piter.i, * complex.ixx, * dynamic_image2d.i, * python/complex2-misc.py: Here, to convert these files to plain ASCII. --- swilena/ChangeLog | 10 ++++++++++ swilena/box2d_piter.i | 2 +- swilena/complex.ixx | 2 +- swilena/dynamic_image2d.i | 2 +- swilena/python/complex2-misc.py | 13 ++++++------- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 3955b57..c7daa94 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Remove extended characters from Swilena. + + * box2d_piter.i, + * complex.ixx, + * dynamic_image2d.i, + * python/complex2-misc.py: + Here, to convert these files to plain ASCII. + 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> Improve Swilena's max-tree.py output. diff --git a/swilena/box2d_piter.i b/swilena/box2d_piter.i index 1e3de42..4be2e54 100644 --- a/swilena/box2d_piter.i +++ b/swilena/box2d_piter.i @@ -107,7 +107,7 @@ #if SWIGPYTHON -// Handling iterators � la Python. +// Handling iterators a la Python. %extend mln::box_fwd_piter_< mln::point<mln::grid::square, mln::def::coord> > { diff --git a/swilena/complex.ixx b/swilena/complex.ixx index ec5c196..c93acc6 100644 --- a/swilena/complex.ixx +++ b/swilena/complex.ixx @@ -242,7 +242,7 @@ instantiate_complex_set_iterator_base(Name, mln::topo::face_fwd_iter< D >) #if SWIGPYTHON -// Handling iterators � la Python. +// Handling iterators a la Python. %extend mln::topo::face_fwd_iter< D > { mln::topo::face_fwd_iter< D >& diff --git a/swilena/dynamic_image2d.i b/swilena/dynamic_image2d.i index 2a0430d..7ad7a7d 100644 --- a/swilena/dynamic_image2d.i +++ b/swilena/dynamic_image2d.i @@ -109,7 +109,7 @@ namespace mln below)? Probably not, as internal::image_base contains data (through a tracked_ptr). */ // \brief A semi-abstract class that serves as an entry point - // (called � director � by SWIG) for Python code. + // (called ``director'' by SWIG) for Python code. // // This class is not really abstract in the C++ sense, but it lacks // methods to be a real image class. diff --git a/swilena/python/complex2-misc.py b/swilena/python/complex2-misc.py index 77332e9..765f355 100644 --- a/swilena/python/complex2-misc.py +++ b/swilena/python/complex2-misc.py @@ -1,5 +1,4 @@ #! /usr/bin/env python -# -*- coding: latin-1 -*- # Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) # @@ -27,12 +26,12 @@ from swilena import * # A 2-d (simplicial) complex and its adjacency graph. # # v0 e3 v3 -# o-----------o v0----e3----v3 -# / \ ,-----. / / \ | / -# / . \ \ t1/ / / \ t1 / -# e0 / / \ e1\ / / e4 e0. ,e1� `e4 -# / /t0 \ \ ' / / t0 \ / -# / `-----' \ / / | \ / +# o-----------o v0----e3----v3 +# / \ ,-----. / / \ | / +# / . \ \ t1/ / / \ t1 / +# e0 / / \ e1\ / / e4 e0. ,e1' `e4 +# / /t0 \ \ ' / / t0 \ / +# / `-----' \ / / | \ / # o-----------o v1----e2----v2 # v1 e2 v2 # -- 1.7.10.4

1 0

olena: olena-2.0-884-g4c28129 Convert Scribo to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* doc/mainpage.dox: Here. * scribo/preprocessing/rotate_90.hh: Replace extended characters to convert to plain ASCII. Typos. * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. --- scribo/ChangeLog | 10 ++++++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/mainpage.dox | 4 ++-- scribo/scribo/preprocessing/rotate_90.hh | 14 +++++++------- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3a157ef..2e4bc02 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert Scribo to UTF-8. + + * doc/mainpage.dox: Here. + * scribo/preprocessing/rotate_90.hh: + Replace extended characters to convert to plain ASCII. + Typos. + * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/xml2doc/main.cc: Add --template-path option. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index d37780e..6b1754b 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -126,7 +126,7 @@ IMAGE_PATH = @top_srcdir@/scribo/doc/images \ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO -INPUT_ENCODING = ISO-8859-1 +INPUT_ENCODING = UTF-8 CITE_BIB_FILES = @abs_top_srcdir@/doc/doc.bib \ @abs_top_srcdir@/doc/olena.bib LATEX_BIB_STYLE = plain diff --git a/scribo/doc/mainpage.dox b/scribo/doc/mainpage.dox index 77786d9..4fa4014 100644 --- a/scribo/doc/mainpage.dox +++ b/scribo/doc/mainpage.dox @@ -6,9 +6,9 @@ Scribo, a framework for Document Image Analysis. Its initial release has been developed in the context of the SCRIBO project of the Free Software Thematic Group, part of the "Systematic -Paris-R�gion" Cluster (France). This project was partially funded by +Paris-Région" Cluster (France). This project was partially funded by the French government, its economic development agencies and by the -Paris-R�gion institutions. +Paris-Région institutions. It aims at providing the following features: diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index af2958e..019fa12 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -29,7 +29,7 @@ /// \file /// -/// Fast +90/-90 degrees rotation. +/// Fast +90/-90 degree rotation. # include <mln/core/concept/image.hh> @@ -48,11 +48,11 @@ namespace scribo using namespace mln; - /*! \brief Perform a +90/-90 degrees rotation. + /*! \brief Perform a +90/-90 degree rotation. \param[in] input An image. - \param[in] positive If set to true, performs a +90� rotation, - -90� otherwise. + \param[in] positive If set to true, performs a +90 degree rotation, + -90 degree otherwise. \return A rotated image. */ @@ -60,7 +60,7 @@ namespace scribo mln_concrete(I) rotate_90(const Image<I>& input, bool positive); - /// \brief Performs a +90� rotation. + /// \brief Performs a +90 degree rotation. /// \overload // template <typename I> -- 1.7.10.4

1 0

olena: olena-2.0-883-g0a4c6e4 Convert Milena to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* mln/accu/shape/volume.hh, * mln/core/concept/point_site.hh, * mln/morpho/watershed/flooding.hh, * mln/topo/skeleton/breadth_first_thinning.hh, * mln/topo/skeleton/priority_driven_thinning.hh: Here. * tests/core/image/complex_image.cc, * tests/core/image/complex_image.hh, * tests/core/site_set/p_complex.cc, * tests/make/attachment.cc, * tests/make/detachment.cc, * tests/morpho/complex_image_morpho.cc, * tests/topo/complex.cc, * tests/topo/is_facet.cc, * apps/morphers/iz.cc: Replace extended characters to convert to plain ASCII. * mln/io/pdf/get_header.hh (mln::io::pdf::pdf_header::pdf_header): Generate UTF-8 metadata. * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. --- milena/ChangeLog | 24 ++++++++++++++++++++ milena/apps/morphers/iz.cc | 4 ++-- milena/doc/Doxyfile.in | 2 +- milena/mln/accu/shape/volume.hh | 2 +- milena/mln/core/concept/point_site.hh | 4 ++-- milena/mln/io/pdf/get_header.hh | 2 +- milena/mln/morpho/watershed/flooding.hh | 2 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 4 ++-- .../mln/topo/skeleton/priority_driven_thinning.hh | 4 ++-- milena/tests/core/image/complex_image.cc | 2 +- milena/tests/core/image/complex_image.hh | 2 +- milena/tests/core/site_set/p_complex.cc | 2 +- milena/tests/make/attachment.cc | 2 +- milena/tests/make/detachment.cc | 2 +- milena/tests/morpho/complex_image_morpho.cc | 2 +- milena/tests/topo/complex.cc | 8 +++---- milena/tests/topo/is_facet.cc | 2 +- 17 files changed, 47 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f760e50..393e761 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,27 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert Milena to UTF-8. + + * mln/accu/shape/volume.hh, + * mln/core/concept/point_site.hh, + * mln/morpho/watershed/flooding.hh, + * mln/topo/skeleton/breadth_first_thinning.hh, + * mln/topo/skeleton/priority_driven_thinning.hh: + Here. + * tests/core/image/complex_image.cc, + * tests/core/image/complex_image.hh, + * tests/core/site_set/p_complex.cc, + * tests/make/attachment.cc, + * tests/make/detachment.cc, + * tests/morpho/complex_image_morpho.cc, + * tests/topo/complex.cc, + * tests/topo/is_facet.cc, + * apps/morphers/iz.cc: + Replace extended characters to convert to plain ASCII. + * mln/io/pdf/get_header.hh (mln::io::pdf::pdf_header::pdf_header): + Generate UTF-8 metadata. + * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. + 2012-06-05 Edwin Carlinet <carlinet(a)lrde.epita.fr> Exercise ASCII PPM file loading. diff --git a/milena/apps/morphers/iz.cc b/milena/apps/morphers/iz.cc index 1603d38..352102e 100644 --- a/milena/apps/morphers/iz.cc +++ b/milena/apps/morphers/iz.cc @@ -153,8 +153,8 @@ int main(int argc, char* argv[]) io::ppm::save(ws_, "tmp_ws_superpose.ppm"); // test% g++ -I. main.cc -DNDEBUG -O2 - // main.cc: In function ‘int main(int, char**)’: - // main.cc:85: error: no matching function for call to ‘convert(mln::image2d<bool>&, mln::value::rgb8)’ + // main.cc: In function `int main(int, char**)': + // main.cc:85: error: no matching function for call to `convert(mln::image2d<bool>&, mln::value::rgb8)' // /// Convert the image \p input by changing the value type. // /// diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5b04918..786acb5 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -676,7 +676,7 @@ INPUT = @top_srcdir@/milena # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for # the list of possible encodings. -INPUT_ENCODING = ISO-8859-1 +INPUT_ENCODING = UTF-8 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff --git a/milena/mln/accu/shape/volume.hh b/milena/mln/accu/shape/volume.hh index dbfc020..bf1993c 100644 --- a/milena/mln/accu/shape/volume.hh +++ b/milena/mln/accu/shape/volume.hh @@ -181,7 +181,7 @@ namespace mln volume<I>::take(const volume<I>& other) { area__ += other.area__; - /* FIXME: Is it `t.area__' or `area__' ? Th�o said it was + /* FIXME: Is it `t.area__' or `area__' ? Théo said it was the latter, but both the ISMM 2005 paper and Olena 0.11 use the former. */ volume_ += diff --git a/milena/mln/core/concept/point_site.hh b/milena/mln/core/concept/point_site.hh index 0c6a5a2..2dd2b27 100644 --- a/milena/mln/core/concept/point_site.hh +++ b/milena/mln/core/concept/point_site.hh @@ -249,7 +249,7 @@ namespace mln // Operators. - // FIXME: Remove, or factor in a lower class (Th�o removed it from + // FIXME: Remove, or factor in a lower class (Théo removed it from // the cleanup-2008 branch). template <typename L, typename R> inline @@ -264,7 +264,7 @@ namespace mln return true; } - // FIXME: Remove, or factor in a lower class (Th�o removed it from + // FIXME: Remove, or factor in a lower class (Théo removed it from // the cleanup-2008 branch). template <typename L, typename R> inline diff --git a/milena/mln/io/pdf/get_header.hh b/milena/mln/io/pdf/get_header.hh index 9a2e164..e3b3c41 100644 --- a/milena/mln/io/pdf/get_header.hh +++ b/milena/mln/io/pdf/get_header.hh @@ -88,7 +88,7 @@ namespace mln is_encrypted = doc->is_encrypted(); is_linearized = doc->is_linearized(); is_locked = doc->is_locked(); - metadata = doc->metadata().to_latin1(); + metadata = doc->metadata().to_utf8(); } // End of pdf_header implementation. diff --git a/milena/mln/morpho/watershed/flooding.hh b/milena/mln/morpho/watershed/flooding.hh index d93ae97..0ab12e3 100644 --- a/milena/mln/morpho/watershed/flooding.hh +++ b/milena/mln/morpho/watershed/flooding.hh @@ -36,7 +36,7 @@ /// /// Reference: /// Fernand Meyer. Un algorithme optimal de ligne de partage des -/// eaux. In: Actes du 8�me Congr�s AFCET, Lyon-Villeurbanne, France +/// eaux. In: Actes du 8ème Congrès AFCET, Lyon-Villeurbanne, France /// (1991), pages 847--859. # include <mln/trait/ch_value.hh> diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index d91ad36..7faeddb 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -35,8 +35,8 @@ /// to the definitions used in /// /// Gilles Bertrand and Michel Couprie: Transformations topologiques -/// discr�tes. In David Coeurjolly, Annick Montanvert and Jean-Marc -/// Chassery, eds.: G�om�trie discr�te et images num�riques. Hermes +/// discrètes. In David Coeurjolly, Annick Montanvert and Jean-Marc +/// Chassery, eds.: Géométrie discrète et images numériques. Hermes /// Sciences Publications (2007), pages 187--209. # include <mln/core/routine/duplicate.hh> diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh index 96a4eac..cc31f75 100644 --- a/milena/mln/topo/skeleton/priority_driven_thinning.hh +++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh @@ -35,8 +35,8 @@ /// to the definitions used in /// /// Gilles Bertrand and Michel Couprie: Transformations topologiques -/// discr�tes. In David Coeurjolly, Annick Montanvert and Jean-Marc -/// Chassery, eds.: G�om�trie discr�te et images num�riques. Hermes +/// discrètes. In David Coeurjolly, Annick Montanvert and Jean-Marc +/// Chassery, eds.: Géométrie discrète et images numériques. Hermes /// Sciences Publications (2007), pages 187--209. # include <mln/core/routine/duplicate.hh> diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index c0434bc..3ec2abf 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -62,7 +62,7 @@ int main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/core/image/complex_image.hh b/milena/tests/core/image/complex_image.hh index 030006a..990b0e0 100644 --- a/milena/tests/core/image/complex_image.hh +++ b/milena/tests/core/image/complex_image.hh @@ -56,7 +56,7 @@ make_test_complex_image() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/core/site_set/p_complex.cc b/milena/tests/core/site_set/p_complex.cc index 9dfb4e8..af4262b 100644 --- a/milena/tests/core/site_set/p_complex.cc +++ b/milena/tests/core/site_set/p_complex.cc @@ -54,7 +54,7 @@ int main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/make/attachment.cc b/milena/tests/make/attachment.cc index 2674727..fffa70c 100644 --- a/milena/tests/make/attachment.cc +++ b/milena/tests/make/attachment.cc @@ -49,7 +49,7 @@ main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/make/detachment.cc b/milena/tests/make/detachment.cc index 759c642..a399fe9 100644 --- a/milena/tests/make/detachment.cc +++ b/milena/tests/make/detachment.cc @@ -49,7 +49,7 @@ main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index 601b7a9..bb820d0 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -69,7 +69,7 @@ int main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 54bf6ce..ee52211 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -56,7 +56,7 @@ int main() o-----------o v0----e3----v3 / \ ,-----. / / \ | / / . \ \ t1/ / / \ t1 / - e0 / / \ e1\ / / e4 e0. ,e1� `e4 + e0 / / \ e1\ / / e4 e0. ,e1' `e4 / /t0 \ \ ' / / t0 \ / / `-----' \ / / | \ / o-----------o v1----e2----v2 @@ -321,14 +321,14 @@ int main() Name Definition ----------------------------------------------------------------- cell_fwd_iter<D>(c, f) | Iterators on the set of the - cell_bkd_iter<D>(c, f) | faces in the � cell � + cell_bkd_iter<D>(c, f) | faces in the ``cell'' | including p, i.e. the set of | all m-faces adjacent to p, | where m is in [0, n-1]; - | this set is name � f-hat � + | this set is name ``f-hat'' cell_boundary_fwd_iter<D>(c, f) | Likewise, but excluding p; - cell_boundary_bkd_iter<D>(c, f) | this set is named � p-hat* � + cell_boundary_bkd_iter<D>(c, f) | this set is named ``p-hat*'' ----------------------------------------------------------------- We could also have generic iterators based on predicated, and diff --git a/milena/tests/topo/is_facet.cc b/milena/tests/topo/is_facet.cc index 36be66a..281df0f 100644 --- a/milena/tests/topo/is_facet.cc +++ b/milena/tests/topo/is_facet.cc @@ -49,7 +49,7 @@ main() 0 | o-----------o v0----e3----v3 | / \ ,-----. / / \ | / | / . \ \ t1/ / / \ t1 / - 1 | e0 / / \ e1\ / / e4 e0. ,e1� `e4 + 1 | e0 / / \ e1\ / / e4 e0. ,e1' `e4 | / /t0 \ \ ' / / t0 \ / | / `-----' \ / / | \ / 2 | o-----------o v1----e2----v2 -- 1.7.10.4

1 0

olena: olena-2.0-882-gb8febd1 Convert Olena to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* AUTHORS, * README: Here. * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. * doc/Makefile.am (contributors.html): Treat rst2html input and output as UTF-8. --- AUTHORS | 28 ++++++++++++++-------------- ChangeLog | 11 +++++++++++ README | 36 ++++++++++++++++++------------------ doc/Doxyfile.in | 2 +- doc/Makefile.am | 2 +- 5 files changed, 45 insertions(+), 34 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8cf3605..47cd51c 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. @@ -50,12 +50,12 @@ Ph.D. students. 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> - Project management (Olena 0.x). - Color conversions. @@ -111,12 +111,12 @@ Students from Class 2015. Students from Class 2014. ========================= -* **Rapha�l Boissel** <raphael.boissel(a)lrde.epita.fr> +* **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> +* **Sébastien Crozet** <sebastien.crozet(a)lrde.epita.fr> - Work on the tree of shapes. @@ -139,7 +139,7 @@ Students from Class 2013. Students from Class 2012. ========================= -* **Fr�d�ric Bour** <frederic.bour(a)lrde.epita.fr> +* **Frédéric Bour** <frederic.bour(a)lrde.epita.fr> - Prototype of the upcoming functions system. @@ -314,25 +314,25 @@ Students from Class 2003. - Color system. -* **Jean-S�bastien Mouret** +* **Jean-Sébastien Mouret** - Image I/Os. - Source tree and configuration system. - Fast morphological operators. -* **Qu�c Peyrot** +* **Quôc Peyrot** - Watershed algorithm. -* **Rapha�l Poss** +* **Raphaël Poss** - Source tree and configuration system. - Documentation. -* **Yann R�gis-Gianas** +* **Yann Régis-Gianas** - Type system. @@ -354,7 +354,7 @@ Students from Class 2002. - Wavelets. -* **R�mi Coupet** +* **Rémi Coupet** - Olena morpho. - Data types (Olena pre-0.6). @@ -385,7 +385,7 @@ Students from Class 2001. * **Vincent Berruchon** -* **Renaud Fran�ois** +* **Renaud François** - Bibliographical research. @@ -397,7 +397,7 @@ Students from Class 2001. - FFT algorithm. -* **Micha�l Strauss** +* **Michaël Strauss** - Image morphology. - Watershed algorithms. @@ -416,7 +416,7 @@ Students from Class 2000. Other Contributors. =================== -* **Arthur Cr�pin-Leblond** +* **Arthur Crépin-Leblond** - SCRIBO module structured outputs (XML, HTML, PDF). diff --git a/ChangeLog b/ChangeLog index a185598..65c134a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert Olena to UTF-8. + + * AUTHORS, + * README: + Here. + * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. + * doc/Makefile.am (contributors.html): Treat rst2html input and + output as UTF-8. + 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> Remove mentions to trash/ directories in Olena. diff --git a/README b/README index c675473..b5abc9e 100644 --- a/README +++ b/README @@ -515,9 +515,9 @@ mail address follows. * Olena - LRDE - | Laboratoire de Recherche et D�veloppement de l'EPITA (LRDE) + | Laboratoire de Recherche et Développement de l'EPITA (LRDE) | 14-16 rue Voltaire - | FR-94276 Le Kremlin-Bic�tre CEDEX + | FR-94276 Le Kremlin-Bicêtre CEDEX | France @@ -530,15 +530,15 @@ the following papers. About Image Processing Programming: * `Writing Reusable Digital Topology Algorithms in a Generic Image - Processing Framework`. Roland Levillain, Thierry G�raud, Laurent - Najman. In Ullrich K�the, Annick Montanvert, Pierre Soille + Processing Framework`. Roland Levillain, Thierry Géraud, Laurent + Najman. In Ullrich Köthe, Annick Montanvert, Pierre Soille (editors), WADGMM 2010 -- Proceedings of the Workshop on Applications of Digital Geometry and Mathematical Morphology), pages 140-153, Lecture Notes in Computer Science, volume 7346, Springer-Verlag Berlin Heidelberg, 2012. - * `Une approche g�n�rique du logiciel pour le traitement d'images - pr�servant les performances`. Roland Levillain, Thierry G�raud, + * `Une approche générique du logiciel pour le traitement d'images + préservant les performances`. Roland Levillain, Thierry Géraud, Laurent Najman. In the proceedings of the 23rd Symposium on Signal and Image Processing (GRETSI) http://www.gretsi2011.org/ @@ -546,37 +546,37 @@ About Image Processing Programming: * `Why and How to Design a Generic and Efficient Image Processing Framework: The Case of the Milena Library`. Roland Levillain, - Thierry G�raud, Laurent Najman. In the proceedings of the 2010 + Thierry Géraud, Laurent Najman. In the proceedings of the 2010 International Conference on Image Processing (ICIP) http://www.icip2010.org/ Hong Kong, September 26 - 29, 2010. * `Milena: Write Generic Morphological Algorithms Once, Run on Many - Kinds of Images`. Roland Levillain, Thierry G�raud, Laurent + Kinds of Images`. Roland Levillain, Thierry Géraud, Laurent Najman. In the proceedings of the 9th International Symposium on Mathematical Morphology (ISMM) http://www.cs.rug.nl/~ISMM09/ Groningen, The Netherlands, August 24 - 27, 2009. * `Generic Algorithmic Blocks Dedicated to Image Processing`, - J�r�me Darbon, Thierry G�raud, Patrick Bellot. In the proceedings + Jérôme Darbon, Thierry Géraud, Patrick Bellot. In the proceedings of ECOOP PHD Oslo, Norway, June 2004. - * `Generic Implementation of Morphological Image Operators`, J�r�me - Darbon, Thierry G�raud, and Alexandre Duret-Lutz. In the + * `Generic Implementation of Morphological Image Operators`, Jérôme + Darbon, Thierry Géraud, and Alexandre Duret-Lutz. In the proceedings of the International Symposium On Mathematical Morphology VI (ISMM 2002), April 3-5, 2002, Sydney, Australia. * `Applying Generic Programming to Image Processing`, Thierry - G�raud, Yoann Fabre, and Alexandre Duret-Lutz. In the + Géraud, Yoann Fabre, and Alexandre Duret-Lutz. In the proceedings of the IASTED International Conference on Applied Informatics (AI'2001) - Symposium Advances in Computer Applications, ACTA Press, pages 577-581, Innsbruck, Austria, February 2001. * `Obtaining Genericity for Image Processing and Pattern - Recognition Algorithms`. Thierry G�raud, Yoann Fabre, Alexandre - Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-Fran�ois + Recognition Algorithms`. Thierry Géraud, Yoann Fabre, Alexandre + Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-François Mangin. In the proceedings of the 15th International Conference on Pattern Recognition (ICPR'2000), IEEE Computer Society, vol. 4, pages 816-819, Barcelona, Spain, September 2000. @@ -585,10 +585,10 @@ About Generic Programming Paradigm: * `Towards a Software Architecture for Generic Image Processing`. Roland Levillain. Ph.D. thesis, Universit\'e Paris-Est, - Marne-la-Vall�e, France, 2011. + Marne-la-Vallée, France, 2011. * `Semantics-Driven Genericity: A Sequel to the Static C++ - Object-Oriented Programming Paradigm (SCOOP 2)`. Thierry G�raud, + Object-Oriented Programming Paradigm (SCOOP 2)`. Thierry Géraud, Roland Levillain. In the proceedings of the 6th International Workshop on Multiparadigm Programming with Object-Oriented Languages @@ -596,12 +596,12 @@ About Generic Programming Paradigm: Paphos, Cyprus July 7, 2008. * `Static C++ Object-Oriented Programming (SCOOP)`, Nicolas Burrus, - Alexandre Duret-Lutz, Thierry G�raud, David Lesage, and Rapha�l + Alexandre Duret-Lutz, Thierry Géraud, David Lesage, and Raphaël Poss. In the proceedings of the Workshop on Multiple Paradigm with OO Languages (MPOOL'03), Anaheim, CA, October 2003. * `Generic Design Patterns in C++`. Alexandre Duret-Lutz, Thierry - G�raud, and Akim Demaille. In the proceedings of the 6th USENIX + Géraud, and Akim Demaille. In the proceedings of the 6th USENIX Conference on Object-Oriented Technologies and Systems (COOTS'2001), pages 189-202, San Antonio, Texas, USA, January-February 2001. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 526a24e..c77557d 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -111,7 +111,7 @@ IMAGE_PATH = @top_srcdir@/doc/images INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO -INPUT_ENCODING = ISO-8859-1 +INPUT_ENCODING = UTF-8 CITE_BIB_FILES = @abs_top_srcdir@/doc/doc.bib \ @abs_top_srcdir@/doc/olena.bib #--------------------------------------------------------------------------- diff --git a/doc/Makefile.am b/doc/Makefile.am index 7775b5c..f30ad39 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -152,7 +152,7 @@ contributors.html: $(top_srcdir)/AUTHORS @test -n "$(RST2HTML)" \ || { echo "error: rst2html not found during configure" >&2; \ exit 1; } - $(RST2HTML) --input-encoding=latin1 --output-encoding=latin1 \ + $(RST2HTML) --input-encoding=UTF-8 --output-encoding=UTF-8 \ --stylesheet-path=$(srcdir)/doxygen.css --link-stylesheet \ $< >$@ -- 1.7.10.4

1 0

olena: olena-2.0-881-g600b8e3 Convert ChangeLogs to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

--- ChangeLog | 2 +- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ milena/ChangeLog | 14 +++++++------- scribo/ChangeLog | 2 +- swilena/ChangeLog | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 352e0f0..a185598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4281,5 +4281,5 @@ Local Variables: ispell-local-dictionary: "american" -coding: iso-latin-1 +coding: utf-8 End: diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 4c5bdb4..e199524 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1431,3 +1431,9 @@ * vcs: New. * vcs/dynamic_static_bridge_vcs.rb: New. + + +Local Variables: +ispell-local-dictionary: "american" +coding: utf-8 +End: diff --git a/milena/ChangeLog b/milena/ChangeLog index 30be5dd..f760e50 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -11653,7 +11653,7 @@ Update the list of non distributed headers. * nodist-headers: Here. - From Thierry G�raud <thierry.geraud(a)lrde.epita.fr>. + From Thierry Géraud <thierry.geraud(a)lrde.epita.fr>. 2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> @@ -17400,7 +17400,7 @@ Typo in the documentation of mln::topo::complex. * mln/topo/complex.hh: Here. - Reported by Thierry G�raud <thierry.geraud(a)lrde.epita.fr>. + Reported by Thierry Géraud <thierry.geraud(a)lrde.epita.fr>. 2009-06-08 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -43750,7 +43750,7 @@ * mln/trait/image/status.txt: Fix missing image type. -2008-08-20 Thierry G�raud <thierry.geraud(a)lrde.epita.fr> +2008-08-20 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> Huge summer cleanup. @@ -44393,7 +44393,7 @@ Add a selector. * img/tiny.pbm: New. -2008-06-27 Thierry G�raud <thierry.geraud(a)lrde.epita.fr> +2008-06-27 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> Add morpho elementary gradient and test. @@ -44434,7 +44434,7 @@ image types can be delayed. (mln_decl_unary_expr_): Likewise. -2008-06-24 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> +2008-06-24 Thierry GÃ©raud <thierry.geraud(a)lrde.epita.fr> Add some technical documentation to iterator base classes. @@ -45947,7 +45947,7 @@ * tests/core/point_set_compatibility.cc: Exercise p_set< graph_psite<point2d> >. -2008-06-26 Thierry G�raud <thierry.geraud(a)lrde.epita.fr> +2008-06-26 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> (mln::trait::bkd_qixter< const image3d<T>, W >) (mln::trait::fwd_nixter< image3d<T>, W >) (mln::trait::fwd_nixter< const image3d<T>, W >) @@ -61314,5 +61314,5 @@ Local Variables: ispell-local-dictionary: "american" -coding: iso-latin-1 +coding: utf-8 End: diff --git a/scribo/ChangeLog b/scribo/ChangeLog index fd227a3..3a157ef 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -9787,5 +9787,5 @@ Local Variables: ispell-local-dictionary: "american" -coding: iso-latin-1 +coding: utf-8 End: diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fc6f0b1..3955b57 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -958,5 +958,5 @@ Local Variables: ispell-local-dictionary: "american" -coding: iso-latin-1 +coding: utf-8 End: -- 1.7.10.4

1 0

olena: branch next-to-apply deleted: olena-2.0-28-g8314616
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

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-to-apply has been deleted was 8314616cf1da67fe6f7d2e7a31cf4d09e6feafda ----------------------------------------------------------------------- 8314616cf1da67fe6f7d2e7a31cf4d09e6feafda mln/version.hh.in: Fix variable substitution. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0