June 2009 - Olena-patches

Re: [Olena-patches] [Olena] #102: Create a new logo for the Olena project
by Olena Trac 10 Jun '09

10 Jun '09

#102: Create a new logo for the Olena project --------------------------+------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: closed Priority: trivial | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: fixed | Keywords: graphics logo --------------------------+------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Here is the new logo: http://www.lrde.epita.fr/dload/olena/logos/olena.jpg! Thanks to Alexis Angelidis! -- Ticket URL: <https://trac.lrde.org/olena/ticket/102#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #128: Handle carefully tests using X11
by Olena 10 Jun '09

10 Jun '09

#128: Handle carefully tests using X11 ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: test | ----------------------+----------------------------------------------------- Some tests require X11 visualization programs such as `display` (from !ImageMagick) or `xv`. This is an issue since * the they might not be installed on the machine; * the host/session on which tests are executed might not run a X11 display. IMHO, we could either 1. move them out of the `check` target (and have them launched by the `check-all`/`check-full` target, or a check-x11 target); or 2. have `configure` check whether the required programs are present, as well as a (usable) X11 session. (Maybe the Vaucanson Team ran into such questions; ask them.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/128> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 2

Re: [Olena-patches] [Olena] #133: Use consistent naming convention (w.r.t. underscores, abbreviations, etc.)
by Olena Trac 10 Jun '09

10 Jun '09

#133: Use consistent naming convention (w.r.t. underscores, abbreviations, etc.) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Resolution: | Keywords: name coding style -----------------------+---------------------------------------------------- Changes (by levill_r): * milestone: Olena 1.0 => Olena 1.1 -- Ticket URL: <https://trac.lrde.org/olena/ticket/133#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #22: Update/add copyright headers (Olena 2.0)
by Olena Trac 10 Jun '09

10 Jun '09

#22: Update/add copyright headers (Olena 2.0) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: trivial | Milestone: Olena NG Component: other | Version: 2.0 Resolution: wontfix | Keywords: copyright header dates FSF address -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: This is for Olena-NG. As we do not plan to distribute it (yet), close this ticket. -- Ticket URL: <https://trac.lrde.org/olena/ticket/22#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #100: Check the license of Olena 1.0 before its release
by Olena Trac 10 Jun '09

10 Jun '09

#100: Check the license of Olena 1.0 before its release -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: closed Priority: blocker | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: fixed | Keywords: lint license gnu -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed -- Ticket URL: <https://trac.lrde.org/olena/ticket/100#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[PATCH 2/2] Update copyright headers in Swilena/Python.
by Roland Levillain 10 Jun '09

10 Jun '09

* python/box2d-misc.py, * python/data.py, * python/dynamic-image2d-misc.py, * python/image2d-misc.py, * python/morpho-fun.py, * python/morpho-segm.py, * python/sps-common.in, * python/sps.py, * python/swilena.py: Here. --- swilena/ChangeLog | 15 +++++++++++++++ swilena/python/box2d-misc.py | 15 +++++++-------- swilena/python/data.py | 15 +++++++-------- swilena/python/dynamic-image2d-misc.py | 15 +++++++-------- swilena/python/image2d-misc.py | 15 +++++++-------- swilena/python/morpho-fun.py | 15 +++++++-------- swilena/python/morpho-segm.py | 15 +++++++-------- swilena/python/sps-common.in | 15 +++++++-------- swilena/python/sps.py | 15 +++++++-------- swilena/python/swilena.py | 15 +++++++-------- 10 files changed, 78 insertions(+), 72 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 7575d9a..4359233 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,20 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Update copyright headers in Swilena/Python. + + * python/box2d-misc.py, + * python/data.py, + * python/dynamic-image2d-misc.py, + * python/image2d-misc.py, + * python/morpho-fun.py, + * python/morpho-segm.py, + * python/sps-common.in, + * python/sps.py, + * python/swilena.py: + Here. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Update copyright headers in Swilena. * box.ixx, diff --git a/swilena/python/box2d-misc.py b/swilena/python/box2d-misc.py index afc9f6a..b6c6944 100644 --- a/swilena/python/box2d-misc.py +++ b/swilena/python/box2d-misc.py @@ -2,20 +2,19 @@ # Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. from swilena import * diff --git a/swilena/python/data.py b/swilena/python/data.py index 989bf34..4a162d9 100644 --- a/swilena/python/data.py +++ b/swilena/python/data.py @@ -2,20 +2,19 @@ # Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # \file python/data.py # \brief Access to the data of the distribution (images, meshes, etc.). diff --git a/swilena/python/dynamic-image2d-misc.py b/swilena/python/dynamic-image2d-misc.py index cc023dc..0e32e34 100644 --- a/swilena/python/dynamic-image2d-misc.py +++ b/swilena/python/dynamic-image2d-misc.py @@ -2,20 +2,19 @@ # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # \file python/dynamic-image2d-misc.py # \brief Test on C++ ``dynamic'' image2d extended in Python. diff --git a/swilena/python/image2d-misc.py b/swilena/python/image2d-misc.py index 737b39b..43b7bff 100644 --- a/swilena/python/image2d-misc.py +++ b/swilena/python/image2d-misc.py @@ -2,20 +2,19 @@ # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. from swilena import * diff --git a/swilena/python/morpho-fun.py b/swilena/python/morpho-fun.py index 68ba9b6..fd55202 100644 --- a/swilena/python/morpho-fun.py +++ b/swilena/python/morpho-fun.py @@ -2,20 +2,19 @@ # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # \file python/morpho-fun.py # \brief Test on mathematical morphology on functions (scalar images). diff --git a/swilena/python/morpho-segm.py b/swilena/python/morpho-segm.py index 1641b7b..021f91a 100644 --- a/swilena/python/morpho-segm.py +++ b/swilena/python/morpho-segm.py @@ -2,20 +2,19 @@ # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # \file python/morpho-segm.py # \brief Test on watershed transform-based segmentation. diff --git a/swilena/python/sps-common.in b/swilena/python/sps-common.in index 46c3e62..c547ea2 100644 --- a/swilena/python/sps-common.in +++ b/swilena/python/sps-common.in @@ -2,20 +2,19 @@ # Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # The Swilena Python Shell. diff --git a/swilena/python/sps.py b/swilena/python/sps.py index 9882338..9257e7e 100644 --- a/swilena/python/sps.py +++ b/swilena/python/sps.py @@ -2,20 +2,19 @@ # Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. from swilena import * diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index ce093b5..8cb695a 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -2,20 +2,19 @@ # Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) # -# This file is part of the Olena Library. This library is free -# software; you can redistribute it and/or modify it under the terms -# of the GNU General Public License version 2 as published by the -# Free Software Foundation. +# This file is part of Olena. # -# This library is distributed in the hope that it will be useful, +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this library; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Fifth Floor, -# Boston, MA 02111-1307, USA. +# along with Olena. If not, see <http://www.gnu.org/licenses/>. # \file swilena.py # \brief The whole Swilena suite. -- 1.6.2.4

1 0

[PATCH 1/2] Update copyright headers in Swilena.
by Roland Levillain 10 Jun '09

10 Jun '09

* box.ixx, * box2d.i, * box2d_piter.i, * box_piter.ixx, * ch_value.ixx, * concat.ixx, * concrete.ixx, * config.i, * coord.ixx, * dpoint2d.i, * dynamic_image2d.i, * fill.ixx, * image2d.ixx, * image2d_int.i, * image2d_int_u8.i, * int_u.ixx, * int_u32.i, * int_u8.i, * intp.ixx, * morpho.ixx, * neighb2d.i, * pgm.ixx, * point2d.i, * println.ixx, * python-utils.ixx, * window2d.i: Here. --- swilena/ChangeLog | 32 ++++++++++++++++++++++++++++++++ swilena/box.ixx | 24 ++++++++++++++++-------- swilena/box2d.i | 24 ++++++++++++++++-------- swilena/box2d_piter.i | 24 ++++++++++++++++-------- swilena/box_piter.ixx | 24 ++++++++++++++++-------- swilena/ch_value.ixx | 24 ++++++++++++++++-------- swilena/concat.ixx | 24 ++++++++++++++++-------- swilena/concrete.ixx | 24 ++++++++++++++++-------- swilena/config.i | 24 ++++++++++++++++-------- swilena/coord.ixx | 24 ++++++++++++++++-------- swilena/dpoint2d.i | 24 ++++++++++++++++-------- swilena/dynamic_image2d.i | 24 ++++++++++++++++-------- swilena/fill.ixx | 24 ++++++++++++++++-------- swilena/image2d.ixx | 24 ++++++++++++++++-------- swilena/image2d_int.i | 24 ++++++++++++++++-------- swilena/image2d_int_u8.i | 24 ++++++++++++++++-------- swilena/int_u.ixx | 24 ++++++++++++++++-------- swilena/int_u32.i | 24 ++++++++++++++++-------- swilena/int_u8.i | 24 ++++++++++++++++-------- swilena/intp.ixx | 24 ++++++++++++++++-------- swilena/morpho.ixx | 24 ++++++++++++++++-------- swilena/neighb2d.i | 24 ++++++++++++++++-------- swilena/pgm.ixx | 24 ++++++++++++++++-------- swilena/point2d.i | 24 ++++++++++++++++-------- swilena/println.ixx | 24 ++++++++++++++++-------- swilena/python-utils.ixx | 24 ++++++++++++++++-------- swilena/window2d.i | 24 ++++++++++++++++-------- 27 files changed, 448 insertions(+), 208 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 0eb35a4..7575d9a 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,35 @@ +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + + Update copyright headers in Swilena. + + * box.ixx, + * box2d.i, + * box2d_piter.i, + * box_piter.ixx, + * ch_value.ixx, + * concat.ixx, + * concrete.ixx, + * config.i, + * coord.ixx, + * dpoint2d.i, + * dynamic_image2d.i, + * fill.ixx, + * image2d.ixx, + * image2d_int.i, + * image2d_int_u8.i, + * int_u.ixx, + * int_u32.i, + * int_u8.i, + * intp.ixx, + * morpho.ixx, + * neighb2d.i, + * pgm.ixx, + * point2d.i, + * println.ixx, + * python-utils.ixx, + * window2d.i: + Here. + 2009-06-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Add missing license headers in Swilena. diff --git a/swilena/box.ixx b/swilena/box.ixx index a3af8a1..88cdec7 100644 --- a/swilena/box.ixx +++ b/swilena/box.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file box.ixx /// \brief A wrapper of mln::box<P>. diff --git a/swilena/box2d.i b/swilena/box2d.i index 93b2b51..fcfd766 100644 --- a/swilena/box2d.i +++ b/swilena/box2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file box2d.i /// \brief A wrapper of mln::box2d. diff --git a/swilena/box2d_piter.i b/swilena/box2d_piter.i index 9286342..1e3de42 100644 --- a/swilena/box2d_piter.i +++ b/swilena/box2d_piter.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file box2d_piter.i /// \brief A wrapper of mln::box_fwd_piter_< mln::point2d >. diff --git a/swilena/box_piter.ixx b/swilena/box_piter.ixx index ce81465..032ef7d 100644 --- a/swilena/box_piter.ixx +++ b/swilena/box_piter.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file box_piter.ixx /// \brief A wrapper of mln::box_fwd_piter_<P>. diff --git a/swilena/ch_value.ixx b/swilena/ch_value.ixx index 59ac846..2849433 100644 --- a/swilena/ch_value.ixx +++ b/swilena/ch_value.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file ch_value.i /// \brief A wrapper of mln::trait::ch_value. diff --git a/swilena/concat.ixx b/swilena/concat.ixx index 93e0bdb..220a609 100644 --- a/swilena/concat.ixx +++ b/swilena/concat.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file concat.ixx /// \brief Macros concatenating their arguments. diff --git a/swilena/concrete.ixx b/swilena/concrete.ixx index c4fc03a..b6d44e2 100644 --- a/swilena/concrete.ixx +++ b/swilena/concrete.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file concrete.i /// \brief A wrapper of mln::trait::concrete. diff --git a/swilena/config.i b/swilena/config.i index a3bf3fe..5fad817 100644 --- a/swilena/config.i +++ b/swilena/config.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file config.i /// \brief Swilena configuration. diff --git a/swilena/coord.ixx b/swilena/coord.ixx index 2f2d2df..d169b5f 100644 --- a/swilena/coord.ixx +++ b/swilena/coord.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file coord.ixx /// \brief A variadic alternative to the macro mln_coord. diff --git a/swilena/dpoint2d.i b/swilena/dpoint2d.i index 4465bf8..938e03b 100644 --- a/swilena/dpoint2d.i +++ b/swilena/dpoint2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file dpoint2d.i /// \brief A wrapper of mln::dpoint2d. diff --git a/swilena/dynamic_image2d.i b/swilena/dynamic_image2d.i index 001aac3..532f1e0 100644 --- a/swilena/dynamic_image2d.i +++ b/swilena/dynamic_image2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file dynamic_image2d /// \brief A dynamic version of image2d, extendable in the target language. diff --git a/swilena/fill.ixx b/swilena/fill.ixx index 42c8326..c581e2f 100644 --- a/swilena/fill.ixx +++ b/swilena/fill.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file fill.ixx /// \brief A wrapper of mln::data::fill. diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx index f80474d..90532bc 100644 --- a/swilena/image2d.ixx +++ b/swilena/image2d.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file image2d.i /// \brief A wrapper of mln::image2d<T>. diff --git a/swilena/image2d_int.i b/swilena/image2d_int.i index b86c2b5..ac82fe6 100644 --- a/swilena/image2d_int.i +++ b/swilena/image2d_int.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file image2d.i /// \brief A simple wrapping of mln::image2d<int> along with some diff --git a/swilena/image2d_int_u8.i b/swilena/image2d_int_u8.i index e60587c..109f8bc 100644 --- a/swilena/image2d_int_u8.i +++ b/swilena/image2d_int_u8.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file image2d.i /// \brief A simple wrapping of mln::image2d<mln::value::int_u8> along diff --git a/swilena/int_u.ixx b/swilena/int_u.ixx index e69ad2c..b558467 100644 --- a/swilena/int_u.ixx +++ b/swilena/int_u.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file int_u.i /// \brief A wrapper of mln::value::int_u. diff --git a/swilena/int_u32.i b/swilena/int_u32.i index 9fe308a..b11662b 100644 --- a/swilena/int_u32.i +++ b/swilena/int_u32.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file int_u32.i /// \brief A wrapper of mln::value::int_u32. diff --git a/swilena/int_u8.i b/swilena/int_u8.i index a02ff3f..2646bdf 100644 --- a/swilena/int_u8.i +++ b/swilena/int_u8.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file int_u8.i /// \brief A wrapper of mln::value::int_u8. diff --git a/swilena/intp.ixx b/swilena/intp.ixx index a4d3449..6e14dbf 100644 --- a/swilena/intp.ixx +++ b/swilena/intp.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file intp.ixx /// \brief A wrapper of int pointers. diff --git a/swilena/morpho.ixx b/swilena/morpho.ixx index 199520b..7807694 100644 --- a/swilena/morpho.ixx +++ b/swilena/morpho.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file morpho.i /// \brief Wrappers of morphological algorithms from mln::morpho. diff --git a/swilena/neighb2d.i b/swilena/neighb2d.i index 3d4461e..2dd478a 100644 --- a/swilena/neighb2d.i +++ b/swilena/neighb2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file neighb2d.i /// \brief A wrapper of mln::neighb2d. diff --git a/swilena/pgm.ixx b/swilena/pgm.ixx index 2edd6fc..166903a 100644 --- a/swilena/pgm.ixx +++ b/swilena/pgm.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file pgm.ixx /// \brief A wrapper of mln::io::pgm::load and mln::io::pgm::save diff --git a/swilena/point2d.i b/swilena/point2d.i index f181a38..c49bb53 100644 --- a/swilena/point2d.i +++ b/swilena/point2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file point2d.i /// \brief A wrapper of mln::point2d. diff --git a/swilena/println.ixx b/swilena/println.ixx index 5e2685a..5f56e63 100644 --- a/swilena/println.ixx +++ b/swilena/println.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file println.ixx /// \brief A wrapper of mln::debug::println. diff --git a/swilena/python-utils.ixx b/swilena/python-utils.ixx index a14817b..6d18e4a 100644 --- a/swilena/python-utils.ixx +++ b/swilena/python-utils.ixx @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file python-utils.ixx /// \brief Utilities for Python wrappers. diff --git a/swilena/window2d.i b/swilena/window2d.i index 2642cd0..bf2247d 100644 --- a/swilena/window2d.i +++ b/swilena/window2d.i @@ -1,20 +1,28 @@ // -*- C++ -*- // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. +// This file is part of Olena. // -// This library is distributed in the hope that it will be useful, +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. /// \file window2d.i /// \brief A wrapper of mln::window2d. -- 1.6.2.4

1 0

[PATCH 5/5] Aestetic changes and cleanup in documentation and comments.
by Roland Levillain 10 Jun '09

10 Jun '09

* mln/core/image/complex_image.hh, * mln/core/var.hh, * mln/util/line_graph.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/image/complex_image.hh | 2 +- milena/mln/core/var.hh | 8 ++++---- milena/mln/util/line_graph.hh | 5 ++--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0f3a8a2..b6992d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + Aestetic changes and cleanup in documentation and comments. + + * mln/core/image/complex_image.hh, + * mln/core/var.hh, + * mln/util/line_graph.hh: + Here. + +2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + Stop using \arg instead of \param or \tparam in documentation. * mln/core/faces_psite.hh, diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index b1788c3..9f273a5 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -112,7 +112,7 @@ namespace mln } // end of namespace mln::trait - /// Image based on a complex. + /// \brief Image based on a complex. /// /// Values attached to each face of the complex. /// diff --git a/milena/mln/core/var.hh b/milena/mln/core/var.hh index 8288e06..9892815 100644 --- a/milena/mln/core/var.hh +++ b/milena/mln/core/var.hh @@ -27,11 +27,11 @@ # define MLN_CORE_VAR_HH /// \file +/// \brief Various macros (syntactic sugar) to shorten declarations of +/// variables. /// -/// This file contains various macros to declare variables. -/// -/// Warning: that macro relies on an extention of g++ (typeof) so it is -/// NOT standard C++. +/// \warning Theses macro rely on an extension of g++ (\c typeof) so it +/// is NOT standard C++. # include <mln/core/macros.hh> diff --git a/milena/mln/util/line_graph.hh b/milena/mln/util/line_graph.hh index f367b77..af11d02 100644 --- a/milena/mln/util/line_graph.hh +++ b/milena/mln/util/line_graph.hh @@ -77,7 +77,6 @@ namespace mln /// \brief Undirected line graph of a graph of type \p G. /// /// \ingroup modgraph - // template <typename G> class line_graph : public internal::graph_base< line_graph<G> > { @@ -253,7 +252,7 @@ namespace mln g_ = g; // Initialize vertices and edges. - //FIXME: use an adjacency matrix!! + // FIXME: use an adjacency matrix!! std::set<util::ord_pair<util::vertex_id_t> > edges_set; vertices_.resize(g.e_nmax()); @@ -339,7 +338,7 @@ namespace mln bool line_graph<G>::has(const util::vertex<G2>& v) const { - //FIXME: not sure... + // FIXME: not sure... return v.graph().is_subgraph_of(*this) && has_v(v.id()); } -- 1.6.1.2

1 0

[PATCH 4/5] Stop using \arg instead of \param or \tparam in documentation (cont).
by Roland Levillain 10 Jun '09

10 Jun '09

* sandbox/abraham/mln/transform/fft.hh, * sandbox/nivault/dmap.hh: Here. --- milena/sandbox/ChangeLog | 8 +++++ milena/sandbox/abraham/mln/transform/fft.hh | 38 +++++++++++++------------- milena/sandbox/nivault/dmap.hh | 4 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 8944cde..b99bf5b 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,11 @@ +2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + + Stop using \arg instead of \param or \tparam in documentation. + + * sandbox/abraham/mln/transform/fft.hh, + * sandbox/nivault/dmap.hh: + Here. + 2009-06-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add new distance and minor updates. diff --git a/milena/sandbox/abraham/mln/transform/fft.hh b/milena/sandbox/abraham/mln/transform/fft.hh index 8fc5a23..0dafa7b 100644 --- a/milena/sandbox/abraham/mln/transform/fft.hh +++ b/milena/sandbox/abraham/mln/transform/fft.hh @@ -103,9 +103,9 @@ namespace mln { ** For each point p of the transformed image T, you get ** |T[p]|. ** - ** \param R Data type of the resulting image. + ** \tparam R Data type of the resulting image. ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ template <class R> image2d<R> transformed_image_magn(bool ordered = true) const @@ -137,7 +137,7 @@ namespace mln { ** For each point p of the transformed image T, you get ** |T[p]|. ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ image2d<T> transformed_image_magn(bool ordered = true) const { @@ -152,8 +152,8 @@ namespace mln { ** ** \param R Data type of the resulting image. ** - ** \arg clip Value used for clipping. - ** \arg ordered Kind of traversal. + ** \param clip Value used for clipping. + ** \param ordered Kind of traversal. */ template <class R> @@ -207,8 +207,8 @@ namespace mln { ** For each point p of the transformed image T, you get ** a clipped value of |T[p]|.\n ** - ** \arg clip Value used for clipping. - ** \arg ordered Kind of traversal. + ** \param clip Value used for clipping. + ** \param ordered Kind of traversal. */ image2d<T> transformed_image_clipped_magn(const double clip, bool ordered = true) const @@ -224,7 +224,7 @@ namespace mln { ** ** \param R Data type of the resulting image. ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ image2d<T> transformed_image_clipped_magn(bool ordered = true) const @@ -240,7 +240,7 @@ namespace mln { ** ** \param R Data type of the resulting image. ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ template <class R> @@ -256,9 +256,9 @@ namespace mln { ** For each point p of the transformed image T, you get ** a log translated value of |T[p]| on interval [a; b].\n ** - ** \arg a Lower bound. - ** \arg b Upper bound. - ** \arg ordered Kind of traversal. + ** \param a Lower bound. + ** \param b Upper bound. + ** \param ordered Kind of traversal. */ template <class R> @@ -306,9 +306,9 @@ namespace mln { ** For each point p of the transformed image T, you get ** a log translated value of |T[p]| on interval [a; b].\n ** - ** \arg a Lower bound. - ** \arg b Upper bound. - ** \arg ordered Kind of traversal. + ** \param a Lower bound. + ** \param b Upper bound. + ** \param ordered Kind of traversal. */ image2d<T> transformed_image_log_magn(double a, @@ -326,7 +326,7 @@ namespace mln { ** ** \param R Data type of the resulting image. ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ template <class R> @@ -341,7 +341,7 @@ namespace mln { ** For each point p of the transformed image T, you get ** a log translated value of |T[p]| on interval [1; 100].\n ** - ** \arg ordered Kind of traversal. + ** \param ordered Kind of traversal. */ image2d<T> transformed_image_log_magn(bool ordered = true) const @@ -403,7 +403,7 @@ namespace mln { ** ** Initialization of data in order to compute the fft. ** - ** \arg original_im Image to process. + ** \param original_im Image to process. */ template <typename D> fft(const image2d<D>& original_im) @@ -599,7 +599,7 @@ namespace mln { ** ** Initialization of data in order to compute the fft. ** - ** \arg original_im Image to process. + ** \param original_im Image to process. */ fft(const image2d< std::complex<T> >& original_im) { diff --git a/milena/sandbox/nivault/dmap.hh b/milena/sandbox/nivault/dmap.hh index d6cea9b..625be08 100644 --- a/milena/sandbox/nivault/dmap.hh +++ b/milena/sandbox/nivault/dmap.hh @@ -525,8 +525,8 @@ namespace oln { /*! Constructor. ** - ** \arg size Size of the image on which the dmap will be compute. - ** \arg ch Chamfer distance used. + ** \param size Size of the image on which the dmap will be compute. + ** \param ch Chamfer distance used. */ dmap(const image2d_size& size, const chamfer<T2>& ch); -- 1.6.1.2

1 0

[PATCH 3/5] Stop using \arg instead of \param or \tparam in documentation.
by Roland Levillain 10 Jun '09

10 Jun '09

* mln/core/faces_psite.hh, * mln/core/image/complex_image.hh, * mln/core/internal/p_complex_piter_base.hh, * mln/core/internal/site_set_base.hh, * mln/core/site_set/complex_psite.hh, * mln/core/site_set/p_complex.hh, * mln/geom/complex_geometry.hh, * mln/topo/adj_higher_dim_connected_n_face_iter.hh, * mln/topo/adj_higher_face_iter.hh, * mln/topo/adj_lower_dim_connected_n_face_iter.hh, * mln/topo/adj_lower_face_iter.hh, * mln/topo/adj_lower_higher_face_iter.hh, * mln/topo/attic/faces_iter.hh, * mln/topo/center_only_iter.hh, * mln/topo/centered_iter_adapter.hh, * mln/topo/face_iter.hh, * mln/topo/internal/complex_iterator_base.hh, * mln/topo/internal/complex_relative_iterator_base.hh, * mln/topo/internal/complex_relative_iterator_sequence.hh, * mln/topo/internal/complex_set_iterator_base.hh, * mln/topo/n_face_iter.hh, * mln/topo/static_n_face_iter.hh: Here. --- milena/ChangeLog | 28 ++++++++++++++++++++ milena/mln/core/faces_psite.hh | 6 ++-- milena/mln/core/image/complex_image.hh | 7 ++--- milena/mln/core/internal/p_complex_piter_base.hh | 8 +++--- milena/mln/core/internal/site_set_base.hh | 4 +- milena/mln/core/site_set/complex_psite.hh | 4 +- milena/mln/core/site_set/p_complex.hh | 4 +- milena/mln/geom/complex_geometry.hh | 6 ++-- .../topo/adj_higher_dim_connected_n_face_iter.hh | 4 +- milena/mln/topo/adj_higher_face_iter.hh | 4 +- .../topo/adj_lower_dim_connected_n_face_iter.hh | 4 +- milena/mln/topo/adj_lower_face_iter.hh | 4 +- milena/mln/topo/adj_lower_higher_face_iter.hh | 4 +- milena/mln/topo/attic/faces_iter.hh | 8 +++--- milena/mln/topo/center_only_iter.hh | 2 +- milena/mln/topo/centered_iter_adapter.hh | 8 +++--- milena/mln/topo/face_iter.hh | 4 +- milena/mln/topo/internal/complex_iterator_base.hh | 4 +- .../internal/complex_relative_iterator_base.hh | 18 ++++++------ .../internal/complex_relative_iterator_sequence.hh | 6 ++-- .../mln/topo/internal/complex_set_iterator_base.hh | 4 +- milena/mln/topo/n_face_iter.hh | 4 +- milena/mln/topo/static_n_face_iter.hh | 8 +++--- 23 files changed, 90 insertions(+), 63 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2495d44..0f3a8a2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,33 @@ 2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + Stop using \arg instead of \param or \tparam in documentation. + + * mln/core/faces_psite.hh, + * mln/core/image/complex_image.hh, + * mln/core/internal/p_complex_piter_base.hh, + * mln/core/internal/site_set_base.hh, + * mln/core/site_set/complex_psite.hh, + * mln/core/site_set/p_complex.hh, + * mln/geom/complex_geometry.hh, + * mln/topo/adj_higher_dim_connected_n_face_iter.hh, + * mln/topo/adj_higher_face_iter.hh, + * mln/topo/adj_lower_dim_connected_n_face_iter.hh, + * mln/topo/adj_lower_face_iter.hh, + * mln/topo/adj_lower_higher_face_iter.hh, + * mln/topo/attic/faces_iter.hh, + * mln/topo/center_only_iter.hh, + * mln/topo/centered_iter_adapter.hh, + * mln/topo/face_iter.hh, + * mln/topo/internal/complex_iterator_base.hh, + * mln/topo/internal/complex_relative_iterator_base.hh, + * mln/topo/internal/complex_relative_iterator_sequence.hh, + * mln/topo/internal/complex_set_iterator_base.hh, + * mln/topo/n_face_iter.hh, + * mln/topo/static_n_face_iter.hh: + Here. + +2009-06-09 Roland Levillain <roland(a)lrde.epita.fr> + Typos in comments. * mln/core/image/complex_image.hh (complex_image<D, G, V>::lvalue) diff --git a/milena/mln/core/faces_psite.hh b/milena/mln/core/faces_psite.hh index 2d4121e..d8d7573 100644 --- a/milena/mln/core/faces_psite.hh +++ b/milena/mln/core/faces_psite.hh @@ -49,9 +49,9 @@ namespace mln /// \brief Point site associated to a mln::p_faces. /// - /// \arg \p N The dimension of the face associated to this psite. - /// \arg \p D The dimension of the complex this psite belongs to. - /// \arg \p P The type of point associated to this psite. + /// \tparam N The dimension of the face associated to this psite. + /// \tparam D The dimension of the complex this psite belongs to. + /// \tparam P The type of point associated to this psite. template <unsigned N, unsigned D, typename P> class faces_psite : public internal::pseudo_site_base_< const P&, diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 56bdeea..b1788c3 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -116,12 +116,11 @@ namespace mln /// /// Values attached to each face of the complex. /// - /// \arg p D The dimension of the complex. - /// \arg p G The geometry type of the complex. - /// \arg p V The value type of the image. + /// \tparam D The dimension of the complex. + /// \tparam G The geometry type of the complex. + /// \tparam V The value type of the image. /// /// \ingroup modimageconcrete - // template <unsigned D, typename G, typename V> class complex_image : public internal::image_primary< V, p_complex<D, G>, diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index 2070aa8..6d7f5f6 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -51,10 +51,10 @@ namespace mln /// \brief Factoring class for iterators on mln::p_complex. /// - /// \arg \p I The type of the underlying complex iterator. - /// \arg \p S The associated site set type. - /// \arg \p P The associated site type. - /// \arg \p E The type exact type of the iterator. + /// \tparam I The type of the underlying complex iterator. + /// \tparam S The associated site set type. + /// \tparam P The associated site type. + /// \tparam E The type exact type of the iterator. template <typename I, typename S, typename P, typename E> class p_complex_piter_base_ : public internal::site_set_iterator_base< S, E > diff --git a/milena/mln/core/internal/site_set_base.hh b/milena/mln/core/internal/site_set_base.hh index fffdec2..076d480 100644 --- a/milena/mln/core/internal/site_set_base.hh +++ b/milena/mln/core/internal/site_set_base.hh @@ -44,10 +44,10 @@ namespace mln /// A base class for site set classes. /// - /// \arg \p P The psite type of what is ``contained'' in the site + /// \tparam P The psite type of what is ``contained'' in the site /// set, not the psite of the site set (which is /// different, and defined by the site set itself). - /// \arg \p E The exact type of the site set. + /// \tparam E The exact type of the site set. template <typename P, typename E> struct site_set_base_ : public Site_Set<E> { diff --git a/milena/mln/core/site_set/complex_psite.hh b/milena/mln/core/site_set/complex_psite.hh index 159645e..9e150cc 100644 --- a/milena/mln/core/site_set/complex_psite.hh +++ b/milena/mln/core/site_set/complex_psite.hh @@ -54,8 +54,8 @@ namespace mln /// \brief Point site associated to a mln::p_complex. /// - /// \arg \p D The dimension of the complex this psite belongs to. - /// \arg \p G The geometry of the complex. + /// \tparam D The dimension of the complex this psite belongs to. + /// \tparam G The geometry of the complex. template <unsigned D, typename G> class complex_psite : public internal::pseudo_site_base_< const mln_site(G)&, complex_psite<D, G> > diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 225a70d..c5d2c36 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -105,8 +105,8 @@ namespace mln /** A complex psite set based on the N-faces of a complex of dimension \p D (a \p D-complex). - \arg \p D The dimension of the complex. - \arg \p G A function object type, associating localization + \tparam D The dimension of the complex. + \tparam G A function object type, associating localization information (geometry) to each face of the complex. \see mln::geom::complex_geometry. */ /// \brief A complex psite set based on the N-faces of a complex. diff --git a/milena/mln/geom/complex_geometry.hh b/milena/mln/geom/complex_geometry.hh index b2f7320..f1c604c 100644 --- a/milena/mln/geom/complex_geometry.hh +++ b/milena/mln/geom/complex_geometry.hh @@ -70,8 +70,8 @@ namespace mln where the locations of each 0-face is stored. Faces of higher dimensions are computed. - \arg \p D The dimension of the complex. - \arg \p P The type of the location of a 0-face. + \tparam D The dimension of the complex. + \tparam P The type of the location of a 0-face. Locations of 0-face are usually points (hence the \p P above), but can possibly be any (default-constructible) values. @@ -115,7 +115,7 @@ namespace mln { /// The data stored in a complex_geometry object. /// - /// \arg \p P The type of the location of a 0-face. + /// \tparam P The type of the location of a 0-face. template <typename P> struct complex_geometry_data { diff --git a/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh b/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh index fab364b..034f139 100644 --- a/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh +++ b/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh @@ -59,7 +59,7 @@ namespace mln /// \brief Forward iterator on all the n-faces sharing an adjacent /// (n+1)-face with a (reference) n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_higher_dim_connected_n_face_fwd_iter @@ -98,7 +98,7 @@ namespace mln /// \brief Backward iterator on all the n-faces sharing an adjacent /// (n+1)-face with a (reference) n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_higher_dim_connected_n_face_bkd_iter diff --git a/milena/mln/topo/adj_higher_face_iter.hh b/milena/mln/topo/adj_higher_face_iter.hh index 69028cd..21f6d34 100644 --- a/milena/mln/topo/adj_higher_face_iter.hh +++ b/milena/mln/topo/adj_higher_face_iter.hh @@ -65,7 +65,7 @@ namespace mln /// \brief Forward iterator on all the adjacent (n+1)-faces of the /// n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_higher_face_fwd_iter @@ -99,7 +99,7 @@ namespace mln /// \brief Backward iterator on all the adjacent (n+1)-faces of /// the n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_higher_face_bkd_iter diff --git a/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh b/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh index c0403d8..d493ea9 100644 --- a/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh +++ b/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh @@ -59,7 +59,7 @@ namespace mln /// \brief Forward iterator on all the n-faces sharing an adjacent /// (n-1)-face with a (reference) n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_lower_dim_connected_n_face_fwd_iter @@ -98,7 +98,7 @@ namespace mln /// \brief Backward iterator on all the n-faces sharing an adjacent /// (n-1)-face with a (reference) n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_lower_dim_connected_n_face_bkd_iter diff --git a/milena/mln/topo/adj_lower_face_iter.hh b/milena/mln/topo/adj_lower_face_iter.hh index 9bcaba5..e7010db 100644 --- a/milena/mln/topo/adj_lower_face_iter.hh +++ b/milena/mln/topo/adj_lower_face_iter.hh @@ -66,7 +66,7 @@ namespace mln /// \brief Forward iterator on all the adjacent (n-1)-faces of the /// n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_lower_face_fwd_iter @@ -101,7 +101,7 @@ namespace mln /// \brief Backward iterator on all the adjacent (n-1)-faces of /// the n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class adj_lower_face_bkd_iter diff --git a/milena/mln/topo/adj_lower_higher_face_iter.hh b/milena/mln/topo/adj_lower_higher_face_iter.hh index 9e261fa..2ed4abd 100644 --- a/milena/mln/topo/adj_lower_higher_face_iter.hh +++ b/milena/mln/topo/adj_lower_higher_face_iter.hh @@ -66,7 +66,7 @@ namespace mln /// Forward iterator on all the adjacent (n-1)-faces and /// (n+1)-faces of the n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. template <unsigned D> class adj_lower_higher_face_fwd_iter : public internal::complex_relative_iterator_sequence<adj_lower_face_fwd_iter<D>, @@ -97,7 +97,7 @@ namespace mln /// Forward iterator on all the adjacent (n-1)-faces and /// (n+1)-faces of the n-face of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. template <unsigned D> class adj_lower_higher_face_bkd_iter : public internal::complex_relative_iterator_sequence<adj_higher_face_bkd_iter<D>, diff --git a/milena/mln/topo/attic/faces_iter.hh b/milena/mln/topo/attic/faces_iter.hh index b0765d5..eca6f40 100644 --- a/milena/mln/topo/attic/faces_iter.hh +++ b/milena/mln/topo/attic/faces_iter.hh @@ -45,8 +45,8 @@ namespace mln /// \brief Forward iterator on all the faces of a mln::complex<D>. /// - /// \arg \p N The dimension of the face associated to this iterator. - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam N The dimension of the face associated to this iterator. + /// \tparam D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class faces_fwd_iter_ : public internal::complex_set_iterator_base< n_face<N, D>, @@ -92,8 +92,8 @@ namespace mln /// \brief Backward iterator on all the faces of a mln::complex<D>. /// - /// \arg \p N The dimension of the face associated to this iterator. - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam N The dimension of the face associated to this iterator. + /// \tparam D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class faces_bkd_iter_ : public internal::complex_set_iterator_base< n_face<N, D>, diff --git a/milena/mln/topo/center_only_iter.hh b/milena/mln/topo/center_only_iter.hh index 46677eb..ff072aa 100644 --- a/milena/mln/topo/center_only_iter.hh +++ b/milena/mln/topo/center_only_iter.hh @@ -54,7 +54,7 @@ namespace mln /** \brief Iterator on all the adjacent (n-1)-faces of the n-face of an mln::complex<D>. - \arg \p D The dimension of the complex this iterator belongs to. + \tparam D The dimension of the complex this iterator belongs to. mln::topo::center_only_iter inherits from mln::topo::internal::forward_complex_relative_iterator_base, diff --git a/milena/mln/topo/centered_iter_adapter.hh b/milena/mln/topo/centered_iter_adapter.hh index 32f8e60..4a6e0cc 100644 --- a/milena/mln/topo/centered_iter_adapter.hh +++ b/milena/mln/topo/centered_iter_adapter.hh @@ -51,8 +51,8 @@ namespace mln /// \brief Backward complex relative iterator adapters adding the /// central (reference) point to the set of iterated faces. /// - /// \arg \p D The dimension of the complex this iterator belongs to. - /// \arg \p I The adapated complex relative iterator. + /// \tparam D The dimension of the complex this iterator belongs to. + /// \tparam I The adapated complex relative iterator. template <unsigned D, typename I> class centered_fwd_iter_adapter : public internal::complex_relative_iterator_sequence< center_only_iter<D>, @@ -85,8 +85,8 @@ namespace mln /// \brief Forward complex relative iterator adapters adding the /// central (reference) point to the set of iterated faces. /// - /// \arg \p D The dimension of the complex this iterator belongs to. - /// \arg \p I The adapated complex relative iterator. + /// \tparam D The dimension of the complex this iterator belongs to. + /// \tparam I The adapated complex relative iterator. template <unsigned D, typename I> class centered_bkd_iter_adapter : public internal::complex_relative_iterator_sequence< I, diff --git a/milena/mln/topo/face_iter.hh b/milena/mln/topo/face_iter.hh index 6cae5b6..c78500a 100644 --- a/milena/mln/topo/face_iter.hh +++ b/milena/mln/topo/face_iter.hh @@ -63,7 +63,7 @@ namespace mln /// \brief Forward iterator on all the faces of an /// mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class face_fwd_iter @@ -106,7 +106,7 @@ namespace mln /// \brief Backward iterator on all the faces of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class face_bkd_iter diff --git a/milena/mln/topo/internal/complex_iterator_base.hh b/milena/mln/topo/internal/complex_iterator_base.hh index 0ae125e..bc8f26e 100644 --- a/milena/mln/topo/internal/complex_iterator_base.hh +++ b/milena/mln/topo/internal/complex_iterator_base.hh @@ -72,8 +72,8 @@ namespace mln /// Factoring class for iterators on mln::complex. /// - /// \arg \p F The type of the face handle. - /// \arg \p E The type exact type of the iterator. + /// \tparam F The type of the face handle. + /// \tparam E The type exact type of the iterator. template <typename F, typename E> class complex_iterator_base : public Iterator<E> { diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 7867b50..58d6ee0 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -77,9 +77,9 @@ namespace mln /// Factoring class for relative iterators on mln::complex. /// - /// \arg \p C The type of the center face handle. - /// \arg \p F The type of the face handle. - /// \arg \p E The type exact type of the iterator. + /// \tparam C The type of the center face handle. + /// \tparam F The type of the face handle. + /// \tparam E The type exact type of the iterator. template <typename C, typename F, typename E> class complex_relative_iterator_base : public complex_iterator_base<F, E> @@ -130,9 +130,9 @@ namespace mln /// Factoring class for forward relative iterators on /// mln::complex. /// - /// \arg \p C The type of the center face handle. - /// \arg \p F The type of the face handle. - /// \arg \p E The type exact type of the iterator. + /// \tparam C The type of the center face handle. + /// \tparam F The type of the face handle. + /// \tparam E The type exact type of the iterator. template <typename C, typename F, typename E> class forward_complex_relative_iterator_base : public complex_relative_iterator_base<C, F, E> @@ -181,9 +181,9 @@ namespace mln /// Factoring class for backward relative iterators on /// mln::complex. /// - /// \arg \p C The type of the center face handle. - /// \arg \p F The type of the face handle. - /// \arg \p E The type exact type of the iterator. + /// \tparam C The type of the center face handle. + /// \tparam F The type of the face handle. + /// \tparam E The type exact type of the iterator. template <typename C, typename F, typename E> class backward_complex_relative_iterator_base : public complex_relative_iterator_base<C, F, E> diff --git a/milena/mln/topo/internal/complex_relative_iterator_sequence.hh b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh index b788cc4..fda267c 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_sequence.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh @@ -62,9 +62,9 @@ namespace mln /// The first relative iterator is used, and when it becomes /// invalid, the second one is used. /// - /// \arg \p I1 The type of the first relative iterator. - /// \arg \p I2 The type of the second relative iterator. - /// \arg \p E The type exact type of the iterator. + /// \tparam I1 The type of the first relative iterator. + /// \tparam I2 The type of the second relative iterator. + /// \tparam E The type exact type of the iterator. template <typename I1, typename I2, typename E> class complex_relative_iterator_sequence : public Iterator<E> { diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index c43fe12..85e3cd1 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -50,8 +50,8 @@ namespace mln /// Factoring class for (set) iterators on mln::complex. /// - /// \arg \p F The type of the face handle. - /// \arg \p E The type exact type of the iterator. + /// \tparam F The type of the face handle. + /// \tparam E The type exact type of the iterator. template <typename F, typename E> class complex_set_iterator_base : public complex_iterator_base<F, E> { diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh index cdd5721..4cdb091 100644 --- a/milena/mln/topo/n_face_iter.hh +++ b/milena/mln/topo/n_face_iter.hh @@ -66,7 +66,7 @@ namespace mln /// \brief Forward iterator on all the faces of an /// mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned D> class n_face_fwd_iter @@ -122,7 +122,7 @@ namespace mln /// Backward iterator on all the faces of an mln::complex<D>. /// - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam D The dimension of the complex this iterator belongs to. template <unsigned D> class n_face_bkd_iter : public internal::complex_set_iterator_base< topo::face<D>, diff --git a/milena/mln/topo/static_n_face_iter.hh b/milena/mln/topo/static_n_face_iter.hh index 4a78ecc..21a7639 100644 --- a/milena/mln/topo/static_n_face_iter.hh +++ b/milena/mln/topo/static_n_face_iter.hh @@ -48,8 +48,8 @@ namespace mln /// \brief Forward iterator on all the \p N-faces of a /// mln::complex<D>. /// - /// \arg \p N The dimension of the face associated to this iterator. - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam N The dimension of the face associated to this iterator. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned N, unsigned D> class static_n_face_fwd_iter @@ -94,8 +94,8 @@ namespace mln /// \brief Backward iterator on all the \p N-faces of a /// mln::complex<D>. /// - /// \arg \p N The dimension of the face associated to this iterator. - /// \arg \p D The dimension of the complex this iterator belongs to. + /// \tparam N The dimension of the face associated to this iterator. + /// \tparam D The dimension of the complex this iterator belongs to. // template <unsigned N, unsigned D> class static_n_face_bkd_iter -- 1.6.1.2

1 0