* mln/core/alias/complex_geometry.hh (mln::discrete_plane_2complex_geometry) * mln/core/alias/complex_image.hh (mln::int_u8_2complex_image2d): New typedefs. Typos & aesthetic changes. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/alias/complex_geometry.hh | 7 ++++++- milena/mln/core/alias/complex_image.hh | 20 ++++++++++++++++++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa168d3..0f3bc29 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-12-30 Roland Levillain <roland@lrde.epita.fr> + More complex-related aliases. + + * mln/core/alias/complex_geometry.hh + (mln::discrete_plane_2complex_geometry) + * mln/core/alias/complex_image.hh + (mln::int_u8_2complex_image2d): + New typedefs. + Typos & aesthetic changes. + +2008-12-30 Roland Levillain <roland@lrde.epita.fr> + Clean up apps/statues/ a bit. * apps/statues/mesh-max-curv.cc, apps/statues/mesh-pinv-curv.cc, diff --git a/milena/mln/core/alias/complex_geometry.hh b/milena/mln/core/alias/complex_geometry.hh index d4e3a75..44fa899 100644 --- a/milena/mln/core/alias/complex_geometry.hh +++ b/milena/mln/core/alias/complex_geometry.hh @@ -40,8 +40,13 @@ namespace mln { /// \brief Type alias for the geometry of a 2-complex located in a + /// discrete 2-dimensional plane (with integer coordinates). + typedef mln::geom::complex_geometry<2, point2d> + discrete_plane_2complex_geometry; + + /// \brief Type alias for the geometry of a 2-complex located in a /// 3-dimensional space (with floating-point coordinates). - typedef mln::geom::complex_geometry<2,point3df> space_2complex_geometry; + typedef mln::geom::complex_geometry<2, point3df> space_2complex_geometry; } // end of namespace mln diff --git a/milena/mln/core/alias/complex_image.hh b/milena/mln/core/alias/complex_image.hh index 6336d6b..0d8e379 100644 --- a/milena/mln/core/alias/complex_image.hh +++ b/milena/mln/core/alias/complex_image.hh @@ -40,6 +40,22 @@ namespace mln { + /*------------------------------. + | 2-d plane 2-complex aliases. | + `------------------------------*/ + + /// \brief Type alias for an 8-bit gray-level image based on a + /// 2-complex, where 0-faces are located at discrete (integer) + /// 2-dimensional points. + typedef + mln::complex_image<2, mln::discrete_plane_2complex_geometry, + mln::value::int_u8> + int_u8_2complex_image2d; + + + /*------------------------------. + | 3-d space 2-complex aliases. | + `------------------------------*/ /// \brief Type alias for a binary image based on a 2-complex, where /// 0-faces are located at floating-point 3-dimensional points. @@ -47,14 +63,14 @@ namespace mln mln::complex_image<2, mln::space_2complex_geometry, bool> bin_2complex_image3df; - /// \brief Type alias for an 8-bit grey-level image based on a + /// \brief Type alias for an 8-bit gray-level image based on a /// 2-complex, where 0-faces are located at floating-point /// 3-dimensional points. typedef mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> int_u8_2complex_image3df; - /// \brief Type alias for a grey-level image based on a 2-complex, + /// \brief Type alias for a gray-level image based on a 2-complex, /// where 0-faces are located at floating-point 3-dimensional /// points. typedef -- 1.6.0.4