* mln/value/int_s24.hh, * mln/value/int_u24.hh: New. --- milena/ChangeLog | 8 ++++++++ milena/headers.mk | 2 ++ milena/mln/value/{int_s32.hh => int_s24.hh} | 20 ++++++++------------ milena/mln/value/{int_u8.hh => int_u24.hh} | 17 +++++++---------- milena/tests/unit_test/unit-tests.mk | 4 ++++ 5 files changed, 29 insertions(+), 22 deletions(-) copy milena/mln/value/{int_s32.hh => int_s24.hh} (81%) copy milena/mln/value/{int_u8.hh => int_u24.hh} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 266f7d4..99a5929 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2012-10-05 Roland Levillain <roland@lrde.epita.fr> + Provide typedefs mln::value::int_s24 and mln::value::int_u24. + + * mln/value/int_s24.hh, + * mln/value/int_u24.hh: + New. + +2012-10-05 Roland Levillain <roland@lrde.epita.fr> + Rename Trimesh reimplementations in apps/mesh-segm-skel/. * apps/mesh-segm-skel/trimesh/misc.hh: Move... diff --git a/milena/headers.mk b/milena/headers.mk index 3d93101..20f2f35 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1215,11 +1215,13 @@ mln/value/graylevel_f.hh \ mln/value/hsl.hh \ mln/value/int_s.hh \ mln/value/int_s16.hh \ +mln/value/int_s24.hh \ mln/value/int_s32.hh \ mln/value/int_s8.hh \ mln/value/int_u.hh \ mln/value/int_u12.hh \ mln/value/int_u16.hh \ +mln/value/int_u24.hh \ mln/value/int_u32.hh \ mln/value/int_u8.hh \ mln/value/int_u_sat.hh \ diff --git a/milena/mln/value/int_s32.hh b/milena/mln/value/int_s24.hh similarity index 81% copy from milena/mln/value/int_s32.hh copy to milena/mln/value/int_s24.hh index 4303597..e947b47 100644 --- a/milena/mln/value/int_s32.hh +++ b/milena/mln/value/int_s24.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,13 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_INT_S32_HH -# define MLN_VALUE_INT_S32_HH +#ifndef MLN_VALUE_INT_S24_HH +# define MLN_VALUE_INT_S24_HH -/*! \file - * - * \brief Define the alias value::int_s32. - */ +/// \file +/// \brief Define the alias mln::value::int_s24. # include <mln/value/int_s.hh> @@ -40,14 +38,12 @@ namespace mln namespace value { - - /// Alias for signed 32-bit integers. - typedef int_s<32> int_s32; - + /// Alias for signed 24-bit integers. + typedef mln::value::int_s<24> int_s24; } // end of namespace mln::value } // end of namespace mln -#endif // ! MLN_VALUE_INT_S32_HH +#endif // ! MLN_VALUE_INT_S24_HH diff --git a/milena/mln/value/int_u8.hh b/milena/mln/value/int_u24.hh similarity index 81% copy from milena/mln/value/int_u8.hh copy to milena/mln/value/int_u24.hh index 5260f42..1a4935d 100644 --- a/milena/mln/value/int_u8.hh +++ b/milena/mln/value/int_u24.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,12 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_INT_U8_HH -# define MLN_VALUE_INT_U8_HH +#ifndef MLN_VALUE_INT_U24_HH +# define MLN_VALUE_INT_U24_HH /// \file -/// -/// Define the alias value::int_u8. +/// \brief Define the alias mln::value::int_u24. # include <mln/value/int_u.hh> @@ -39,14 +38,12 @@ namespace mln namespace value { - - /// Alias for unsigned 8-bit integers. - typedef mln::value::int_u<8> int_u8; - + /// Alias for unsigned 24-bit integers. + typedef mln::value::int_u<24> int_u24; } // end of namespace mln::value } // end of namespace mln -#endif // ! MLN_VALUE_INT_U8_HH +#endif // ! MLN_VALUE_INT_U24_HH diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d2dde46..2d2864e 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1257,11 +1257,13 @@ mln_value_graylevel_f \ mln_value_hsl \ mln_value_int_s \ mln_value_int_s16 \ +mln_value_int_s24 \ mln_value_int_s32 \ mln_value_int_s8 \ mln_value_int_u \ mln_value_int_u12 \ mln_value_int_u16 \ +mln_value_int_u24 \ mln_value_int_u32 \ mln_value_int_u8 \ mln_value_int_u_sat \ @@ -2506,11 +2508,13 @@ mln_value_graylevel_f_SOURCES = mln_value_graylevel_f.cc mln_value_hsl_SOURCES = mln_value_hsl.cc mln_value_int_s_SOURCES = mln_value_int_s.cc mln_value_int_s16_SOURCES = mln_value_int_s16.cc +mln_value_int_s24_SOURCES = mln_value_int_s24.cc mln_value_int_s32_SOURCES = mln_value_int_s32.cc mln_value_int_s8_SOURCES = mln_value_int_s8.cc mln_value_int_u_SOURCES = mln_value_int_u.cc mln_value_int_u12_SOURCES = mln_value_int_u12.cc mln_value_int_u16_SOURCES = mln_value_int_u16.cc +mln_value_int_u24_SOURCES = mln_value_int_u24.cc mln_value_int_u32_SOURCES = mln_value_int_u32.cc mln_value_int_u8_SOURCES = mln_value_int_u8.cc mln_value_int_u_sat_SOURCES = mln_value_int_u_sat.cc -- 1.7.2.5