- 17 Oct, 2006 4 commits
-
-
Thierry Geraud authored
Add forward declaration files. * oln/core/aliases.hh: New. * oln/core/fwd_decls.hh: New. * oln/core/1d/fwd_decls.hh: New. * oln/core/2d/fwd_decls.hh: New. * oln/core/3d/fwd_decls.hh: New. * oln/core/gen/fwd_decls.hh: New. * oln/morpher/fwd_decls.hh: New. * oln/debug/typename.hh: New. * oln/Makefile.am: Update. Sketch the mechanism for 'plain' and 'ch_value'. * oln/core/type_fun/plain.hh: New. * oln/core/type_fun/ch_value.hh: New. * oln/core/typedefs.hh (oln_plain, oln_plain_): New. * oln/core/image_entry.hh (concrete_type): Remove; obsolete. * oln/core/abstract/image.hh (topo, operator): Change sigs. (topo_t, psite_t, rvalue_t): Remove; now unused. (decl): Uncomment static checks. * oln/core/abstract/image/computability/hierarchy.hh (plain): New. * oln/core/1d/image1d.hh (real_type): Remove; obsolete. * oln/core/2d/image2d.hh: Likewise. * oln/core/3d/image3d.hh: Likewise. * oln/morpher/value_cast.hh (class): Change into struct for homogeneity for other morphers. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@656 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Replace the 'is_mutable' property by checking the 'lvalue' type. * oln/core/automatic/image/image_being_mutable.hh: Rename as... * oln/core/automatic/image/mutable_image.hh: ...this. (image_being_mutable): Rename as... (mutable_image): ...this. * oln/level/fill.hh: Update. * oln/core/typedefs.hh (is_mutable_type): Remove; obsolete. * oln/core/abstract/image/mutability/hierarchy.hh (include) : Update. (image_being_mutable): Rename as... (mutable_image): ...this. (case_): Rely now on mlc_is_ok(oln_lvalue(E)). * oln/core/1d/image1d.hh: Update. * oln/core/2d/image2d.hh: Update. * oln/core/3d/image3d.hh: Update. * oln/core/gen/mapimage.hh: Update. * oln/morpher/value_cast.hh: Update. * oln/morpher/thru_fun.hh: Update. * oln/morpher/internal/image_value_morpher.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@652 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add computability image hierarchy. * oln/core/abstract/image/computability: New. * oln/core/abstract/image/computability/hierarchy.hh: New. * oln/core/typedefs.hh (is_computed_type): New. * oln/core/image_entry.hh (is_computed_type): New in vtypes. * oln/core/abstract/image.hh (decl): Update. * oln/core/abstract/image/hierarchies.hh (image_hierarchy_wrt_computability): New. (hierarchy): Update ids. * oln/core/abstract/image/all.hh (include): Add computability/hierarchy.hh. * oln/core/1d/image1d.hh: Update. * oln/core/2d/image2d.hh: Likewise. * oln/core/3d/image3d.hh: Likewise. * oln/core/gen/mapimage.hh: Likewise. * oln/morpher/value_cast.hh: Likewise. * oln/morpher/thru_fun.hh: Likewise. * oln/morpher/internal/image_value_morpher.hh: Likewise. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@651 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Adjust lvalue so that it handles a '&' when needed. * oln/core/automatic/image/image1d.hh (impl_at): Adjust. * oln/core/automatic/image/image2d.hh: Likewise. * oln/core/automatic/image/image3d.hh: Likewise. * oln/core/automatic/image/image_being_mutable.hh: Likewise. * oln/core/abstract/image/mutability/hierarchy.hh: Likewise. * oln/core/abstract/image/dimension/1d.hh: Likewise. * oln/core/abstract/image/dimension/2d.hh: Likewise. * oln/core/abstract/image/dimension/3d.hh: Likewise. * oln/core/1d/image1d.hh: Likewise. * oln/core/2d/image2d.hh: Likewise. * oln/core/3d/image3d.hh: Likewise. * oln/core/gen/mapimage.hh: Likewise. * oln/core/abstract/image/type/integre.hh: Fix case number wrt those defined in hierarchy.hh. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@650 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 16 Oct, 2006 4 commits
-
-
Roland Levillain authored
* oln/core/gen/bbox.hh (oln::bbox_::self_t): Rename as... (oln::bbox_::self_type): ...this. Make it public. (oln::bbox_::super_t): Adjust. * oln/core/gen/topo_lbbox.hh (vtypes< topo_lbbox_<point> >::bbox_type): Adjust. * oln/core/gen/topo_bbox.hh (oln::vtypes< topo_lbbox_<point> >): Define this virtul type using `bbox_<point>::self_t' instead of just `bbox_<point>' to force the instiantiation of oln::bbox_<point> at this point. (oln::topo_bbox_<point>::bbox_t): Use oln_type_of to define it. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@648 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
=================================================================== --- ChangeLog (revision 644) +++ ChangeLog (working copy) @@ -1,5 +1,20 @@ 2006-10-16 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> + Add binary value type plus update image hierarchy plugs. + + * oln/value/tags.hh: New. + * oln/value/bin.hh: New. + * oln/value/all.hh: New. + * oln/core/abstract/image/type/hierarchy.hh (case_): Rely on value + tags. + (case_): Overload to handle other value types. + (include): Update. + * oln/value/greylevel.hh (greylevel_): New conversion operator. + (gl1): Remove; now replaced by value::bin. + * oln/Makefile.am: Update. + +2006-10-16 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> + Add grey-level types. * tests/grey.cc: New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@645 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add grey-level types. * tests/grey.cc: New. * tests/Makefile.am: Update. * oln/value/default.hh: New. * oln/value/greylevel.hh: New. * oln/Makefile.am: Update. * oln/core/abstract/value.hh (value): Remove inheritance so that a value type is not a regular oln type. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@644 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/gen/topo_lbbox.hh (oln::vtypes< topo_lbbox_<point> >): Define this virtul type using `bbox_<point>::self_t' instead of just `bbox_<point>' to force the instiantiation of oln::bbox_<point> at this point. (oln::topo_lbbox_<point>::bbox_t): Use oln_type_of to define it (more of an aesthetic change than a functional change). * oln/core/1d/bbox1d.hh, oln/core/2d/bbox2d.hh, * oln/core/3d/bbox3d.hh: Remove. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh, * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh: Remove their inclusions. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@641 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 13 Oct, 2006 5 commits
-
-
Roland Levillain authored
* oln/core/iterator_vtypes.hh (oln::bkd_niter_neighb_): New forward declaration. (single_vtype<morpher::add_neighborhood<Image, Neighb>, typedef_::bkd_niter_type >): Fix ret. Add comments. Aesthetic changes. * oln/morpher/add_neighborhood.hh (oln/core/gen/bkd_niter_neighb.hh): Include it. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@640 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/gen/bkd_niter_neighb.hh, * oln/core/gen/bkd_qiter_win.hh: New. * oln/core/gen/fwd_niter_neighb.hh (oln::fwd_niter_neighb_<point_t>::fwd_niter_neighb_) (oln::fwd_niter_neighb_<point_t>::impl_next) * oln/core/gen/fwd_qiter_win.hh (oln::fwd_qiter_win_<point_t>::fwd_qiter_win_) (oln::fwd_qiter_win_<point_t>::impl_next): Initialize i_ using this->invalidate(). * oln/core/1d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter1d): New typedef. * oln/core/2d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter2d): New typedef. * oln/core/3d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter3d): New typedef. * oln/core/iterator_vtypes.hh (oln::single_vtype<image1d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image2d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image3d<T>, typedef_::bkd_qiter_type>): New vtypes. * oln/basics1d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): * oln/basics2d.hh (oln/core/gen/bkd_qiter_win.hh) * oln/basics3d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): Include them. * oln/Makefile.am (nobase_oln_HEADERS): Add core/gen/bkd_niter_neighb.hh and core/gen/bkd_qiter_win.hh. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@639 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/abstract/image/hybrid/classical.hh: Add documentation. * oln/core/abstract/image/dimension/hierarchy.hh, * oln/core/abstract/image/type/hierarchy.hh: Update documentation. * oln/core/abstract/image/neighborhood/hierarchy.hh: Remove dead comments. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@638 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh: Remove. * oln/core/gen/grid.hh: New file. * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh: Include it. * oln/core/1d/aliases.hh (oln::grid_): Declare it. (oln::grid1d): Adjust definition. * oln/core/2d/aliases.hh (oln::grid_): Declare it. (oln::grid2d): Adjust definition. * oln/core/3d/aliases.hh (oln::grid_): Declare it. (oln::grid3d): Adjust definition. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh, * oln/core/abstract/image/dimension/hierarchy.hh, * oln/core/abstract/image/hybrid/classical.hh, * oln/core/abstract/point_set/point_set_being_connected.hh, * oln/Makefile.am, * tests/grid.cc: Adjust. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@637 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/automatic/image.hh, * oln/core/automatic/image1d.hh, * oln/core/automatic/image2d.hh, * oln/core/automatic/image3d.hh, * oln/core/automatic/image_being_mutable.hh, * oln/core/automatic/image_being_random_accessible.hh, * oln/core/automatic/image_having_neighborhood.hh, * oln/core/automatic/topology_being_random_accessible.hh, * oln/core/automatic/topology_having_bbox.hh, * oln/core/automatic/topology_having_neighborhood.hh, * oln/core/automatic/topology_having_subset.hh: Move... * oln/core/automatic/image/image.hh, * oln/core/automatic/image/image1d.hh, * oln/core/automatic/image/image2d.hh, * oln/core/automatic/image/image3d.hh, * oln/core/automatic/image/image_being_mutable.hh, * oln/core/automatic/image/image_being_random_accessible.hh, * oln/core/automatic/image/image_having_neighborhood.hh, * oln/core/automatic/topology/topology_being_random_accessible.hh, * oln/core/automatic/topology/topology_having_bbox.hh, * oln/core/automatic/topology/topology_having_neighborhood.hh * oln/core/automatic/topology/topology_having_subset.hh: ...here. * oln/core/abstract/image.hh, * oln/core/abstract/image/accessibility/hierarchy.hh, * oln/core/abstract/image/dimension/1d.hh, * oln/core/abstract/image/dimension/2d.hh, * oln/core/abstract/image/dimension/3d.hh, * oln/core/abstract/image/mutability/hierarchy.hh, * oln/core/abstract/image/neighborhood/hierarchy.hh, * 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, * oln/level/fill.hh, oln/Makefile.am: Adjust paths. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@634 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 12 Oct, 2006 10 commits
-
-
Roland Levillain authored
* oln/core/image_entry.hh (oln::single_vtype<image_entry<E>, typedef_::bkd_qiter_type>): New. * oln/core/iterator_vtypes.hh (oln::single_vtype<image1d<T>, typedef_::fwd_qiter_type>) (oln::single_vtype<image2d<T>, typedef_::fwd_qiter_type>) (oln::single_vtype<image3d<T>, typedef_::fwd_qiter_type>): New. Aesthetic changes. * oln/core/1d/aliases.hh (oln::window_) (oln::fwd_qiter_win_, oln::bkd_qiter_win_): New forward declarations. (oln::window1d, oln::fwd_qiter1d): New typedefs. * oln/core/3d/aliases.hh (oln::window_) (oln::fwd_qiter_win_, oln::bkd_qiter_win_): New forward declarations. (oln::window3d, oln::fwd_qiter3d): New typedefs. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@632 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add image accessors with indices. * tests/at.cc: New. * oln/core/automatic/image1d.hh: New. * oln/core/automatic/image2d.hh: New. * oln/core/automatic/image3d.hh: New. * tests/Makefile.am (check_PROGRAMS): Add 'at'. Move io_pnm to get consistent with SOURCES list. (at_SOURCES): New. * oln/core/typedefs.hh (oln_psite, oln_psite_): New. * oln/core/automatic/image_being_mutable.hh (lvalue_t, psite_t): Remove; use oln_lvalue and oln_psite instead. (impl_op_readwrite): Update sig. * oln/core/abstract/image/dimension/1d.hh (at): New const method. (at, has_at): New methods that should be elsewhere; this is a hack. (image1d): Move ctor impl inside guards. * oln/core/abstract/image/dimension/2d.hh (at): New const method. (at, has_at): New methods that should be elsewhere; this is a hack. (image2d): Move ctor impl inside guards. * oln/core/abstract/image/dimension/3d.hh (at): New const method. (at, has_at): New methods that should be elsewhere; this is a hack. (image3d): Move ctor impl inside guards. * oln/core/abstract/point.hh (include): Add xtd/vec.hh. * oln/core/1d/neighb1d.hh (mk_c2): Update to mimic neighb2d. * oln/core/2d/image2d.hh (impl_at): New. * oln/core/3d/image3d.hh (impl_at): New. * oln/Makefile.am (nobase_oln_HEADERS): Update. * oln/morpher/internal/image_extension.hh (delegate): New mutable version. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@630 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/spe/row.hh, oln/core/spe/col.hh, oln/core/spe/slice.hh (oln/core/abstract/point_set/point_set_having_bbox.hh) (oln/core/abstract/image/bbox/hierarchy.hh): Include them. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@629 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/iterator_vtypes.hh: ...this. Adjust header guards. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh, * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh, oln/core/internal/bbox_bkd_piter.hh, * oln/core/internal/bbox_fwd_piter.hh, oln/io/pnm.hh, * oln/morpher/add_neighborhood.hh: Adjust. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@628 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/3d/aliases.hh (oln::fwd_piter3d, oln::bkd_piter3d): Fix their definitions. * oln/core/3d/neighb3d.hh (c6, c18, c26) (c4_slice, c8_slice, c4_row, c8_row, c4_col, c8_col): Rename as... (mk_c6, mk_c18, mk_c26, mk_c4_slice, mk_c8_slice) (mk_c4_row, mk_c8_row, mk_c4_col, mk_c8_col): ...these. (c6, c18, c26, c4_slice, c8_slice, c4_row, c8_row) (c4_col, c8_col): New objects. * oln/core/3d/array3d.hh, oln/core/3d/dpoint3d.hh, * oln/core/3d/image3d.hh, oln/core/3d/neighb3d.hh, * oln/core/3d/point3d.hh: Separate the interface of the methods and functions from their implementation. * oln/core/3d/image3d.hh (oln::vtypes< image3d<T> >): Set topo_type to topo3d. (bbox_<point3d>): Move explicit instantiation... * oln/basics3d.hh: ...here (oln/core/fwd_piter.hh): Include it. * oln/core/3d/image3d.hh: Move the definition of the virtual types fwd_piter and bkd_piter of oln::image3d... * oln/core/fwd_piter.hh: ...here. * oln/core/abstract/image/hybrid/classical.hh (oln::abstract:classical_3d_image): New. (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 3>): Rename as... (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 4>): ...this. (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 3>): New. Handle 3D case. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@627 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/basics1d.hh (bbox_<point1d>): Move explicit instantiation... * oln/core/1d/bbox1d.hh: ...here (new file). * oln/core/1d/image1d.hh: Include it. * oln/basics2d.hh (bbox_<point2d>): Move explicit instantiation... * oln/core/2d/bbox2d.hh: ...here (new file). * oln/core/2d/image2d.hh: Include it. * oln/core/3d/bbox3d.hh: New file. * oln/basics3d.hh, oln/core/3d/image3d.hh: Include it. * oln/Makefile.am (nobase_oln_HEADERS): Add core/1d/bbox1d.hh, core/2d/bbox2d.hh and core/3d/bbox3d.hh. * oln/core/2d/array2d.hh: Aesthetic changes. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@626 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/2d/image2d.hh (oln::vtypes< image2d<T> >): Set topo_type to topo2d. * oln/core/2d/image2d.hh (bbox_<point2d>): Move explicit instantiation... * oln/basics2d.hh: ...here git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@624 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/1d/aliases.hh (oln::fwd_piter1d, oln::bkd_piter1d): Fix their definitions. * oln/core/1d/neighb1d.hh (oln::c2): Rename as... (oln::mk_c2): ...this. (c2): New object. * oln/core/1d/array1d.hh, oln/core/1d/dpoint1d.hh, * oln/core/1d/image1d.hh, oln/core/1d/neighb1d.hh, * oln/core/1d/point1d.hh: Separate the interface of the methods and functions from their implementation. * oln/core/1d/image1d.hh (oln::vtypes< image1d<T> >): Set topo_type to topo1d. (bbox_<point1d>): Move explicit instantiation... * oln/basics1d.hh: ...here (oln/core/fwd_piter.hh): Include it. * oln/core/1d/image1d.hh: Move the definition of the virtual types fwd_piter and bkd_piter of oln::image1d... * oln/core/fwd_piter.hh: ...here. * oln/core/abstract/image/hybrid/classical.hh (oln::abstract:classical_1d_image) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 1>) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 2>): Rename as... (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 2>) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 3>): ...these. (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 1>): New. Handle 1D case. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@623 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/abstract/image/dimension/2d.hh * oln/core/abstract/image/dimension/3d.hh * oln/core/abstract/image/dimension/hierarchy.hh * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh, oln/core/2d/array2d.hh, * oln/core/2d/dpoint2d.hh, oln/core/2d/point2d.hh, * tests/image1d.cc, tests/image2d.cc, tests/image3d.cc, * tests/image_entry.cc, tests/io_pnm.cc, tests/Makefile.am: Aesthetic changes. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@622 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/gen/topo_bbox.hh (oln::topo_bbox_<point>) * oln/core/gen/topo_lbbox.hh (oln::topo_lbbox_<point>): Ensure parameter point is an oln::abstract::point. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@621 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 11 Oct, 2006 3 commits
-
-
Thierry Geraud authored
Add new facilities to access to components such as row, col, etc. * oln/core/spe/row.hh: New. * oln/core/spe/col.hh: New. * oln/core/spe/slice.hh: New. * oln/debug/print.hh (print): Use min_row, etc. (include): Update. * oln/core/typedefs.hh (index_comp_type): New. (row_comp_type, col_comp_type, slice_comp_type): New. (vec_type): New. * oln/core/abstract/iterator_on_points.hh (coord_type): New. * oln/core/abstract/point.hh (vec_type): New. (vec): New. * oln/core/1d/dpoint1d.hh (index_comp_type): New. * oln/core/1d/point1d.hh (index_comp_type): New. * oln/core/2d/dpoint2d.hh (row_comp_type, col_comp_type): New. * oln/core/2d/point2d.hh (row_comp_type, col_comp_type): New. * oln/core/3d/dpoint3d.hh (slice_comp_type, row_comp_type, col_comp_type): New. * oln/core/3d/point3d.hh (slice_comp_type, row_comp_type, col_comp_type): New. * oln/core/internal/point_nd.hh (vec_t): New. (vec): Rename as... (impl_vec): this. * oln/basics2d.hh (include): Update. * oln/basics3d.hh (include): Update. * oln/Makefile.am (nobase_oln_HEADERS): Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@620 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
New facilities related to windows and q-iterators. * tests/window2d.cc: New. * tests/Makefile.am (window2d_SOURCES): New. * oln/debug/print.hh (format): New. (print): Update; use format to correctly print 'unsigned char'. * oln/level/fill.hh: Separate header and implementation. (fill): Use shortcut. * oln/core/typedefs.hh: New shortcuts oln_something(T) for oln_type_of(T, something). * oln/core/fwd_piter.hh (fwd_qiter_type): New. * oln/core/abstract/window.hh: New. * oln/core/2d/aliases.hh (window2d, fwd_qiter2d): New. * oln/core/gen/fwd_qiter_win.hh (include): Add abstract::window.hh. (fwd_qiter_win_): Update ctor signature. * oln/core/gen/window.hh (grid_type): New. (window_): Add inheritance from abstract::window. (impl_is_valid): New. (include): Update. * oln/basics2d.hh (include): Add window.hh and fwd_qiter_win.hh. * oln/Makefile.am (nobase_oln_HEADERS): Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@619 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add some tools related to morphers over image value. * oln/core/abstract/value.hh: New. * oln/morpher/thru_fun.hh: New. * oln/morpher/internal/image_value_morpher.hh: New. * oln/color: New. * oln/color/rgb.hh: New. * tests/Makefile.am (check_PROGRAMS): Reorganize. (io_pnm_SOURCES): New. * oln/core/abstract/grid.hh (grid): Add inheritance from oln::type. * oln/Makefile.am (nobase_oln_HEADERS): Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@618 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 10 Oct, 2006 2 commits
-
-
Roland Levillain authored
* 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
-
Thierry Geraud authored
Add i/o read for pbm and pgm formats. * tests/io_pnm.cc: New. * tests/Makefile.am (check_PROGRAMS): Update. * oln/io: New directory. * oln/io/pnm.hh: New. * oln/core/image_entry.hh (coord_type): New single_vtype. * oln/core/abstract/image.hh (decl): New comment. * oln/core/2d/image2d.hh (adr_at): New. * oln/basics2d.hh (include): Add fwd_piter.hh. * oln/Makefile.am (nobase_oln_HEADERS): Update. * img: New directory. * img/chien.pbm: New. * img/lena32.pgm: New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@615 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 09 Oct, 2006 4 commits
-
-
Thierry Geraud authored
* oln/core/internal/tracked_ptr.hh (operator bool): Fix signature. (operator bool): Add line to remove warning. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@614 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Change stc_virtual_typedef into oln_virtual_typedef. * oln/core/macros.hh (oln_virtual_typedef): New macro. It replaces stc_virtual_typedef. * oln/core/abstract/image.hh: Update. * oln/core/abstract/image/mutability/hierarchy.hh: Update. * oln/core/abstract/image/neighborhood/hierarchy.hh: Update. * oln/core/abstract/image/bbox/hierarchy.hh: Update. * oln/core/abstract/point_set.hh: Update. * oln/core/abstract/neighborhood.hh: Update. * oln/core/abstract/topology.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@611 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
* oln/debug/print.hh: Separate definition from declaration. * oln/core/automatic/topology_being_random_accessible.hh (impl_has_large): Fix signature. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@610 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Separate definition code from declaration code in olena. * oln/core/type.hh: Split code. * oln/core/point_set_entry.hh: Likewise. * oln/core/automatic/image.hh: Likewise. * oln/core/automatic/topology_having_bbox.hh: Likewise. * oln/core/automatic/image_being_random_accessible.hh: Likewise. * oln/core/automatic/image_having_neighborhood.hh: Likewise. * oln/core/automatic/topology_being_random_accessible.hh: Likewise. * oln/core/automatic/topology_having_subset.hh: Likewise. * oln/core/automatic/image_being_mutable.hh: Likewise. * oln/core/automatic/topology_having_neighborhood.hh: Likewise. * oln/core/neighborhood_entry.hh: Likewise. * oln/core/topology_entry.hh: Likewise. * oln/core/image_entry.hh: Likewise. * oln/core/abstract/iterator_on_points.hh: Likewise. * oln/core/abstract/topology_having_bbox.hh: Likewise. * oln/core/abstract/image.hh: Likewise. * oln/core/abstract/image/type/binary.hh: Likewise. * oln/core/abstract/image/type/data.hh: Likewise. * oln/core/abstract/image/type/grey_level.hh: Likewise. * oln/core/abstract/image/type/color.hh: Likewise. * oln/core/abstract/image/type/label.hh: Likewise. * oln/core/abstract/image/hybrid/classical.hh: Likewise. * oln/core/abstract/image/mutability/hierarchy.hh: Likewise. * oln/core/abstract/image/dimension/2d.hh: Likewise. * oln/core/abstract/image/neighborhood/hierarchy.hh: Likewise. * oln/core/abstract/image/accessibility/hierarchy.hh: Likewise. * oln/core/abstract/image/bbox/hierarchy.hh: Likewise. * oln/core/abstract/point_set_being_random_accessible.hh: Likewise. * oln/core/abstract/grid.hh: Likewise. * oln/core/abstract/iterator.hh: Likewise. * oln/core/abstract/point.hh: Likewise. * oln/core/abstract/bbox.hh: Likewise. * oln/core/abstract/point_set_being_connected.hh: Likewise. * oln/core/abstract/dpoint.hh: Likewise. * oln/core/abstract/topology_being_random_accessible.hh: Likewise. * oln/core/abstract/topology_having_subset.hh: Likewise. * oln/core/abstract/topology_having_neighborhood.hh: Likewise. * oln/core/abstract/entry.hh: Likewise. * oln/core/abstract/point_set.hh: Likewise. * oln/core/abstract/point_set_having_known_size.hh: Likewise. * oln/core/abstract/neighborhood.hh: Likewise. * oln/core/abstract/point_set_having_bbox.hh: Likewise. * oln/core/abstract/topology.hh: Likewise. * oln/core/2d/neighb2d.hh: Likewise. * oln/core/2d/dpoint2d.hh: Likewise. * oln/core/2d/array2d.hh: Likewise. * oln/core/2d/image2d.hh: Likewise. * oln/core/2d/point2d.hh: Likewise. * oln/core/gen/piter_isubset.hh: Likewise. * oln/core/gen/topo_add_isubset.hh: Likewise. * oln/core/gen/bbox.hh: Likewise. * oln/core/gen/topo_bbox.hh: Likewise. * oln/core/gen/neighb.hh: Likewise. * oln/core/gen/fwd_piter_bbox.hh: Likewise. * oln/core/gen/bbox_fwd_piter.hh: Likewise. * oln/core/gen/fwd_niter_neighb.hh: Likewise. * oln/core/gen/fwd_qiter_win.hh: Likewise. * oln/core/gen/topo_lbbox.hh: Likewise. * oln/core/gen/window.hh: Likewise. * oln/core/gen/bbox_bkd_piter.hh: Likewise. * oln/core/gen/bkd_piter_bbox.hh: Likewise. * oln/core/gen/topo_add_nbh.hh: Likewise. * oln/core/gen/mapimage.hh: Likewise. * oln/core/internal/tracked_ptr.hh: Likewise. * oln/core/internal/topology_morpher.hh: Likewise. * oln/core/internal/point_nd.hh: Likewise. * oln/core/internal/bbox_bkd_piter.hh: Likewise. * oln/core/internal/bbox_fwd_piter.hh: Likewise. * oln/core/internal/dpoint_nd.hh: Likewise. * oln/basics2d.hh: Likewise. * oln/morpher/add_isubset.hh: Likewise. * oln/morpher/identity.hh: Likewise. * oln/morpher/internal/image_extension.hh: Likewise. * oln/morpher/add_neighborhood.hh: Likewise. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@608 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 05 Oct, 2006 1 commit
-
-
Thierry Geraud authored
Decouple iterators from image topology; update neighborhood tools and start to add window tools. * oln/core/automatic/topology_having_subset.hh: New. * oln/core/abstract/topology_having_subset.hh: New. * oln/core/gen/fwd_niter_neighb.hh: New. * oln/core/gen/fwd_qiter_win.hh: New. * oln/core/gen/window.hh: New. * oln/core/typedefs.hh (qiter_type, fwd_qiter_type, bkd_qiter_type): Uncomment. (niter_type, fwd_niter_type, bkd_niter_type): Uncomment. (isubset): Rename into... (subset_type): ...this. * oln/core/macros.hh (oln_type_of, oln_deduce_type_of, oln_type_of_): Rely on direct access. (oln_check_type_of, oln_check_type_of_): Rely on direct access. (oln_deduce_direct_type_of): New. * oln/core/topology_entry.hh (subset_type): New. * oln/core/image_entry.hh (fwd_piter_type, bkd_piter_type): Move from vtypes to single_vtype. (fwd_qiter_type): New. * oln/core/abstract/topology_hierarchies.hh (topology_hierarchy_wrt_subset): New. (include): Add topology_having_subset.hh. * oln/core/abstract/image/neighborhood/hierarchy.hh (niter, fwd_niter, bkd_niter): New in decl. * oln/core/2d/aliases.hh (fwd_piter_bbox_, bkd_piter_bbox_): Change param letter. (fwd_piter2d, bkd_piter2d): Update. * oln/core/2d/neighb2d.hh (c4, c8, c2_row, c2_col): Rename into... (mk_c4, mk_c8, mk_c2_row, mk_c2_col): ...these in namespace internal. (c4, c8, c2r, c2c): New objects. * oln/core/gen/piter_isubset.hh (piter_isubset_): New ctor for iterators around a point. (topo): Return a copy. (change_topology_): Remove; obsolete. * oln/core/gen/topo_add_isubset.hh (isubset_type): Rename into... (subset_type): ...this. (isubset): Rename into... (impl_subset): ...this. * oln/core/gen/topo_bbox.hh (impl_lbbox): New; experimental! * oln/core/gen/fwd_piter_bbox.hh (fwd_piter_bbox_): Change parameter from topo to point; update. (topo): Remove this method; obsolete. (change_topology_): Remove; obsolete. (topo_): Remove this attribute; obsolete. * oln/core/gen/bkd_piter_bbox.hh: Likewise. * oln/basics2d.hh: Update. * oln/Makefile.am (nobase_oln_HEADERS): Update. * oln/core/2d/image2d.hh (fwd_piter_type, bkd_piter_type): Move these definitions into... * oln/core/fwd_piter.hh: ... this new file. * oln/morpher/add_isubset.hh: Likewise. * oln/morpher/add_neighborhood.hh: Likewise. * oln/morpher/internal/image_extension.hh (image_): Change from const& to plain type. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@607 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 03 Oct, 2006 3 commits
-
-
Roland Levillain authored
* oln/core/3d/image3d.hh, oln/core/3d/array3d.hh, * oln/core/3d/point3d.hh, oln/core/3d/dpoint3d.hh, * oln/core/3d/neighb3d.hh, oln/core/3d/aliases.hh, * oln/basics3d.hh: New. * oln/core/abstract/point_set_being_connected.hh (oln::abstract::point_set_being_3d_connected): New class. (oln::case_<point_set_hierarchy_wrt_connectivity, E, 3>): New case. * tests/image3d.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add image3d. (image3d_SOURCES): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@605 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/1d/image1d.hh, oln/core/1d/array1d.hh, * oln/core/1d/point1d.hh, oln/core/1d/dpoint1d.hh, * oln/core/1d/neighb1d.hh, oln/core/1d/aliases.hh, * oln/basics1d.hh: New. * oln/core/abstract/point_set_being_connected.hh (oln::abstract::point_set_being_1d_connected): New class. (oln::case_<point_set_hierarchy_wrt_connectivity, E, 1>): Handle the 1-dimension case, and move the 2-dimension case... (oln::case_<point_set_hierarchy_wrt_connectivity, E, 2>): ...here (new). * tests/image1d.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add image1d. (image1d_SOURCES): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@604 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/2d/image2d.hh (image2d(unsigned, unsigned, unsigned)): Allocate space for the border in the array. * oln/core/2d/point2d.hh, oln/core/typedefs.hh: Add FIXMEs. * oln/core/2d/neighb2d.hh, oln/core/2d/dpoint2d.hh, * oln/core/internal/point_nd.hh: Aesthetic changes. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@602 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 02 Oct, 2006 3 commits
-
-
Roland Levillain authored
* oln/core/2d/array2d.hh (oln::tracked_ptr): Move... * oln/core/internal/tracked_ptr.hh: ...here (new file). * oln/core/2d/image2d.hh (oln::image2d::data_): Adjust type. (oln::image2d(const topo2d&)): New ctor. * tests/image2d.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add image2d. (image2d_SOURCES): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@600 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/2d/point2d.hh (oln::set_super_type< point2d_<C> >): New. (oln::point2d_): Use stc_get_supers to set the base class. (oln::point2d_::super_t): Use stc_get_super to define it. (oln::point2d_::point2d_(coord_t, coord_t)): Use xtd::mk_vec to initialize the base class. * oln/core/2d/dpoint2d.hh (oln::set_super_type< dpoint2d_<C> >): Re-enable it. (oln::dpoint2d_): Use stc_get_supers to set the base class. (oln::dpoint2d_::super_t): Use stc_get_super to define it. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@598 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add isubset image morpher and subsequent tools. * oln/core/gen/piter_isubset.hh: New. * oln/core/gen/topo_add_isubset.hh: New. * oln/morpher/add_isubset.hh: New. * oln/debug/print.hh (println): New. * oln/core/typedefs.hh (isubset): New. * oln/core/automatic/image_being_random_accessible.hh (set_impl): Remove; cause error-prone. * oln/core/abstract/image/type/hierarchy.hh (where_): Rely on xtd_is_binary instead of an hard-coded test. (include): Update. * oln/core/gen/fwd_piter_bbox.hh (topo_type): new. (topo_): Change ref into plain type so it is more secure. * oln/core/gen/bkd_piter_bbox.hh (topo_type): new. (topo_): Change ref into plain type so it is more secure. * oln/core/gen/topo_add_nbh.hh (operator topo_t): New. * oln/core/internal/topology_morpher.hh (delegated_type): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@597 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 28 Sep, 2006 1 commit
-
-
Roland Levillain authored
implementations. * oln/core/automatic/impl.hh: New. * oln/automatic/image.hh: Move... * oln/core/automatic/image.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_being_mutable.hh: Move... * oln/core/automatic/image_being_mutable.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_being_random_accessible.hh: Move... * oln/core/automatic/image_being_random_accessible.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_having_neighborhood.hh: Move... * oln/core/automatic/image_having_neighborhood.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_being_random_accessible.hh: Move... * oln/core/automatic/topology_being_random_accessible.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_having_bbox.hh: Move... * oln/core/automatic/topology_having_bbox.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_having_neighborhood.hh: Move... * oln/core/automatic/topology_having_neighborhood.hh: ...here. (impl): Rename as... (set_impl): ...this. Adjust. * oln/core/abstract/image.hh (oln::abstract::image) * oln/core/abstract/image/accessibility/hierarchy.hh (oln::abstract::image_being_random_accessible) * oln/core/abstract/image/bbox/hierarchy.hh (oln::abstract::image_having_bbox) * oln/core/abstract/image/dimension/1d.hh (oln::abstract::image1d) * oln/core/abstract/image/dimension/2d.hh (oln::abstract::image2d) * oln/core/abstract/image/dimension/3d.hh (oln::abstract::image3d) * oln/core/abstract/image/mutability/hierarchy.hh (oln::abstract::image_being_mutable) * oln/core/abstract/image/neighborhood/hierarchy.hh (oln::abstract::image_having_neighborhood) * oln/core/abstract/topology_being_random_accessible.hh (oln::abstract::topology_being_random_accessible) * oln/core/abstract/topology_having_bbox.hh (oln::abstract::topology_having_bbox) * oln/core/abstract/topology_having_neighborhood.hh (oln::abstract::topology_having_neighborhood): Adjust. * oln/Makefile.am (nobase_oln_HEADERS): Adjust. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@584 4aad255d-cdde-0310-9447-f3009e2ae8c0
-