[Olena-patches] 668: Add files for oln::window[123]d.

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Add files for oln::window[123]d. * oln/core/1d/window1d.hh: New file. * oln/basics1d.hh: Include it. * oln/core/2d/window2d.hh: New file. * oln/basics2d.hh: Include it. * oln/core/3d/window3d.hh: New file. * oln/basics3d.hh: Include it. * oln/Makefile.am (nobase_oln_HEADERS): Add core/1d/window1d.hh, core/2d/window2d.hh and core/3d/window3d.hh * tests/morphers/slice_morpher.cc: Remove FIXME. oln/Makefile.am | 3 +++ oln/basics1d.hh | 5 ++--- oln/basics2d.hh | 5 ++--- oln/basics3d.hh | 5 ++--- oln/core/1d/window1d.hh | 37 +++++++++++++++++++++++++++++++++++++ oln/core/2d/window2d.hh | 37 +++++++++++++++++++++++++++++++++++++ oln/core/3d/window3d.hh | 37 +++++++++++++++++++++++++++++++++++++ tests/morphers/slice_morpher.cc | 3 --- 8 files changed, 120 insertions(+), 12 deletions(-) Index: tests/morphers/slice_morpher.cc --- tests/morphers/slice_morpher.cc (revision 667) +++ tests/morphers/slice_morpher.cc (working copy) @@ -32,9 +32,6 @@ #include <mlc/assert.hh> #include <mlc/is_a.hh> -// FIXME: We should not include oln/basics2d.hh and oln/basics3d.hh, -// but only oln/core/3d/image3d.hh and oln/core/2d/image2d.hh, -// oln/core/2d/window2d. #include <oln/basics2d.hh> #include <oln/basics3d.hh> #include <oln/morpher/slice.hh> Index: oln/basics1d.hh --- oln/basics1d.hh (revision 667) +++ oln/basics1d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/1d/point1d.hh> # include <oln/core/1d/dpoint1d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/1d/topo1d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/1d/window1d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh> Index: oln/core/1d/window1d.hh --- oln/core/1d/window1d.hh (revision 0) +++ oln/core/1d/window1d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// 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 library 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. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef OLN_CORE_1D_WINDOW1D_HH +# define OLN_CORE_1D_WINDOW1D_HH + +// Headers required for the complete definition of oln::window1d +// (i.e., oln::window_<dpoint1d>). +# include <oln/core/1d/aliases.hh> +# include <oln/core/1d/dpoint1d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_1D_WINDOW1D_HH Index: oln/core/2d/window2d.hh --- oln/core/2d/window2d.hh (revision 0) +++ oln/core/2d/window2d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// 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 library 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. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef OLN_CORE_2D_WINDOW2D_HH +# define OLN_CORE_2D_WINDOW2D_HH + +// Headers required for the complete definition of oln::window2d +// (i.e., oln::window_<dpoint2d>). +# include <oln/core/2d/aliases.hh> +# include <oln/core/2d/dpoint2d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_2D_WINDOW2D_HH Index: oln/core/3d/window3d.hh --- oln/core/3d/window3d.hh (revision 0) +++ oln/core/3d/window3d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// 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 library 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. +// +// As a special exception, you may use this file as part of a free +// software library 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. + +#ifndef OLN_CORE_3D_WINDOW3D_HH +# define OLN_CORE_3D_WINDOW3D_HH + +// Headers required for the complete definition of oln::window3d +// (i.e., oln::window_<dpoint3d>). +# include <oln/core/3d/aliases.hh> +# include <oln/core/3d/dpoint3d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_3D_WINDOW3D_HH Index: oln/basics2d.hh --- oln/basics2d.hh (revision 667) +++ oln/basics2d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/2d/point2d.hh> # include <oln/core/2d/dpoint2d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/2d/topo2d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/2d/window2d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 667) +++ oln/Makefile.am (working copy) @@ -13,6 +13,7 @@ core/1d/neighb1d.hh \ core/1d/point1d.hh \ core/1d/topo1d.hh \ + core/1d/window1d.hh \ \ core/2d/aliases.hh \ core/2d/array2d.hh \ @@ -22,6 +23,7 @@ core/2d/neighb2d.hh \ core/2d/point2d.hh \ core/2d/topo2d.hh \ + core/2d/window2d.hh \ \ core/3d/aliases.hh \ core/3d/array3d.hh \ @@ -31,6 +33,7 @@ core/3d/neighb3d.hh \ core/3d/point3d.hh \ core/3d/topo3d.hh \ + core/3d/window3d.hh \ \ core/abstract/image/accessibility/hierarchy.hh \ \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 667) +++ oln/basics3d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/3d/point3d.hh> # include <oln/core/3d/dpoint3d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/3d/topo3d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/3d/window3d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh>