Commit 2ac3e55f authored by Roland Levillain's avatar Roland Levillain
Browse files

Fix sanity checks.

	* oln/core/abstract/image/hybrid/classical.hh,
	* oln/core/gen/neighb.hh, oln/core/gen/window.hh,
	* oln/core/gen/fwd_qiter_win.hh, oln/core/gen/piter_isubset.hh,
	* oln/core/gen/mapimage.hh,
	* oln/core/internal/bbox_fwd_piter.hh,
	* oln/core/internal/bbox_bkd_piter.hh,
	* oln/core/fwd_piter.hh, oln/core/1d/point1d.hh,
	* oln/core/1d/dpoint1d.hh, oln/core/2d/point2d.hh,
	* oln/core/2d/dpoint2d.hh, oln/core/2d/neighb2d.hh,
	* oln/core/3d/point3d.hh, oln/core/3d/dpoint3d.hh,
	* oln/core/3d/neighb3d.hh,
	* oln/morpher/add_isubset.hh, oln/morpher/add_neighborhood.hh,
	* oln/debug/print.hh, oln/io/pnm.hh, oln/level/fill.hh:
	Include needed (missing) headers.
	* oln/core/1d/image1d.hh, oln/core/2d/image2d.hh,
	* oln/core/3d/image3d.hh: Likewise.
	Instantiate oln::bbox_ explicitly.
	* oln/core/gen/bbox.hh
	(oln/core/gen/bbox_fwd_piter.hh, oln/core/gen/bbox_bkd_piter.hh):
	Don't include them.
	* oln/core/gen/topo_bbox.hh (impl_has_large): Typo.


	Reorganize the abstract::image hierarchy.

	* oln/core/abstract/image/hierarchies.hh: Move inclusions of point
	set abstractions...
	* oln/core/abstract/image/all.hh: ...here (new file).
	* oln/core/image_entry.hh: Adjust.
	* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
	* oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh: Remove
	explicit template instantiations.
	* oln/core/abstract/image.hh
	(oln/core/abstract/image/hierarchies.hh): Don't include it.
	* oln/core/abstract/image/dimension/hierarchy.hh
	* oln/core/abstract/image/type/hierarchy.hh,
	* oln/core/abstract/image/neighborhood/hierarchy.hh
	* oln/core/abstract/image/bbox/hierarchy.hh
	* oln/core/abstract/image/accessibility/hierarchy.hh
	* oln/core/abstract/image/mutability/hierarchy.hh
	* oln/core/abstract/image/hybrid/classical.hh
	(oln/core/abstract/image/hierarchies.hh): Include it.
	* oln/core/abstract/image/type/integre.hh
	(oln::abstract::case_<image_hierarchy_wrt_type, E, 4>)
	(oln::abstract::case_<image_hierarchy_wrt_type, E, 5>)
	(oln::abstract::case_<image_hierarchy_wrt_type, E, 6>): Catch up
	with image type hierarchy.


	Reorganize the abstract::point_set hierarchy.

	* oln/core/abstract/point_set_hierarchies.hh: Rename as...
	* oln/core/abstract/point_set/hierarchies.hh: ...this.
	Move inclusions of point set abstractions...
	* oln/core/abstract/point_set/all.hh: ...here (new file).
	* oln/core/point_set_entry.hh: Adjust.
	* oln/core/abstract/point_set_being_connected.hh,
	* oln/core/abstract/point_set_being_random_accessible.hh,
	* oln/core/abstract/point_set_having_bbox.hh,
	* oln/core/abstract/point_set_having_known_size.hh: Rename as...
	* oln/core/abstract/point_set/point_set_being_connected.hh,
	* oln/core/abstract/point_set/point_set_being_random_accessible.hh,
	* oln/core/abstract/point_set/point_set_having_bbox.hh,
	* oln/core/abstract/point_set/point_set_having_known_size.hh:
	...these.
	Adjust header guards and inclusions.
	* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
	* oln/core/abstract/bbox.hh
	(oln::case_<point_set_hierarchy_wrt_bbox, E, 1>)
	(oln::case_<point_set_hierarchy_wrt_bbox, E, 2>): Move...
	* oln/core/abstract/point_set/point_set_having_bbox.hh: ...here.
	(oln::abstract::point_set_having_bbox):
	s/oln_type_of/oln_check_type_of/g.


	Reorganize the abstract::topology hierarchy.

	* oln/core/abstract/topology_hierarchies.hh: Rename as...
	* oln/core/abstract/topology/hierarchies.hh: ...this.
	Move inclusions of topology abstractions...
	* oln/core/abstract/topology/all.hh: ...here (new file).
	* oln/core/topology_entry.hh: Adjust
	* oln/core/abstract/topology_being_random_accessible.hh,
	* oln/core/abstract/topology_having_bbox.hh,
	* oln/core/abstract/topology_having_neighborhood.hh,
	* oln/core/abstract/topology_having_subset.hh: Rename as...
	* oln/core/abstract/topology/topology_being_random_accessible.hh,
	* oln/core/abstract/topology/topology_having_bbox.hh,
	* oln/core/abstract/topology/topology_having_neighborhood.hh,
	* oln/core/abstract/topology/topology_having_subset.hh: ...these.
	Adjust header guards and inclusions.
	* oln/Makefile.am (nobase_oln_HEADERS): Adjust.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@617 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent aad9a923
2006-10-10 Roland Levillain <roland@lrde.epita.fr>
Fix sanity checks.
* oln/core/abstract/image/hybrid/classical.hh,
* oln/core/gen/neighb.hh, oln/core/gen/window.hh,
* oln/core/gen/fwd_qiter_win.hh, oln/core/gen/piter_isubset.hh,
* oln/core/gen/mapimage.hh,
* oln/core/internal/bbox_fwd_piter.hh,
* oln/core/internal/bbox_bkd_piter.hh,
* oln/core/fwd_piter.hh, oln/core/1d/point1d.hh,
* oln/core/1d/dpoint1d.hh, oln/core/2d/point2d.hh,
* oln/core/2d/dpoint2d.hh, oln/core/2d/neighb2d.hh,
* oln/core/3d/point3d.hh, oln/core/3d/dpoint3d.hh,
* oln/core/3d/neighb3d.hh,
* oln/morpher/add_isubset.hh, oln/morpher/add_neighborhood.hh,
* oln/debug/print.hh, oln/io/pnm.hh, oln/level/fill.hh:
Include needed (missing) headers.
* oln/core/1d/image1d.hh, oln/core/2d/image2d.hh,
* oln/core/3d/image3d.hh: Likewise.
Instantiate oln::bbox_ explicitly.
* oln/core/gen/bbox.hh
(oln/core/gen/bbox_fwd_piter.hh, oln/core/gen/bbox_bkd_piter.hh):
Don't include them.
* oln/core/gen/topo_bbox.hh (impl_has_large): Typo.
Reorganize the abstract::image hierarchy.
* oln/core/abstract/image/hierarchies.hh: Move inclusions of point
set abstractions...
* oln/core/abstract/image/all.hh: ...here (new file).
* oln/core/image_entry.hh: Adjust.
* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
* oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh: Remove
explicit template instantiations.
* oln/core/abstract/image.hh
(oln/core/abstract/image/hierarchies.hh): Don't include it.
* oln/core/abstract/image/dimension/hierarchy.hh
* oln/core/abstract/image/type/hierarchy.hh,
* oln/core/abstract/image/neighborhood/hierarchy.hh
* oln/core/abstract/image/bbox/hierarchy.hh
* oln/core/abstract/image/accessibility/hierarchy.hh
* oln/core/abstract/image/mutability/hierarchy.hh
* oln/core/abstract/image/hybrid/classical.hh
(oln/core/abstract/image/hierarchies.hh): Include it.
* oln/core/abstract/image/type/integre.hh
(oln::abstract::case_<image_hierarchy_wrt_type, E, 4>)
(oln::abstract::case_<image_hierarchy_wrt_type, E, 5>)
(oln::abstract::case_<image_hierarchy_wrt_type, E, 6>): Catch up
with image type hierarchy.
Reorganize the abstract::point_set hierarchy.
* oln/core/abstract/point_set_hierarchies.hh: Rename as...
* oln/core/abstract/point_set/hierarchies.hh: ...this.
Move inclusions of point set abstractions...
* oln/core/abstract/point_set/all.hh: ...here (new file).
* oln/core/point_set_entry.hh: Adjust.
* oln/core/abstract/point_set_being_connected.hh,
* oln/core/abstract/point_set_being_random_accessible.hh,
* oln/core/abstract/point_set_having_bbox.hh,
* oln/core/abstract/point_set_having_known_size.hh: Rename as...
* oln/core/abstract/point_set/point_set_being_connected.hh,
* oln/core/abstract/point_set/point_set_being_random_accessible.hh,
* oln/core/abstract/point_set/point_set_having_bbox.hh,
* oln/core/abstract/point_set/point_set_having_known_size.hh:
...these.
Adjust header guards and inclusions.
* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
* oln/core/abstract/bbox.hh
(oln::case_<point_set_hierarchy_wrt_bbox, E, 1>)
(oln::case_<point_set_hierarchy_wrt_bbox, E, 2>): Move...
* oln/core/abstract/point_set/point_set_having_bbox.hh: ...here.
(oln::abstract::point_set_having_bbox):
s/oln_type_of/oln_check_type_of/g.
Reorganize the abstract::topology hierarchy.
* oln/core/abstract/topology_hierarchies.hh: Rename as...
* oln/core/abstract/topology/hierarchies.hh: ...this.
Move inclusions of topology abstractions...
* oln/core/abstract/topology/all.hh: ...here (new file).
* oln/core/topology_entry.hh: Adjust
* oln/core/abstract/topology_being_random_accessible.hh,
* oln/core/abstract/topology_having_bbox.hh,
* oln/core/abstract/topology_having_neighborhood.hh,
* oln/core/abstract/topology_having_subset.hh: Rename as...
* oln/core/abstract/topology/topology_being_random_accessible.hh,
* oln/core/abstract/topology/topology_having_bbox.hh,
* oln/core/abstract/topology/topology_having_neighborhood.hh,
* oln/core/abstract/topology/topology_having_subset.hh: ...these.
Adjust header guards and inclusions.
* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
2006-10-10 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr>
Add i/o read for pbm and pgm formats.
......
## Process this file through Automake to create Makefile.in -*- Makefile -*-
olndir = $(includedir)/oln
nobase_oln_HEADERS = \
\
core/1d/aliases.hh \
core/1d/array1d.hh \
core/1d/dpoint1d.hh \
core/1d/grid1d.hh \
core/1d/image1d.hh \
core/1d/neighb1d.hh \
core/1d/point1d.hh \
\
core/2d/aliases.hh \
core/2d/array2d.hh \
core/2d/dpoint2d.hh \
core/2d/grid2d.hh \
core/2d/image2d.hh \
core/2d/neighb2d.hh \
core/2d/point2d.hh \
\
core/3d/aliases.hh \
core/3d/array3d.hh \
core/3d/dpoint3d.hh \
core/3d/grid3d.hh \
core/3d/image3d.hh \
core/3d/neighb3d.hh \
core/3d/point3d.hh \
\
core/abstract/image/accessibility/hierarchy.hh \
\
core/abstract/any.hh \
core/abstract/bbox.hh \
core/abstract/dpoint.hh \
core/abstract/entry.hh \
core/abstract/fwd_decls.hh \
core/abstract/grid.hh \
core/abstract/image.hh \
core/abstract/image/accessibility/hierarchy.hh \
\
core/abstract/image/bbox/hierarchy.hh \
\
core/abstract/image/dimension/1d.hh \
core/abstract/image/dimension/2d.hh \
core/abstract/image/dimension/3d.hh \
core/abstract/image/dimension/hierarchy.hh \
\
core/abstract/image/hybrid/classical.hh \
core/abstract/image/mutability/hierarchy.hh \
\
core/abstract/image/neighborhood/hierarchy.hh \
\
core/abstract/image/type/binary.hh \
core/abstract/image/type/color.hh \
core/abstract/image/type/data.hh \
core/abstract/image/type/grey_level.hh \
core/abstract/image/type/hierarchy.hh \
core/abstract/image/type/integre.hh \
core/abstract/image/type/label.hh \
\
core/abstract/image/hierarchies.hh \
\
core/abstract/internal/image_impl.hh \
\
core/abstract/any.hh \
core/abstract/bbox.hh \
core/abstract/dpoint.hh \
core/abstract/entry.hh \
core/abstract/grid.hh \
core/abstract/image.hh \
core/abstract/iterator.hh \
core/abstract/iterator_on_points.hh \
core/abstract/neighborhood.hh \
core/abstract/point.hh \
core/abstract/point_set.hh \
core/abstract/point_set_being_connected.hh \
core/abstract/point_set_being_random_accessible.hh \
core/abstract/point_set_having_bbox.hh \
core/abstract/point_set_having_known_size.hh \
core/abstract/point_set_hierarchies.hh \
core/abstract/topology.hh \
core/abstract/topology_being_random_accessible.hh \
core/abstract/topology_having_bbox.hh \
core/abstract/topology_having_neighborhood.hh \
core/abstract/topology_having_subset.hh \
core/abstract/topology_hierarchies.hh \
\
core/automatic/image.hh \
core/automatic/image_being_mutable.hh \
core/automatic/image_being_random_accessible.hh \
core/automatic/image_having_neighborhood.hh \
core/automatic/image_having_neighborhood.hh \
core/automatic/impl.hh \
core/automatic/topology_being_random_accessible.hh \
core/automatic/topology_having_bbox.hh \
core/automatic/topology_having_neighborhood.hh \
core/automatic/topology_having_subset.hh \
\
core/fwd_piter.hh \
\
core/gen/bbox.hh \
core/gen/bbox_bkd_piter.hh \
core/gen/bbox_fwd_piter.hh \
core/gen/bkd_piter_bbox.hh \
core/gen/fwd_niter_neighb.hh \
core/gen/fwd_piter_bbox.hh \
core/gen/fwd_qiter_win.hh \
core/gen/mapimage.hh \
core/gen/neighb.hh \
core/gen/topo_add_nbh.hh \
core/gen/topo_bbox.hh \
core/gen/topo_lbbox.hh \
core/gen/window.hh \
\
core/internal/bbox_bkd_piter.hh \
core/internal/bbox_fwd_piter.hh \
core/internal/dpoint_nd.hh \
core/internal/point_nd.hh \
core/internal/topology_morpher.hh \
core/internal/tracked_ptr.hh \
\
core/case.hh \
core/image_entry.hh \
core/macros.hh \
core/neighborhood_entry.hh \
core/point_set_entry.hh \
core/traits.hh \
core/traits_id.hh \
core/topology_entry.hh \
core/typedefs.hh \
core/type.hh \
\
debug/print.hh \
\
io/pnm.hh \
\
level/fill.hh \
\
morpher/internal/image_extension.hh \
\
morpher/add_neighborhood.hh \
morpher/identity.hh \
morpher/tags.hh \
\
basics1d.hh \
basics2d.hh \
nobase_oln_HEADERS = \
\
core/1d/aliases.hh \
core/1d/array1d.hh \
core/1d/dpoint1d.hh \
core/1d/grid1d.hh \
core/1d/image1d.hh \
core/1d/neighb1d.hh \
core/1d/point1d.hh \
\
core/2d/aliases.hh \
core/2d/array2d.hh \
core/2d/dpoint2d.hh \
core/2d/grid2d.hh \
core/2d/image2d.hh \
core/2d/neighb2d.hh \
core/2d/point2d.hh \
\
core/3d/aliases.hh \
core/3d/array3d.hh \
core/3d/dpoint3d.hh \
core/3d/grid3d.hh \
core/3d/image3d.hh \
core/3d/neighb3d.hh \
core/3d/point3d.hh \
\
core/abstract/image/accessibility/hierarchy.hh \
\
core/abstract/image/bbox/hierarchy.hh \
\
core/abstract/image/dimension/1d.hh \
core/abstract/image/dimension/2d.hh \
core/abstract/image/dimension/3d.hh \
core/abstract/image/dimension/hierarchy.hh \
\
core/abstract/image/hybrid/classical.hh \
\
core/abstract/image/mutability/hierarchy.hh \
\
core/abstract/image/neighborhood/hierarchy.hh \
\
core/abstract/image/type/binary.hh \
core/abstract/image/type/color.hh \
core/abstract/image/type/data.hh \
core/abstract/image/type/grey_level.hh \
core/abstract/image/type/hierarchy.hh \
core/abstract/image/type/integre.hh \
core/abstract/image/type/label.hh \
\
core/abstract/image/all.hh \
core/abstract/image/hierarchies.hh \
\
core/abstract/internal/image_impl.hh \
\
core/abstract/point_set/all.hh \
core/abstract/point_set/hierarchies.hh \
core/abstract/point_set/point_set_being_connected.hh \
core/abstract/point_set/point_set_being_random_accessible.hh \
core/abstract/point_set/point_set_having_bbox.hh \
core/abstract/point_set/point_set_having_known_size.hh \
\
core/abstract/topology/all.hh \
core/abstract/topology/hierarchies.hh \
core/abstract/topology/topology_being_random_accessible.hh \
core/abstract/topology/topology_having_bbox.hh \
core/abstract/topology/topology_having_neighborhood.hh \
core/abstract/topology/topology_having_subset.hh \
\
core/abstract/any.hh \
core/abstract/bbox.hh \
core/abstract/dpoint.hh \
core/abstract/entry.hh \
core/abstract/fwd_decls.hh \
core/abstract/grid.hh \
core/abstract/image.hh \
core/abstract/iterator.hh \
core/abstract/iterator_on_points.hh \
core/abstract/neighborhood.hh \
core/abstract/point.hh \
core/abstract/point_set.hh \
core/abstract/topology.hh \
\
core/automatic/image.hh \
core/automatic/image_being_mutable.hh \
core/automatic/image_being_random_accessible.hh \
core/automatic/image_having_neighborhood.hh \
core/automatic/image_having_neighborhood.hh \
core/automatic/impl.hh \
core/automatic/topology_being_random_accessible.hh \
core/automatic/topology_having_bbox.hh \
core/automatic/topology_having_neighborhood.hh \
core/automatic/topology_having_subset.hh \
\
core/fwd_piter.hh \
\
core/gen/bbox.hh \
core/gen/bbox_bkd_piter.hh \
core/gen/bbox_fwd_piter.hh \
core/gen/bkd_piter_bbox.hh \
core/gen/fwd_niter_neighb.hh \
core/gen/fwd_piter_bbox.hh \
core/gen/fwd_qiter_win.hh \
core/gen/mapimage.hh \
core/gen/neighb.hh \
core/gen/topo_add_nbh.hh \
core/gen/topo_bbox.hh \
core/gen/topo_lbbox.hh \
core/gen/window.hh \
\
core/internal/bbox_bkd_piter.hh \
core/internal/bbox_fwd_piter.hh \
core/internal/dpoint_nd.hh \
core/internal/point_nd.hh \
core/internal/topology_morpher.hh \
core/internal/tracked_ptr.hh \
\
core/case.hh \
core/image_entry.hh \
core/macros.hh \
core/neighborhood_entry.hh \
core/point_set_entry.hh \
core/traits.hh \
core/traits_id.hh \
core/topology_entry.hh \
core/typedefs.hh \
core/type.hh \
\
debug/print.hh \
\
io/pnm.hh \
\
level/fill.hh \
\
morpher/internal/image_extension.hh \
\
morpher/add_neighborhood.hh \
morpher/identity.hh \
morpher/tags.hh \
\
basics1d.hh \
basics2d.hh \
basics3d.hh
......@@ -35,25 +35,18 @@
# include <oln/core/1d/grid1d.hh>
# include <oln/core/1d/point1d.hh>
namespace oln { template class point1d_<int>; }
# include <oln/core/1d/dpoint1d.hh>
namespace oln { template class dpoint1d_<int>; }
# include <oln/core/gen/bbox.hh>
namespace oln { template class bbox_<point1d>; }
# include <oln/core/gen/topo_lbbox.hh>
namespace oln { template class topo_lbbox_<point1d>; }
# include <oln/core/gen/fwd_piter_bbox.hh>
namespace oln { template class fwd_piter_bbox_<topo1d>; }
# include <oln/core/gen/bkd_piter_bbox.hh>
namespace oln { template class bkd_piter_bbox_<topo1d>; }
# include <oln/core/gen/neighb.hh>
namespace oln { template class neighb_<dpoint1d>; }
# include <oln/core/1d/neighb1d.hh>
# include <oln/core/1d/image1d.hh>
......
......@@ -38,7 +38,6 @@
# include <oln/core/2d/dpoint2d.hh>
# include <oln/core/gen/bbox.hh>
namespace oln { template class bbox_<point2d>; }
# include <oln/core/gen/topo_lbbox.hh>
......
......@@ -35,25 +35,18 @@
# include <oln/core/3d/grid3d.hh>
# include <oln/core/3d/point3d.hh>
namespace oln { template class point3d_<int>; }
# include <oln/core/3d/dpoint3d.hh>
namespace oln { template class dpoint3d_<int>; }
# include <oln/core/gen/bbox.hh>
namespace oln { template class bbox_<point3d>; }
# include <oln/core/gen/topo_lbbox.hh>
namespace oln { template class topo_lbbox_<point3d>; }
# include <oln/core/gen/fwd_piter_bbox.hh>
namespace oln { template class fwd_piter_bbox_<topo3d>; }
# include <oln/core/gen/bkd_piter_bbox.hh>
namespace oln { template class bkd_piter_bbox_<topo3d>; }
# include <oln/core/gen/neighb.hh>
namespace oln { template class neighb_<dpoint3d>; }
# include <oln/core/3d/neighb3d.hh>
# include <oln/core/3d/image3d.hh>
......
......@@ -32,6 +32,8 @@
# include <mlc/int.hh>
# include <oln/core/1d/point1d.hh>
# include <oln/core/internal/dpoint_nd.hh>
// For oln::dpoint1d and oln::dpoint1df.
# include <oln/core/1d/aliases.hh>
namespace oln
......@@ -95,4 +97,5 @@ namespace oln
} // end of namespace oln
#endif // ! OLN_CORE_1D_DPOINT1D_HH
......@@ -31,12 +31,21 @@
# include <oln/core/image_entry.hh>
# include <oln/core/1d/array1d.hh>
# include <oln/core/1d/point1d.hh>
# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
// For topo1d.
# include <oln/core/1d/aliases.hh>
namespace oln
{
// FIXME: Inexplicably, this explicit instantiation is required to
// have topo_lbbox_<point1d> work. See if we can get rid of it.
template class bbox_<point1d>;
// Forward declaration.
template <typename T> class image1d;
......
......@@ -30,7 +30,7 @@
# define OLN_CORE_1D_NEIGHB1D_HH
# include <oln/core/gen/neighb.hh>
# include <oln/core/1d/aliases.hh>
# include <oln/core/1d/dpoint1d.hh>
namespace oln
......
......@@ -31,6 +31,8 @@
# include <mlc/int.hh>
# include <oln/core/internal/point_nd.hh>
// For oln::point1d and oln::point1df.
# include <oln/core/1d/aliases.hh>
namespace oln
......@@ -102,7 +104,5 @@ namespace oln
} // end of namespace oln
# include <oln/core/1d/dpoint1d.hh>
#endif // ! OLN_CORE_1D_POINT1D_HH
......@@ -32,6 +32,8 @@
# include <mlc/int.hh>
# include <oln/core/2d/point2d.hh>
# include <oln/core/internal/dpoint_nd.hh>
// For oln::dpoint2d and oln::dpoint2df.
# include <oln/core/2d/aliases.hh>
namespace oln
......@@ -121,6 +123,7 @@ namespace oln
# endif
} // end of namespace oln
......
......@@ -31,12 +31,21 @@
# include <oln/core/image_entry.hh>
# include <oln/core/2d/array2d.hh>
# include <oln/core/2d/point2d.hh>
# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
// For topo2d.
# include <oln/core/2d/aliases.hh>
namespace oln
{
// FIXME: Inexplicably, this explicit instantiation is required to
// have topo_lbbox_<point2d> work. See if we can get rid of it.
template class bbox_<point2d>;
// Forward declaration.
template <typename T> class image2d;
......
......@@ -30,7 +30,7 @@
# define OLN_CORE_2D_NEIGHB2D_HH
# include <oln/core/gen/neighb.hh>
# include <oln/core/2d/aliases.hh>
# include <oln/core/2d/dpoint2d.hh>
namespace oln
......
......@@ -31,6 +31,8 @@
# include <mlc/int.hh>
# include <oln/core/internal/point_nd.hh>
// For oln::point2d and oln::point2df.
# include <oln/core/2d/aliases.hh>
namespace oln
......@@ -140,7 +142,5 @@ namespace oln
} // end of namespace oln
# include <oln/core/2d/dpoint2d.hh>
#endif // ! OLN_CORE_2D_POINT2D_HH
......@@ -32,6 +32,8 @@
# include <mlc/int.hh>
# include <oln/core/3d/point3d.hh>
# include <oln/core/internal/dpoint_nd.hh>
// For oln::dpoint3d and oln::dpoint3df.
# include <oln/core/3d/aliases.hh>
namespace oln
......
......@@ -31,12 +31,21 @@
# include <oln/core/image_entry.hh>
# include <oln/core/3d/array3d.hh>
# include <oln/core/3d/point3d.hh>
# include <oln/core/gen/topo_lbbox.hh>
# include <oln/core/internal/tracked_ptr.hh>
// For topo3d.
# include <oln/core/3d/aliases.hh>
namespace oln
{
// FIXME: Inexplicably, this explicit instantiation is required to
// have topo_lbbox_<point3d> work. See if we can get rid of it.
template class bbox_<point3d>;
// Forward declaration.
template <typename T> class image3d;
......
......@@ -30,7 +30,7 @@
# define OLN_CORE_3D_NEIGHB3D_HH
# include <oln/core/gen/neighb.hh>
# include <oln/core/3d/aliases.hh>
# include <oln/core/3d/dpoint3d.hh>
namespace oln
......
......@@ -31,6 +31,8 @@
# include <mlc/int.hh>
# include <oln/core/internal/point_nd.hh>
// For oln::point3d and oln::point3df.
# include <oln/core/3d/aliases.hh>
namespace oln
......@@ -108,7 +110,5 @@ namespace oln
} // end of namespace oln
# include <oln/core/3d/dpoint3d.hh>
#endif // ! OLN_CORE_3D_POINT3D_HH