April 2013 - Olena-patches

olena-2.0-477-gd118d1b mln/linear/.#ch_convolve.hh: Remove.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

--- milena/ChangeLog | 4 ++++ milena/mln/linear/.#ch_convolve.hh | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) delete mode 120000 milena/mln/linear/.#ch_convolve.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fea31b9..3d95ee0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/linear/.#ch_convolve.hh: Remove. + +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Use relative paths in documentation. * doc/Doxyfile.in, diff --git a/milena/mln/linear/.#ch_convolve.hh b/milena/mln/linear/.#ch_convolve.hh deleted file mode 120000 index 488c325..0000000 --- a/milena/mln/linear/.#ch_convolve.hh +++ /dev/null @@ -1 +0,0 @@ -lazzara@fidji.lrde.epita.fr.26906:1321455887 \ No newline at end of file -- 1.7.2.5

2 1

branch unstable/scribo updated: olena-2.0-478-ga6a7616
by git＠lrde.epita.fr 12 Apr '13

12 Apr '13

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 a6a7616f0ac2af8f18383c5defceb00dd84f10b5 (commit) from d118d1bda852b2d111f597441a175d669776167c (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 ----------------------------------------------------------------- a6a7616 doc/Doxyfile.in: Disable QCH file generation. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-478-g720b4ac doc/Doxyfile.in: Disable QCH file generation.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fea31b9..4d05285 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Disable QCH file generation. + +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Use relative paths in documentation. * doc/Doxyfile.in, diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 9d1101b..d8c4324 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -1119,7 +1119,7 @@ TOC_EXPAND = YES # that can be used as input for Qt's qhelpgenerator to generate a # Qt Compressed Help (.qch) of the generated HTML documentation. -GENERATE_QHP = yes +GENERATE_QHP = NO # If the QHG_LOCATION tag is specified, the QCH_FILE tag can # be used to specify the file name of the resulting .qch file. -- 1.7.2.5

1 0

olena-2.0-478-ga6a7616 doc/Doxyfile.in: Disable QCH file generation.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3d95ee0..60936b2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Doxyfile.in: Disable QCH file generation. + +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/linear/.#ch_convolve.hh: Remove. 2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 9d1101b..d8c4324 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -1119,7 +1119,7 @@ TOC_EXPAND = YES # that can be used as input for Qt's qhelpgenerator to generate a # Qt Compressed Help (.qch) of the generated HTML documentation. -GENERATE_QHP = yes +GENERATE_QHP = NO # If the QHG_LOCATION tag is specified, the QCH_FILE tag can # be used to specify the file name of the resulting .qch file. -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-477-gd118d1b
by git＠lrde.epita.fr 12 Apr '13

12 Apr '13

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 d118d1bda852b2d111f597441a175d669776167c (commit) via fec02485ded083e6fa7220192b53aaf82c587da9 (commit) via 87a4a347258b9acf3cb1c662e5327a15250c642c (commit) via ac8d6ba7597e20b07f1b7401cdcf5e926c22dca1 (commit) from 6750f67b683f4d2a3d77f2413f8282466806807b (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 ----------------------------------------------------------------- d118d1b mln/linear/.#ch_convolve.hh: Remove. fec0248 Use relative paths in documentation. 87a4a34 Use relative paths in documentation. ac8d6ba Use relative paths in documentation. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++++++++ doc/Doxyfile.in | 6 +++--- doc/Makefile.am | 15 +++++++++++---- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- milena/ChangeLog | 11 +++++++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 11 ++++++++--- milena/mln/linear/.#ch_convolve.hh | 1 - scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 17 ++++++++++++----- 12 files changed, 66 insertions(+), 21 deletions(-) delete mode 120000 milena/mln/linear/.#ch_convolve.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-476-gfec0248 Use relative paths in documentation.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

* doc/Doxyfile.in, * doc/Makefile.am, * doc/header.html, * doc/mainpage.dox: Here. --- ChangeLog | 9 +++++++++ doc/Doxyfile.in | 6 +++--- doc/Makefile.am | 15 +++++++++++---- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff27a41..4316d83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use relative paths in documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am, + * doc/header.html, + * doc/mainpage.dox: Here. + 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix permissions on documentation files. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 2e7c939..6cb8bfb 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "Olena" -PROJECT_NUMBER = "@PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" PROJECT_BRIEF = "An Image Processing Platform" PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp @@ -320,8 +320,8 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../scribo/doc/scribo.tag=../../scribo/doc/user-refman/html \ - @builddir@/../milena/doc/milena.tag=../../milena/doc/user-refman/html +TAGFILES = @builddir@/../scribo/doc/scribo.tag=../../../scribo/doc/user-refman/html \ + @builddir@/../milena/doc/milena.tag=../../../milena/doc/user-refman/html GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES diff --git a/doc/Makefile.am b/doc/Makefile.am index bcc06af..cc41520 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,7 +121,7 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(abs_top_srcdir)/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../,g" \ -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. @@ -212,9 +212,9 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ - -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ - -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. @@ -227,3 +227,10 @@ uninstall-local: # reference manual. chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) + + +doc-teamcity: + sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc/,g" \ + -e "s,../../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc/,g" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` diff --git a/doc/header.html b/doc/header.html index 7e9e03a..5373947 100644 --- a/doc/header.html +++ b/doc/header.html @@ -25,7 +25,7 @@ $extrastylesheet <tbody> <tr style="height: 56px;">  - <td id="projectlogo"><a href="@relcommondocpath@doc/@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td> + <td id="projectlogo"><a href="$relpath$@relcommondocpath@@userrefman@/html/index.html"><img alt="Logo" src="$relpath$$projectlogo"/></a></td>   <td style="padding-left: 0.5em;"> diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 65e5177..52f9c1e 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -19,8 +19,8 @@ </td> <td> \li \ref moduleslist - \li <a class="el" href="@relcommondocpath@milena/doc/user-refman/html/index.html">Milena</a> - \li <a class="el" href="@relcommondocpath@scribo/doc/user-refman/html/index.html">Scribo</a> + \li <a class="el" href="@relcommondocpath@../milena/doc/user-refman/html/index.html">Milena</a> + \li <a class="el" href="@relcommondocpath@../scribo/doc/user-refman/html/index.html">Scribo</a> \li Swilena </td> <td> -- 1.7.2.5

1 0

olena-2.0-475-g87a4a34 Use relative paths in documentation.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- milena/ChangeLog | 7 +++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/Makefile.am | 11 ++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f39b9d7..fea31b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use relative paths in documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2013-04-11 Guillaume Lazzara <z(a)lrde.epita.fr> Reference value types documentation in Values group. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5727c5d..9d1101b 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = "Milena" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "@PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index c79945b..b25f240 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -254,7 +254,7 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. @@ -762,14 +762,14 @@ DATA_html_dirs_inst = $(WHITE_PAPER) # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) + $(mkdir_p) $(DESTDIR)$(htmldir)/milena/ # The user reference manual is located in a subdirectory, hence this # special case. rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - sed -i -e "s,\$(top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ @@ -792,3 +792,8 @@ uninstall-local: chmod -R 700 $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/milena + + +doc-teamcity: + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(top_srcdir)/milena/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5

1 0

olena-2.0-474-gac8d6ba Use relative paths in documentation.
by Guillaume Lazzara 12 Apr '13

12 Apr '13

* doc/Doxyfile.in, * doc/Makefile.am: Here. --- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 17 ++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3e1afbe..d6dc2aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use relative paths in documentation. + + * doc/Doxyfile.in, + * doc/Makefile.am: Here. + 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Fix permissions on documentation files. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index b28bd55..28371aa 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -334,7 +334,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = @builddir@/../../milena/doc/milena.tag=@top_srcdir@/milena/doc/user-refman/html +TAGFILES = @builddir@/../../milena/doc/milena.tag=../../../../milena/doc/user-refman/html GENERATE_TAGFILE = scribo.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = NO diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index ca773e6..d1a5f44 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,7 +99,7 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ -e "s,\@userrefman\@,$(USER_REFMAN),g" \ `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. @@ -182,7 +182,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ + sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ + -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -229,7 +230,7 @@ maintainer-clean-local: # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) + $(mkdir_p) $(DESTDIR)$(htmldir)/scribo/ # The user reference manual is located in a subdirectory, hence this # special case. rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN)/html @@ -237,8 +238,8 @@ install-data-local: $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) - sed -i -e "s,$(top_srcdir)/doc/$(USER_REFMAN)/html/,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/,g" \ - -e "s,$(top_srcdir)/milena/doc,$(DESTDIR)$(htmldir)/milena/$(USER_REFMAN),g" \ + sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ @@ -261,3 +262,9 @@ uninstall-local: chmod -Rf 700 $(DESTDIR)$(htmldir)/scribo/ rm -rf $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) rm -rf $(DESTDIR)$(htmldir)/scribo + + +doc-teamcity: + sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc/,g" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc/,g" \ + `find $(top_srcdir)/scribo/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5

1 0

olena-2.0-148-g81e04f2 Stop warning about Python 2.6+ likely incompatible with Swilena.
by Roland Levillain 11 Apr '13

11 Apr '13

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f261827..3f5062d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-04-11 Roland Levillain <roland(a)lrde.epita.fr> + + Stop warning about Python 2.6+ likely incompatible with Swilena. + + * configure.ac: Here. + 2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> Stop configuring swilena/python/sps and swilena/python/sps-local. diff --git a/configure.ac b/configure.ac index c40781a..a4b0a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -296,8 +296,6 @@ disabled. Try to invoke configure with `--enable-shared'.]) # Check for Python. AM_PATH_PYTHON([2.4], [], [AC_MSG_ERROR([Python 2.4 is required for Swilena.])]) - AS_VERSION_COMPARE([2.5], [$am_cv_python_version], - [AC_MSG_WARN([Python 2.6 and greater may not work with Swilena.])]) adl_CHECK_PYTHON # Check for Python headers. save_CPPFLAGS=$CPPFLAGS -- 1.7.2.5

1 0

olena-2.0-144-gdde0e23 Make fld tests write in different files.
by Guillaume Lazzara 11 Apr '13

11 Apr '13

* tests/io/fld/fld1d.cc, * tests/io/fld/fld2d.cc, * tests/io/fld/fld3d.cc: Write in different files to allow those tests to be run simultaneously. (cherry picked from commit 357035117860ee79ae50a628f4e91e496905e6fc) Conflicts: milena/ChangeLog --- milena/ChangeLog | 9 +++++++++ milena/tests/io/fld/fld1d.cc | 9 +++++---- milena/tests/io/fld/fld2d.cc | 21 +++++++++++---------- milena/tests/io/fld/fld3d.cc | 9 +++++---- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e01e17b..a180c49 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make fld tests write in different files. + + * tests/io/fld/fld1d.cc, + * tests/io/fld/fld2d.cc, + * tests/io/fld/fld3d.cc: Write in different files to allow those + tests to be run simultaneously. + 2010-04-08 Roland Levillain <roland(a)lrde.epita.fr> Help Swilena wrap mln::complex<D>. diff --git a/milena/tests/io/fld/fld1d.cc b/milena/tests/io/fld/fld1d.cc index 00dbf29..9792bd6 100644 --- a/milena/tests/io/fld/fld1d.cc +++ b/milena/tests/io/fld/fld1d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,11 +48,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out1d.fld"); + io::fld::load(test, "out1d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out1d.fld"); mln_assertion(ori == test); } diff --git a/milena/tests/io/fld/fld2d.cc b/milena/tests/io/fld/fld2d.cc index 0ab7aa7..33943dd 100644 --- a/milena/tests/io/fld/fld2d.cc +++ b/milena/tests/io/fld/fld2d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,11 +55,11 @@ int main() image2d<int_u8> ori, test; io::pgm::load(ori, MLN_IMG_DIR "/lena.pgm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -69,11 +70,11 @@ int main() image2d<int_u16> ori, test; io::ppm::load(ori, MLN_IMG_DIR "/lena_16.ppm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -92,11 +93,11 @@ int main() ori(p) = random() / RAND_MAX; } - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); { mln_piter_(image2d<float>) p(domain); diff --git a/milena/tests/io/fld/fld3d.cc b/milena/tests/io/fld/fld3d.cc index 2813607..525241d 100644 --- a/milena/tests/io/fld/fld3d.cc +++ b/milena/tests/io/fld/fld3d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,11 +50,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out3d.fld"); + io::fld::load(test, "out3d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out3d.fld"); mln_assertion(ori == test); } -- 1.7.2.5

1 0