* 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@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@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