[Olena-patches] olena-2.0-9-g812809e Fix warnings with Clang/g++ 4.6.x

* mln/border/duplicate.hh, * mln/border/mirror.hh, * mln/canvas/browsing/internal/graph_first_search.hh, * mln/convert/impl/from_float_to_value.hh, * mln/convert/to_qimage.hh, * mln/core/image/complex_window_piter.hh, * mln/extension/fill.hh, * mln/fun/spe/binary.hh, * mln/fun/spe/unary.hh, * mln/fun/x2x/rotation.hh, * mln/io/fld/max_components.hh, * mln/labeling/flat_zones.hh, * mln/labeling/value.hh, * mln/morpho/reconstruction/by_dilation/union_find.hh, * mln/opt/element.hh, * mln/registration/get_rot.hh, * mln/subsampling/antialiased.hh, * mln/subsampling/gaussian_subsampling.hh, * mln/topo/skeleton/is_simple_point.hh, * mln/transform/influence_zone_geodesic.hh, * mln/util/object_id.hh, * mln/value/lut_vec.hh, * mln/world/binary_2d/enlarge.hh: Avoid unused variable warnings. * mln/accu/internal/couple.hh, * mln/convert/from_to.hxx, * mln/core/faces_psite.hh, * mln/core/image/ch_piter.hh, * mln/core/image/dmorph/extended.hh, * mln/core/image/dmorph/extension_fun.hh, * mln/core/image/dmorph/extension_ima.hh, * mln/core/image/dmorph/extension_val.hh, * mln/core/image/dmorph/hexa.hh, * mln/core/image/dmorph/sub_image_if.hh, * mln/core/image/dmorph/transformed_image.hh, * mln/core/image/flat_image.hh, * mln/core/image/graph_elt_mixed_window.hh, * mln/core/image/graph_elt_window.hh, * mln/core/image/graph_elt_window_if.hh, * mln/core/image/graph_window_piter.hh, * mln/core/image/image2d.hh, * mln/core/image/imorph/labeled_image.hh, * mln/core/image/imorph/plain.hh, * mln/core/image/imorph/safe.hh, * mln/core/image/vmorph/cast_image.hh, * mln/core/image/vmorph/fun_image.hh, * mln/core/image/vmorph/thru_image.hh, * mln/core/image/vmorph/thrubin_image.hh, * mln/core/image/vmorph/violent_cast_image.hh, * mln/core/internal/is_masked_impl_selector.hh, * mln/core/internal/pixel_impl.hh, * mln/core/routine/init.hxx, * mln/core/site_set/attic/p_faces_piter.hh, * mln/core/site_set/p_faces.hh, * mln/core/site_set/p_if.hh, * mln/core/site_set/p_transformed.hh, * mln/debug/println.spe.hh, * mln/io/pbm/save.hh, * mln/io/pgm/save.hh, * mln/morpho/attribute/height.hh, * mln/morpho/attribute/sharpness.hh, * mln/morpho/attribute/volume.hh, * mln/morpho/tree/data.hh, * mln/topo/center_only_iter.hh, * mln/topo/face.hh, * mln/topo/face_data.hh, * mln/trait/image_from_grid.hh, * mln/trait/images.hh, * mln/value/float01.hh, * mln/value/float01_f.hh, * mln/value/graylevel.hh, * mln/value/graylevel_f.hh, * mln/value/internal/gray_.hh, * mln/value/internal/gray_f.hh: Make forward declarations consistent with declarations. * mln/core/concept/box.hh, * mln/core/dpoints_pixter.hh, * mln/core/image/graph_window_if_piter.hh: Add explicit 'this'. * mln/data/fill.hh: Make sure declarations are made before use. * mln/geom/chamfer.hh, * mln/morpho/tree/compute_attribute_image.hh: Do not set default argument values in declaration. * mln/accu/line.hh: Use def::coord. * mln/algebra/vec.hh, * mln/convert/from_to.hxx, * mln/core/image/dmorph/sub_image.hh, * mln/core/internal/site_set_iterator_base.hh, * mln/core/site_set/box.hh, * mln/core/site_set/p_array.hh, * mln/core/site_set/p_edges.hh, * mln/core/site_set/p_vertices.hh: Make forward declaration consistent with declaration. * mln/value/builtin/carrays.hh: Explicitly convert to char *. * mln/convert/impl/from_double_to_value.hh, * mln/convert/impl/from_int_to_value.hh, * mln/core/point.hh, * mln/opt/element.hh: Avoid unused variable warning. * mln/convert/impl/from_image_to_site_set.hh: Remove useless local variable. --- milena/ChangeLog | 111 ++++++++++++++++++++ milena/mln/accu/internal/couple.hh | 7 +- milena/mln/accu/line.hh | 17 ++-- milena/mln/algebra/vec.hh | 5 +- milena/mln/border/duplicate.hh | 4 +- milena/mln/border/mirror.hh | 3 +- milena/mln/convert/from_to.hxx | 4 +- milena/mln/convert/impl/from_double_to_value.hh | 9 +- milena/mln/convert/impl/from_float_to_value.hh | 8 +- milena/mln/convert/impl/from_image_to_site_set.hh | 4 +- milena/mln/convert/impl/from_int_to_value.hh | 6 +- milena/mln/convert/to_qimage.hh | 2 + milena/mln/core/concept/box.hh | 3 +- milena/mln/core/dpoints_pixter.hh | 25 +++-- milena/mln/core/faces_psite.hh | 5 +- milena/mln/core/image/ch_piter.hh | 5 +- milena/mln/core/image/complex_window_piter.hh | 5 +- milena/mln/core/image/dmorph/extended.hh | 5 +- milena/mln/core/image/dmorph/extension_fun.hh | 5 +- milena/mln/core/image/dmorph/extension_ima.hh | 6 +- milena/mln/core/image/dmorph/extension_val.hh | 5 +- milena/mln/core/image/dmorph/hexa.hh | 5 +- milena/mln/core/image/dmorph/sub_image.hh | 6 +- milena/mln/core/image/dmorph/sub_image_if.hh | 7 +- milena/mln/core/image/dmorph/transformed_image.hh | 7 +- milena/mln/core/image/flat_image.hh | 5 +- milena/mln/core/image/graph_elt_mixed_window.hh | 7 +- milena/mln/core/image/graph_elt_window.hh | 4 +- milena/mln/core/image/graph_elt_window_if.hh | 7 +- milena/mln/core/image/graph_window_if_piter.hh | 4 +- milena/mln/core/image/graph_window_piter.hh | 6 +- milena/mln/core/image/image2d.hh | 2 +- milena/mln/core/image/imorph/labeled_image.hh | 5 +- milena/mln/core/image/imorph/plain.hh | 5 +- milena/mln/core/image/imorph/safe.hh | 5 +- milena/mln/core/image/vmorph/cast_image.hh | 5 +- milena/mln/core/image/vmorph/fun_image.hh | 4 +- milena/mln/core/image/vmorph/thru_image.hh | 8 +- milena/mln/core/image/vmorph/thrubin_image.hh | 4 +- milena/mln/core/image/vmorph/violent_cast_image.hh | 5 +- .../mln/core/internal/is_masked_impl_selector.hh | 7 +- milena/mln/core/internal/pixel_impl.hh | 2 +- milena/mln/core/internal/site_set_iterator_base.hh | 6 +- milena/mln/core/point.hh | 3 +- milena/mln/core/routine/init.hxx | 7 +- milena/mln/core/site_set/attic/p_faces_piter.hh | 4 +- milena/mln/core/site_set/p_array.hh | 4 +- milena/mln/core/site_set/p_edges.hh | 5 +- milena/mln/core/site_set/p_faces.hh | 5 +- milena/mln/core/site_set/p_if.hh | 6 +- milena/mln/core/site_set/p_transformed.hh | 5 +- milena/mln/core/site_set/p_vertices.hh | 4 +- milena/mln/data/fill.hh | 4 +- milena/mln/debug/println.spe.hh | 5 +- milena/mln/extension/fill.hh | 2 + milena/mln/fun/spe/binary.hh | 1 + milena/mln/fun/spe/unary.hh | 4 +- milena/mln/fun/x2x/rotation.hh | 7 +- milena/mln/geom/chamfer.hh | 5 +- milena/mln/io/fld/max_components.hh | 3 +- milena/mln/io/pbm/save.hh | 7 +- milena/mln/io/pgm/save.hh | 7 +- milena/mln/labeling/flat_zones.hh | 10 +- milena/mln/labeling/value.hh | 4 +- milena/mln/morpho/attribute/height.hh | 5 +- milena/mln/morpho/attribute/sharpness.hh | 5 +- milena/mln/morpho/attribute/volume.hh | 5 +- .../reconstruction/by_dilation/union_find.hh | 18 ++-- milena/mln/morpho/tree/compute_attribute_image.hh | 9 +- milena/mln/morpho/tree/data.hh | 4 +- milena/mln/opt/element.hh | 9 +- milena/mln/registration/get_rot.hh | 9 ++- milena/mln/subsampling/antialiased.hh | 10 ++ milena/mln/subsampling/gaussian_subsampling.hh | 5 +- milena/mln/topo/center_only_iter.hh | 7 +- milena/mln/topo/face.hh | 4 +- milena/mln/topo/face_data.hh | 4 +- milena/mln/topo/skeleton/is_simple_point.hh | 1 - milena/mln/trait/image_from_grid.hh | 5 +- milena/mln/trait/images.hh | 11 +- milena/mln/transform/influence_zone_geodesic.hh | 7 +- milena/mln/util/object_id.hh | 4 +- milena/mln/value/float01.hh | 5 +- milena/mln/value/float01_f.hh | 5 +- milena/mln/value/graylevel.hh | 2 +- milena/mln/value/graylevel_f.hh | 5 +- milena/mln/value/internal/gray_.hh | 17 +++- milena/mln/value/internal/gray_f.hh | 14 ++- milena/mln/value/lut_vec.hh | 5 +- milena/mln/world/binary_2d/enlarge.hh | 6 +- 90 files changed, 436 insertions(+), 207 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 544cc30..7e5855b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -19,6 +19,117 @@ * mln/io/dicom/load.hh: Fix invalid data while loading large image. +2011-04-28 Guillaume Lazzara &lt;lazzara(a)fidji.lrde.epita.fr&gt; + + Fix warnings with Clang/g++ 4.6.x + + * mln/border/duplicate.hh, + * mln/border/mirror.hh, + * mln/canvas/browsing/internal/graph_first_search.hh, + * mln/convert/impl/from_float_to_value.hh, + * mln/convert/to_qimage.hh, + * mln/core/image/complex_window_piter.hh, + * mln/extension/fill.hh, + * mln/fun/spe/binary.hh, + * mln/fun/spe/unary.hh, + * mln/fun/x2x/rotation.hh, + * mln/io/fld/max_components.hh, + * mln/labeling/flat_zones.hh, + * mln/labeling/value.hh, + * mln/morpho/reconstruction/by_dilation/union_find.hh, + * mln/opt/element.hh, + * mln/registration/get_rot.hh, + * mln/subsampling/antialiased.hh, + * mln/subsampling/gaussian_subsampling.hh, + * mln/topo/skeleton/is_simple_point.hh, + * mln/transform/influence_zone_geodesic.hh, + * mln/util/object_id.hh, + * mln/value/lut_vec.hh, + * mln/world/binary_2d/enlarge.hh: Avoid unused variable warnings. + + * mln/accu/internal/couple.hh, + * mln/convert/from_to.hxx, + * mln/core/faces_psite.hh, + * mln/core/image/ch_piter.hh, + * mln/core/image/dmorph/extended.hh, + * mln/core/image/dmorph/extension_fun.hh, + * mln/core/image/dmorph/extension_ima.hh, + * mln/core/image/dmorph/extension_val.hh, + * mln/core/image/dmorph/hexa.hh, + * mln/core/image/dmorph/sub_image_if.hh, + * mln/core/image/dmorph/transformed_image.hh, + * mln/core/image/flat_image.hh, + * mln/core/image/graph_elt_mixed_window.hh, + * mln/core/image/graph_elt_window.hh, + * mln/core/image/graph_elt_window_if.hh, + * mln/core/image/graph_window_piter.hh, + * mln/core/image/image2d.hh, + * mln/core/image/imorph/labeled_image.hh, + * mln/core/image/imorph/plain.hh, + * mln/core/image/imorph/safe.hh, + * mln/core/image/vmorph/cast_image.hh, + * mln/core/image/vmorph/fun_image.hh, + * mln/core/image/vmorph/thru_image.hh, + * mln/core/image/vmorph/thrubin_image.hh, + * mln/core/image/vmorph/violent_cast_image.hh, + * mln/core/internal/is_masked_impl_selector.hh, + * mln/core/internal/pixel_impl.hh, + * mln/core/routine/init.hxx, + * mln/core/site_set/attic/p_faces_piter.hh, + * mln/core/site_set/p_faces.hh, + * mln/core/site_set/p_if.hh, + * mln/core/site_set/p_transformed.hh, + * mln/debug/println.spe.hh, + * mln/io/pbm/save.hh, + * mln/io/pgm/save.hh, + * mln/morpho/attribute/height.hh, + * mln/morpho/attribute/sharpness.hh, + * mln/morpho/attribute/volume.hh, + * mln/morpho/tree/data.hh, + * mln/topo/center_only_iter.hh, + * mln/topo/face.hh, + * mln/topo/face_data.hh, + * mln/trait/image_from_grid.hh, + * mln/trait/images.hh, + * mln/value/float01.hh, + * mln/value/float01_f.hh, + * mln/value/graylevel.hh, + * mln/value/graylevel_f.hh, + * mln/value/internal/gray_.hh, + * mln/value/internal/gray_f.hh: Make forward declarations + consistent with declarations. + + * mln/core/concept/box.hh, + * mln/core/dpoints_pixter.hh, + * mln/core/image/graph_window_if_piter.hh: Add explicit 'this'. + + * mln/data/fill.hh: Make sure declarations are made before use. + + * mln/geom/chamfer.hh, + * mln/morpho/tree/compute_attribute_image.hh: Do not set default + argument values in declaration. + + * mln/accu/line.hh: Use def::coord. + + * mln/algebra/vec.hh, + * mln/convert/from_to.hxx, + * mln/core/image/dmorph/sub_image.hh, + * mln/core/internal/site_set_iterator_base.hh, + * mln/core/site_set/box.hh, + * mln/core/site_set/p_array.hh, + * mln/core/site_set/p_edges.hh, + * mln/core/site_set/p_vertices.hh: Make forward declaration + consistent with declaration. + + * mln/value/builtin/carrays.hh: Explicitly convert to char *. + + * mln/convert/impl/from_double_to_value.hh, + * mln/convert/impl/from_int_to_value.hh, + * mln/core/point.hh, + * mln/opt/element.hh: Avoid unused variable warning. + + * mln/convert/impl/from_image_to_site_set.hh: Remove useless local variable. + 2010-12-10 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Ensure non implemented reconstructions on sets abort at run time. diff --git a/milena/mln/accu/internal/couple.hh b/milena/mln/accu/internal/couple.hh index 43550fd..55c6cc4 100644 --- a/milena/mln/accu/internal/couple.hh +++ b/milena/mln/accu/internal/couple.hh @@ -53,10 +53,11 @@ namespace mln /// /// \todo Check that, when T is not provided, A1 and A2 have the same value. template <typename A1, typename A2, typename R, typename E> - struct couple - : base<R,E>, - mlc_equal(mln_argument(A1), mln_argument(A2))::check_t + class couple + : public base<R,E>, + public mlc_equal(mln_argument(A1), mln_argument(A2))::check_t { + public: typedef mln_argument(A1) argument; /// Manipulators. diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh index c6022ef..75be6b3 100644 --- a/milena/mln/accu/line.hh +++ b/milena/mln/accu/line.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -63,8 +64,8 @@ namespace mln typename I, typename O> void line(const Image<I>& input, - const mln_site(I)& p_start, unsigned len, - unsigned half_length, + const mln_site(I)& p_start, def::coord len, + def::coord half_length, Image<O>& output); @@ -98,7 +99,7 @@ namespace mln mln_precondition(input.is_valid()); mln_precondition(output.is_valid()); } - + } // end of namespace mln::accu::internal @@ -107,7 +108,7 @@ namespace mln namespace generic { - + template <typename Meta_Accu, unsigned Dir, typename I, typename O> void @@ -212,8 +213,8 @@ namespace mln typename I, typename O> void line_fastest(const Image<I>& input_, - const mln_site(I)& p_start, unsigned len, - unsigned half_length, + const mln_site(I)& p_start, def::coord len, + def::coord half_length, Image<O>& output_) { typedef mln_site(I) P; @@ -371,7 +372,7 @@ namespace mln half_length, output); } - + } // end of namespace mln::accu::internal diff --git a/milena/mln/algebra/vec.hh b/milena/mln/algebra/vec.hh index 22ebc02..dc526ec 100644 --- a/milena/mln/algebra/vec.hh +++ b/milena/mln/algebra/vec.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,7 +56,7 @@ namespace mln // Forward declarations. namespace algebra { template <unsigned n, typename T> class vec; - template <unsigned d, typename C> class h_vec; + template <unsigned d, typename C> struct h_vec; template <unsigned n, unsigned m, typename T> class mat; } diff --git a/milena/mln/border/duplicate.hh b/milena/mln/border/duplicate.hh index 4d836cc..059dc77 100644 --- a/milena/mln/border/duplicate.hh +++ b/milena/mln/border/duplicate.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -227,6 +228,7 @@ namespace mln void duplicate_dispatch_on(trait::image::speed::any, const Image<I>& ima) { + (void) ima; // No-op. } diff --git a/milena/mln/border/mirror.hh b/milena/mln/border/mirror.hh index 793ef21..adeb057 100644 --- a/milena/mln/border/mirror.hh +++ b/milena/mln/border/mirror.hh @@ -199,7 +199,8 @@ namespace mln { trace::warning("border::mirror for 3D image is not implemented," " so image borders have not been mirrored!"); - mln::internal::fixme(); + (void) ima; + // FIXME write it! } diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 7891e9a..e99c3f6 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -63,13 +63,13 @@ namespace mln template <typename D> class neighb; template <typename D> class window; - template <typename D, typename W> class w_window; + template <typename D, typename W> struct w_window; template <typename T> struct image1d; namespace algebra { template <unsigned n, typename T> class vec; - template <unsigned d, typename C> class h_vec; + template <unsigned d, typename C> struct h_vec; } namespace fun { diff --git a/milena/mln/convert/impl/from_double_to_value.hh b/milena/mln/convert/impl/from_double_to_value.hh index 757fb55..fd2b32a 100644 --- a/milena/mln/convert/impl/from_double_to_value.hh +++ b/milena/mln/convert/impl/from_double_to_value.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -86,9 +87,11 @@ namespace mln template <typename V> inline void - from_double_to_value(const double& /* from */, - Value<V>& /* to */) + from_double_to_value(const double& from, + Value<V>& to) { + (void) from; + (void) to; mlc_abort(V)::check(); } diff --git a/milena/mln/convert/impl/from_float_to_value.hh b/milena/mln/convert/impl/from_float_to_value.hh index b50173b..aa880d8 100644 --- a/milena/mln/convert/impl/from_float_to_value.hh +++ b/milena/mln/convert/impl/from_float_to_value.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -87,9 +87,11 @@ namespace mln template <typename V> inline void - from_float_to_value(const float& /* from */, - Value<V>& /* to */) + from_float_to_value(const float& from, + Value<V>& to) { + (void) from; + (void) to; mlc_abort(V)::check(); } diff --git a/milena/mln/convert/impl/from_image_to_site_set.hh b/milena/mln/convert/impl/from_image_to_site_set.hh index 2bdbcff..65873b6 100644 --- a/milena/mln/convert/impl/from_image_to_site_set.hh +++ b/milena/mln/convert/impl/from_image_to_site_set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -107,7 +108,6 @@ namespace mln const std::pair< mln_value(I), p_run<P> >&) { s.clear(); - mln_value(I) O = literal::zero; mln_fwd_piter(I) p(input.domain()); p.start(); for (;;) diff --git a/milena/mln/convert/impl/from_int_to_value.hh b/milena/mln/convert/impl/from_int_to_value.hh index b17040b..c22dfb1 100644 --- a/milena/mln/convert/impl/from_int_to_value.hh +++ b/milena/mln/convert/impl/from_int_to_value.hh @@ -74,9 +74,11 @@ namespace mln template <typename V> inline void - from_int_to_value(const int& /* from */, - Value<V>& /* to */) + from_int_to_value(const int& from, + Value<V>& to) { + (void) from; + (void) to; mlc_abort(V)::check(); } diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh index cd00cdc..a7c8512 100755 --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -254,6 +254,8 @@ namespace mln inline QImage to_qimage_dispatch(const Image<I>& ima, V&) { + (void) ima; + // Not supported yet! mlc_abort(I)::check(); return QImage(); diff --git a/milena/mln/core/concept/box.hh b/milena/mln/core/concept/box.hh index 15696b4..db6e8f2 100644 --- a/milena/mln/core/concept/box.hh +++ b/milena/mln/core/concept/box.hh @@ -132,7 +132,8 @@ namespace mln { return exact(this)->is_valid() - ? 1 + exact(this)->pmax()[i] - exact(this)->pmin()[i] + ? static_cast<unsigned>(1 + exact(this)->pmax()[i] + - exact(this)->pmin()[i]) : 0u; } diff --git a/milena/mln/core/dpoints_pixter.hh b/milena/mln/core/dpoints_pixter.hh index 8020fcc..eb19c2b 100644 --- a/milena/mln/core/dpoints_pixter.hh +++ b/milena/mln/core/dpoints_pixter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +28,7 @@ # define MLN_CORE_DPOINTS_PIXTER_HH /// \file -/// +/// /// \brief Definition of forward and backward mln::dpoint-based /// iterators for pixels iterations. /// @@ -51,7 +52,7 @@ namespace mln /// \brief A generic forward iterator on the pixels of a /// dpoint-based window or neighborhood. - /// + /// /// Parameter \c I is the image type. template <typename I> class dpoints_fwd_pixter @@ -62,7 +63,7 @@ namespace mln public: /// \brief Constructor (using an image). - /// + /// /// \param[in] image The image to iterate over. /// \param[in] dps An object (neighborhood or window) that can /// provide a set of delta-points. @@ -74,7 +75,7 @@ namespace mln const Pref& p_ref); /// \brief Constructor (using a generalized pixel). - /// + /// /// \param[in] pxl_ref Center (generalized) pixel to iterate around. /// \param[in] dps An object (neighborhood or window) that can /// provide a set of delta-points. @@ -134,7 +135,7 @@ namespace mln /// \brief A generic backward iterator on the pixels of a /// dpoint-based window or neighborhood. - /// + /// /// Parameter \c I is the image type. template <typename I> class dpoints_bkd_pixter @@ -145,7 +146,7 @@ namespace mln public: /// \brief Constructor (using an image). - /// + /// /// \param[in] image The image to iterate over. /// \param[in] dps An object (neighborhood or window) that can /// provide a set of delta-points. @@ -157,7 +158,7 @@ namespace mln const Pref& p_ref); /// \brief Constructor (using a generalized pixel). - /// + /// /// \param[in] pxl_ref Center (generalized) pixel to iterate around. /// \param[in] dps An object (neighborhood or window) that can /// provide a set of delta-points. @@ -257,7 +258,7 @@ namespace mln { mln_invariant(value_ref_ != 0 || p_ref_ != 0); if (p_ref_) - return image_(*p_ref_); + return this->image_(*p_ref_); else return **value_ref_; } @@ -286,7 +287,7 @@ namespace mln if (is_valid()) { if (p_ref_) - this->value_ptr_ = & image_(*p_ref_) + *i_; + this->value_ptr_ = & this->image_(*p_ref_) + *i_; else this->value_ptr_ = * value_ref_ + *i_; } @@ -368,7 +369,7 @@ namespace mln { mln_invariant(value_ref_ != 0 || p_ref_ != 0); if (p_ref_) - return image_(*p_ref_); + return this->image_(*p_ref_); else return **value_ref_; } @@ -397,7 +398,7 @@ namespace mln if (is_valid()) { if (p_ref_) - this->value_ptr_ = & image_(*p_ref_) + *i_; + this->value_ptr_ = & this->image_(*p_ref_) + *i_; else this->value_ptr_ = * value_ref_ + *i_; } diff --git a/milena/mln/core/faces_psite.hh b/milena/mln/core/faces_psite.hh index d8d7573..9f72533 100644 --- a/milena/mln/core/faces_psite.hh +++ b/milena/mln/core/faces_psite.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +45,7 @@ namespace mln { // Forward declaration. - template <unsigned N, unsigned D, typename P> class p_faces; + template <unsigned N, unsigned D, typename P> struct p_faces; /// \brief Point site associated to a mln::p_faces. diff --git a/milena/mln/core/image/ch_piter.hh b/milena/mln/core/image/ch_piter.hh index cacb5c7..b7c53f8 100644 --- a/milena/mln/core/image/ch_piter.hh +++ b/milena/mln/core/image/ch_piter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,7 @@ namespace mln { // Forward declaration. - template <typename I, typename Fwd> struct ch_piter_image; + template <typename I, typename Fwd> class ch_piter_image; namespace internal diff --git a/milena/mln/core/image/complex_window_piter.hh b/milena/mln/core/image/complex_window_piter.hh index 5f1daa5..ab6326c 100644 --- a/milena/mln/core/image/complex_window_piter.hh +++ b/milena/mln/core/image/complex_window_piter.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -364,9 +364,10 @@ namespace mln template <typename Pref> inline void - complex_window_bkd_piter<I, G, W>::center_at_(const Pref& /* c */) + complex_window_bkd_piter<I, G, W>::center_at_(const Pref& c) { // FIXME: Argument C is not used here... Is this normal? + (void) c; iter_.center_at(this->center().face()); } diff --git a/milena/mln/core/image/dmorph/extended.hh b/milena/mln/core/image/dmorph/extended.hh index 588f95a..791ab1d 100644 --- a/milena/mln/core/image/dmorph/extended.hh +++ b/milena/mln/core/image/dmorph/extended.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -43,7 +44,7 @@ namespace mln // Forward declaration. - template <typename I> class extended; + template <typename I> struct extended; namespace internal diff --git a/milena/mln/core/image/dmorph/extension_fun.hh b/milena/mln/core/image/dmorph/extension_fun.hh index a8731c2..887fe02 100644 --- a/milena/mln/core/image/dmorph/extension_fun.hh +++ b/milena/mln/core/image/dmorph/extension_fun.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ namespace mln { // Forward declaration. - template <typename I, typename F> struct extension_fun; + template <typename I, typename F> class extension_fun; namespace internal diff --git a/milena/mln/core/image/dmorph/extension_ima.hh b/milena/mln/core/image/dmorph/extension_ima.hh index a0bc9ca..63ea0ed 100644 --- a/milena/mln/core/image/dmorph/extension_ima.hh +++ b/milena/mln/core/image/dmorph/extension_ima.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +40,7 @@ namespace mln { // Forward declaration. - template <typename I, typename J> struct extension_ima; + template <typename I, typename J> class extension_ima; namespace internal diff --git a/milena/mln/core/image/dmorph/extension_val.hh b/milena/mln/core/image/dmorph/extension_val.hh index c104eba..c0ccbe0 100644 --- a/milena/mln/core/image/dmorph/extension_val.hh +++ b/milena/mln/core/image/dmorph/extension_val.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -41,7 +42,7 @@ namespace mln { // Forward declaration. - template <typename I> struct extension_val; + template <typename I> class extension_val; namespace internal diff --git a/milena/mln/core/image/dmorph/hexa.hh b/milena/mln/core/image/dmorph/hexa.hh index bfa3739..314cba1 100644 --- a/milena/mln/core/image/dmorph/hexa.hh +++ b/milena/mln/core/image/dmorph/hexa.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ namespace mln { // Forward declaration. - template <typename I> class hexa; + template <typename I> struct hexa; namespace internal diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh index 7aef40c..088142d 100644 --- a/milena/mln/core/image/dmorph/sub_image.hh +++ b/milena/mln/core/image/dmorph/sub_image.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +44,7 @@ namespace mln // Forward declaration. - template <typename I, typename S> class sub_image; + template <typename I, typename S> struct sub_image; namespace internal diff --git a/milena/mln/core/image/dmorph/sub_image_if.hh b/milena/mln/core/image/dmorph/sub_image_if.hh index 547366a..2cc9661 100644 --- a/milena/mln/core/image/dmorph/sub_image_if.hh +++ b/milena/mln/core/image/dmorph/sub_image_if.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -46,7 +47,7 @@ namespace mln // Forward declaration. - template <typename I, typename S> class sub_image_if; + template <typename I, typename S> struct sub_image_if; namespace internal @@ -168,7 +169,7 @@ namespace mln { typedef fun::p2b::has<I> F; F f(ima); - s_ = p_if<S,F>(s, f); + s_ = p_if<S,F>(s, f); } } // end of namespace mln::internal diff --git a/milena/mln/core/image/dmorph/transformed_image.hh b/milena/mln/core/image/dmorph/transformed_image.hh index 5feb3b8..0fb4509 100644 --- a/milena/mln/core/image/dmorph/transformed_image.hh +++ b/milena/mln/core/image/dmorph/transformed_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ namespace mln // Forward declaration. - template <typename I, typename F> class transformed_image; + template <typename I, typename F> struct transformed_image; namespace internal @@ -221,7 +222,7 @@ namespace mln mln_precondition(this->delegatee_()->has(this->data_->f_(p))); return this->delegatee_()->operator()(this->data_->f_(p)); } - + template <typename I, typename F> inline mln_morpher_lvalue(I) diff --git a/milena/mln/core/image/flat_image.hh b/milena/mln/core/image/flat_image.hh index 10d6211..6647766 100644 --- a/milena/mln/core/image/flat_image.hh +++ b/milena/mln/core/image/flat_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -41,7 +42,7 @@ namespace mln // Forward declaration. - template <typename T, typename S> class flat_image; + template <typename T, typename S> struct flat_image; namespace internal diff --git a/milena/mln/core/image/graph_elt_mixed_window.hh b/milena/mln/core/image/graph_elt_mixed_window.hh index 6ece878..046843a 100644 --- a/milena/mln/core/image/graph_elt_mixed_window.hh +++ b/milena/mln/core/image/graph_elt_mixed_window.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -42,8 +43,8 @@ namespace mln /// Forward declaration template <typename G, typename S, typename S2> class graph_elt_mixed_window; - template <typename G, typename F> struct p_edges; - template <typename G, typename F> struct p_vertices; + template <typename G, typename F> class p_edges; + template <typename G, typename F> class p_vertices; namespace util { template <typename G> class edge; diff --git a/milena/mln/core/image/graph_elt_window.hh b/milena/mln/core/image/graph_elt_window.hh index b39c44e..86cb147 100644 --- a/milena/mln/core/image/graph_elt_window.hh +++ b/milena/mln/core/image/graph_elt_window.hh @@ -42,8 +42,8 @@ namespace mln /// Forward declaration template <typename G, typename S> class graph_elt_window; - template <typename G, typename F> struct p_edges; - template <typename G, typename F> struct p_vertices; + template <typename G, typename F> class p_edges; + template <typename G, typename F> class p_vertices; namespace util { template <typename G> class edge; diff --git a/milena/mln/core/image/graph_elt_window_if.hh b/milena/mln/core/image/graph_elt_window_if.hh index 131e4d2..920e524 100644 --- a/milena/mln/core/image/graph_elt_window_if.hh +++ b/milena/mln/core/image/graph_elt_window_if.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -44,8 +45,8 @@ namespace mln /// Forward declaration template <typename G, typename S, typename I> class graph_elt_window_if; - template <typename G, typename F> struct p_edges; - template <typename G, typename F> struct p_vertices; + template <typename G, typename F> class p_edges; + template <typename G, typename F> class p_vertices; namespace internal diff --git a/milena/mln/core/image/graph_window_if_piter.hh b/milena/mln/core/image/graph_window_if_piter.hh index d872853..068fbdb 100644 --- a/milena/mln/core/image/graph_window_if_piter.hh +++ b/milena/mln/core/image/graph_window_if_piter.hh @@ -167,7 +167,7 @@ namespace mln graph_window_if_piter<S,W,I>::do_start_() { iter_.start(); - while (iter_.is_valid() && is_masked(this->c_->element(), iter_)) + while (iter_.is_valid() && this->is_masked(this->c_->element(), iter_)) iter_.next(); } @@ -177,7 +177,7 @@ namespace mln graph_window_if_piter<S,W,I>::do_next_() { iter_.next(); - while (iter_.is_valid() && is_masked(this->c_->element(), iter_)) + while (iter_.is_valid() && this->is_masked(this->c_->element(), iter_)) iter_.next(); } diff --git a/milena/mln/core/image/graph_window_piter.hh b/milena/mln/core/image/graph_window_piter.hh index 1891925..f6e8d08 100644 --- a/milena/mln/core/image/graph_window_piter.hh +++ b/milena/mln/core/image/graph_window_piter.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -209,8 +209,8 @@ namespace mln using super_impl_::do_start_; - friend class internal::impl_selector<typename W::center_t, mln_psite(W), - graph_window_piter<S,W,I> > ; + friend struct internal::impl_selector<typename W::center_t, mln_psite(W), + graph_window_piter<S,W,I> > ; private: I iter_; diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index cdb460a..bc49561 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -59,7 +59,7 @@ namespace mln { // Forward declaration. - template <typename T> struct image2d; + template <typename T> class image2d; namespace internal diff --git a/milena/mln/core/image/imorph/labeled_image.hh b/milena/mln/core/image/imorph/labeled_image.hh index c0fcde2..c99f386 100644 --- a/milena/mln/core/image/imorph/labeled_image.hh +++ b/milena/mln/core/image/imorph/labeled_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -50,7 +51,7 @@ namespace mln { // Forward declarations. - template <typename I> struct labeled_image; + template <typename I> class labeled_image; namespace accu { template <typename T> struct nil; diff --git a/milena/mln/core/image/imorph/plain.hh b/milena/mln/core/image/imorph/plain.hh index e09bfa5..66c9ebd 100644 --- a/milena/mln/core/image/imorph/plain.hh +++ b/milena/mln/core/image/imorph/plain.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,7 @@ namespace mln { // Forward declaration. - template <typename I> struct plain; + template <typename I> class plain; namespace internal diff --git a/milena/mln/core/image/imorph/safe.hh b/milena/mln/core/image/imorph/safe.hh index c053645..c516ef4 100644 --- a/milena/mln/core/image/imorph/safe.hh +++ b/milena/mln/core/image/imorph/safe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -41,7 +42,7 @@ namespace mln { // Forward declaration. - template <typename I> struct safe_image; + template <typename I> class safe_image; namespace internal diff --git a/milena/mln/core/image/vmorph/cast_image.hh b/milena/mln/core/image/vmorph/cast_image.hh index bed4fbf..0226ad0 100644 --- a/milena/mln/core/image/vmorph/cast_image.hh +++ b/milena/mln/core/image/vmorph/cast_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ namespace mln { // Fwd decl. - template <typename T, typename I> class cast_image_; + template <typename T, typename I> struct cast_image_; namespace internal diff --git a/milena/mln/core/image/vmorph/fun_image.hh b/milena/mln/core/image/vmorph/fun_image.hh index 30ac44e..24d7e37 100644 --- a/milena/mln/core/image/vmorph/fun_image.hh +++ b/milena/mln/core/image/vmorph/fun_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -46,7 +46,7 @@ namespace mln { // Forward declaration. - template <typename F, typename I> class fun_image; + template <typename F, typename I> struct fun_image; namespace internal { diff --git a/milena/mln/core/image/vmorph/thru_image.hh b/milena/mln/core/image/vmorph/thru_image.hh index 2691d38..e829b27 100644 --- a/milena/mln/core/image/vmorph/thru_image.hh +++ b/milena/mln/core/image/vmorph/thru_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -43,12 +43,12 @@ namespace mln { // Forward declaration. - template <typename I, typename F> struct thru_image; + template <typename I, typename F> class thru_image; namespace internal { - template <typename I, typename F> struct thru_image_write; - template <typename I, typename F> struct thru_image_read; + template <typename I, typename F> class thru_image_write; + template <typename I, typename F> class thru_image_read; /// Find correct implementation template <typename I, typename F> diff --git a/milena/mln/core/image/vmorph/thrubin_image.hh b/milena/mln/core/image/vmorph/thrubin_image.hh index 9d5a2f3..0195d1a 100644 --- a/milena/mln/core/image/vmorph/thrubin_image.hh +++ b/milena/mln/core/image/vmorph/thrubin_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -42,7 +42,7 @@ namespace mln { // Forward declaration. - template <typename I1, typename I2, typename F> struct thrubin_image; + template <typename I1, typename I2, typename F> class thrubin_image; namespace internal { diff --git a/milena/mln/core/image/vmorph/violent_cast_image.hh b/milena/mln/core/image/vmorph/violent_cast_image.hh index 8ff9a1e..0ce4669 100644 --- a/milena/mln/core/image/vmorph/violent_cast_image.hh +++ b/milena/mln/core/image/vmorph/violent_cast_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,7 @@ namespace mln { // Fwd decl. - template <typename T, typename I> class violent_cast_image; + template <typename T, typename I> struct violent_cast_image; namespace internal { diff --git a/milena/mln/core/internal/is_masked_impl_selector.hh b/milena/mln/core/internal/is_masked_impl_selector.hh index 56e4ed3..41d941b 100644 --- a/milena/mln/core/internal/is_masked_impl_selector.hh +++ b/milena/mln/core/internal/is_masked_impl_selector.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -37,8 +38,8 @@ namespace mln { // Forward declarations. - template <typename G, typename F> struct p_edges; - template <typename G, typename F> struct p_vertices; + template <typename G, typename F> class p_edges; + template <typename G, typename F> class p_vertices; diff --git a/milena/mln/core/internal/pixel_impl.hh b/milena/mln/core/internal/pixel_impl.hh index 4e30f4c..d0549b1 100644 --- a/milena/mln/core/internal/pixel_impl.hh +++ b/milena/mln/core/internal/pixel_impl.hh @@ -47,7 +47,7 @@ namespace mln { // We indeed have to handle the couple of cases when I is fastest - // or is not. Justification: mln::pixel derives from pixel_impl_ + // or is not. Justification: mln::pixel derives from pixel_impl_ // and is a general purpose pixel class; it can be used on any // image whatever it is a fastest one or not. diff --git a/milena/mln/core/internal/site_set_iterator_base.hh b/milena/mln/core/internal/site_set_iterator_base.hh index 66c94d5..71c3fe3 100644 --- a/milena/mln/core/internal/site_set_iterator_base.hh +++ b/milena/mln/core/internal/site_set_iterator_base.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -114,8 +115,9 @@ namespace mln template <typename S, typename E> inline void - site_set_iterator_base<S, E>::change_target_(const S& /* s */) + site_set_iterator_base<S, E>::change_target_(const S& s) { + (void) s; // Empty by default. } diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index a912fac..d415cf8 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -677,8 +677,9 @@ namespace mln template <typename C> inline const util::yes& - cut_(const point<grid::tick,C>& /* p */) + cut_(const point<grid::tick,C>& p) { + (void) p; util::yes* the_; return *the_; } diff --git a/milena/mln/core/routine/init.hxx b/milena/mln/core/routine/init.hxx index 3a47684..5cc6d12 100644 --- a/milena/mln/core/routine/init.hxx +++ b/milena/mln/core/routine/init.hxx @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -36,9 +37,9 @@ namespace mln // Forward declarations. namespace fun { namespace i2v { template <typename T> class array; } } - namespace pw { namespace internal { template <typename F, typename S, typename E> class image_base; } } + namespace pw { namespace internal { template <typename F, typename S, typename E> struct image_base; } } namespace pw { template <typename F, typename S> class image; } - template <typename I, typename F> class image_if; + template <typename I, typename F> struct image_if; diff --git a/milena/mln/core/site_set/attic/p_faces_piter.hh b/milena/mln/core/site_set/attic/p_faces_piter.hh index da4b24a..148872c 100644 --- a/milena/mln/core/site_set/attic/p_faces_piter.hh +++ b/milena/mln/core/site_set/attic/p_faces_piter.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -41,7 +41,7 @@ namespace mln { // Forward declarations. - template <unsigned N, unsigned D, typename P> class p_faces; + template <unsigned N, unsigned D, typename P> struct p_faces; template <unsigned N, unsigned D> class faces_fwd_iter_; template <unsigned N, unsigned D> class faces_bkd_iter_; diff --git a/milena/mln/core/site_set/p_array.hh b/milena/mln/core/site_set/p_array.hh index 6a7a236..0ca810e 100644 --- a/milena/mln/core/site_set/p_array.hh +++ b/milena/mln/core/site_set/p_array.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/core/site_set/p_edges.hh b/milena/mln/core/site_set/p_edges.hh index 4c58696..b4f1d27 100644 --- a/milena/mln/core/site_set/p_edges.hh +++ b/milena/mln/core/site_set/p_edges.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -45,7 +46,7 @@ namespace mln { // Forward declaration. - template <typename G, typename F> struct p_edges; + template <typename G, typename F> class p_edges; namespace trait diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index a308a61..09fa2fc 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,7 +50,7 @@ namespace mln { // Forward declarations. - template <unsigned N, unsigned D, typename P> class p_faces; + template <unsigned N, unsigned D, typename P> struct p_faces; template <unsigned N, unsigned D, typename P> class p_faces_fwd_piter_; template <unsigned N, unsigned D, typename P> class p_faces_bkd_piter_; diff --git a/milena/mln/core/site_set/p_if.hh b/milena/mln/core/site_set/p_if.hh index 4381e86..06ae5c6 100644 --- a/milena/mln/core/site_set/p_if.hh +++ b/milena/mln/core/site_set/p_if.hh @@ -41,7 +41,7 @@ namespace mln { // Forward declarations. - template <typename S, typename F> struct p_if; + template <typename S, typename F> class p_if; template <typename Pi, typename S, typename F> struct p_if_piter_; @@ -114,7 +114,7 @@ namespace mln bool is_valid() const; - /// Test if \p p belongs to the subset. + /// Test if \p p belongs to the subset. bool has(const psite& p) const; /// Give the primary overset. @@ -184,7 +184,7 @@ namespace mln { return f_(p); } - + template <typename S, typename F> inline p_if<S,F>::p_if(const S& s, const F& f) diff --git a/milena/mln/core/site_set/p_transformed.hh b/milena/mln/core/site_set/p_transformed.hh index ff0638d..2b597a5 100644 --- a/milena/mln/core/site_set/p_transformed.hh +++ b/milena/mln/core/site_set/p_transformed.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -39,7 +40,7 @@ namespace mln { // Forward declarations. - template <typename S, typename F> struct p_transformed; + template <typename S, typename F> class p_transformed; template <typename Pi, typename S, typename F> struct p_transformed_piter; diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh index c8497c0..6efa1a9 100644 --- a/milena/mln/core/site_set/p_vertices.hh +++ b/milena/mln/core/site_set/p_vertices.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -44,7 +44,7 @@ namespace mln { // Forward declaration. - template <typename G, typename F> struct p_vertices; + template <typename G, typename F> class p_vertices; namespace trait diff --git a/milena/mln/data/fill.hh b/milena/mln/data/fill.hh index 61e7055..b223a36 100644 --- a/milena/mln/data/fill.hh +++ b/milena/mln/data/fill.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // diff --git a/milena/mln/debug/println.spe.hh b/milena/mln/debug/println.spe.hh index 257ddf4..856c635 100644 --- a/milena/mln/debug/println.spe.hh +++ b/milena/mln/debug/println.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -53,7 +54,7 @@ namespace mln { // Forward declaration. - template <typename I> class hexa; + template <typename I> struct hexa; namespace debug { diff --git a/milena/mln/extension/fill.hh b/milena/mln/extension/fill.hh index caed937..4375a24 100644 --- a/milena/mln/extension/fill.hh +++ b/milena/mln/extension/fill.hh @@ -104,6 +104,8 @@ namespace mln mln::trait::image::ext_domain::any, I& ima, const mln_value(I)& val) { + (void) ima; + (void) val; // Oops... } diff --git a/milena/mln/fun/spe/binary.hh b/milena/mln/fun/spe/binary.hh index eaeaa73..cde465d 100644 --- a/milena/mln/fun/spe/binary.hh +++ b/milena/mln/fun/spe/binary.hh @@ -71,6 +71,7 @@ namespace mln template <typename U> void init(const U& value) { + (void) value; } }; diff --git a/milena/mln/fun/spe/unary.hh b/milena/mln/fun/spe/unary.hh index 0c5a949..47d7f41 100644 --- a/milena/mln/fun/spe/unary.hh +++ b/milena/mln/fun/spe/unary.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -175,6 +176,7 @@ namespace mln template <typename U> void init(const U& value) { + (void) value; }; }; diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index 3cd54f1..ed48ebf 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -66,6 +66,9 @@ namespace mln algebra::h_mat<n, C> get_rot_h_mat(const C alpha_, const algebra::vec<n,C>& axis_) { + (void) alpha_; + (void) axis_; + std::cerr << __FILE__ << ":" << __LINE__ << ": error:" << " generic mln::fun::x2x::internal::get_rot_h_mat<n, C>" diff --git a/milena/mln/geom/chamfer.hh b/milena/mln/geom/chamfer.hh index 9603605..8fb6cc8 100644 --- a/milena/mln/geom/chamfer.hh +++ b/milena/mln/geom/chamfer.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -111,7 +112,7 @@ namespace mln template <typename I, typename W> mln_ch_value(I, unsigned) chamfer(const Image<I>& input_, const W& w_win_, - unsigned max = mln_max(unsigned)) + unsigned max) { trace::entering("mln::geom::chamfer"); // FIXME: check that input_ is binary. diff --git a/milena/mln/io/fld/max_components.hh b/milena/mln/io/fld/max_components.hh index d57310a..ceb4d27 100644 --- a/milena/mln/io/fld/max_components.hh +++ b/milena/mln/io/fld/max_components.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -74,6 +74,7 @@ namespace mln inline unsigned max_component(const algebra::vec<n, V>& v) { + (void) v; return unsigned(mln_max(V)); } diff --git a/milena/mln/io/pbm/save.hh b/milena/mln/io/pbm/save.hh index 689b492..a9b7604 100644 --- a/milena/mln/io/pbm/save.hh +++ b/milena/mln/io/pbm/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +// 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -46,8 +47,8 @@ namespace mln // Fwd decl. namespace value { - template <unsigned> class int_u; - template <unsigned> class int_u_sat; + template <unsigned> struct int_u; + template <unsigned> struct int_u_sat; } diff --git a/milena/mln/io/pgm/save.hh b/milena/mln/io/pgm/save.hh index 6438b30..c5ba0af 100644 --- a/milena/mln/io/pgm/save.hh +++ b/milena/mln/io/pgm/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +// 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -50,8 +51,8 @@ namespace mln // Fwd decl. namespace value { - template <unsigned> class int_u; - template <unsigned> class int_u_sat; + template <unsigned> struct int_u; + template <unsigned> struct int_u_sat; } diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 431bd86..6c406d5 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -82,9 +82,9 @@ namespace mln void do_no_union(const P&, const P&) {} void init_attr(const P&) {} void merge_attr(const P&, const P&) {} - void set_new_label(const P& p, const L& l){} - void set_label(const P& p, const L& l) {} - void finalize() {} + void set_new_label(const P&, const L&){} + void set_label(const P&, const L&) {} + void finalize() {} // Fastest implementation. diff --git a/milena/mln/labeling/value.hh b/milena/mln/labeling/value.hh index 7e1608c..fdd47ef 100644 --- a/milena/mln/labeling/value.hh +++ b/milena/mln/labeling/value.hh @@ -111,8 +111,8 @@ namespace mln void do_no_union(const P&, const P&) {} void init_attr(const P&) {} void merge_attr(const P&, const P&) {} - void set_new_label(const P& p, const L& l){} - void set_label(const P& p, const L& l) {} + void set_new_label(const P&, const L&) {} + void set_label(const P&, const L&) {} void finalize() {} // Fastest implementation diff --git a/milena/mln/morpho/attribute/height.hh b/milena/mln/morpho/attribute/height.hh index 4e8f234..3d47ac0 100644 --- a/milena/mln/morpho/attribute/height.hh +++ b/milena/mln/morpho/attribute/height.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +45,7 @@ namespace mln // Forward declaration. namespace morpho { namespace attribute { - template <typename I> class height; + template <typename I> struct height; } } diff --git a/milena/mln/morpho/attribute/sharpness.hh b/milena/mln/morpho/attribute/sharpness.hh index 9548b4d..866b1ab 100644 --- a/milena/mln/morpho/attribute/sharpness.hh +++ b/milena/mln/morpho/attribute/sharpness.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +45,7 @@ namespace mln namespace morpho { namespace attribute { template <typename I> - class sharpness; + struct sharpness; } } diff --git a/milena/mln/morpho/attribute/volume.hh b/milena/mln/morpho/attribute/volume.hh index 94dc977..2ac66c6 100644 --- a/milena/mln/morpho/attribute/volume.hh +++ b/milena/mln/morpho/attribute/volume.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -42,7 +43,7 @@ namespace mln // Forward declaration. namespace morpho { namespace attribute { - template <typename I> class volume; + template <typename I> struct volume; } } diff --git a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh index 59f15e4..35ec2ae 100644 --- a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh @@ -92,7 +92,7 @@ namespace mln } - + template <typename Par> inline mln_site(Par) find_root(Par& parent, mln_site(Par) x) @@ -111,10 +111,10 @@ namespace mln namespace impl { - + namespace generic { - + template <typename I, typename J, typename N> inline mln_concrete(I) @@ -128,8 +128,8 @@ namespace mln const N& nbh = exact(nbh_); internal::union_find_tests(f, g, nbh); - - + + typedef mln_site(I) P; typedef mln_value(I) V; @@ -184,7 +184,7 @@ namespace mln deja_vu(p) = true; } } - + // Second pass. { for (int i = s.nsites() - 1; i >= 0; --i) @@ -207,7 +207,7 @@ namespace mln return output; } - + } // end of namespace mln::morpho::reconstruction::by_dilation::impl::generic } // end of namespace mln::morpho::reconstruction::by_dilation::impl @@ -225,6 +225,10 @@ namespace mln const Image<I>& f, const Image<J>& g, const Neighborhood<N>& nbh) { + (void) f; + (void) g; + (void) nbh; + // FIXME: Not yet implemented. std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" diff --git a/milena/mln/morpho/tree/compute_attribute_image.hh b/milena/mln/morpho/tree/compute_attribute_image.hh index 9126bf1..e028084 100644 --- a/milena/mln/morpho/tree/compute_attribute_image.hh +++ b/milena/mln/morpho/tree/compute_attribute_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -92,7 +93,7 @@ namespace mln ** \param[in] values Value image. ** \param[out] accu_image Optional argument used to store image. ** - ** \return + ** \return */ template <typename A, typename T, typename V> mln_ch_value(typename T::function, mln_result(A)) @@ -215,7 +216,7 @@ namespace mln mln_ch_value(typename T::function, mln_result(A)) compute_attribute_image(const Accumulator<A>& a_, const T& t, - mln_ch_value(typename T::function, A)* accu_image = 0) + mln_ch_value(typename T::function, A)* accu_image) { trace::entering("morpho::tree::compute_attribute_image"); @@ -233,7 +234,7 @@ namespace mln compute_attribute_image_from(const Accumulator<A>& a_, const T& t, const Image<V>& values, - mln_ch_value(typename T::function, A)* accu_image = 0) + mln_ch_value(typename T::function, A)* accu_image) { trace::entering("morpho::tree::compute_attribute_image_from"); diff --git a/milena/mln/morpho/tree/data.hh b/milena/mln/morpho/tree/data.hh index 1a0c404..3083759 100644 --- a/milena/mln/morpho/tree/data.hh +++ b/milena/mln/morpho/tree/data.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -93,7 +93,7 @@ namespace mln template <typename T> struct dn_leaf_piter; /// Depth1st tree traversal iterator. - template <typename T> struct depth1st_piter; + template <typename T> class depth1st_piter; template <typename I, typename S> diff --git a/milena/mln/opt/element.hh b/milena/mln/opt/element.hh index 0aabf6b..dc1a415 100644 --- a/milena/mln/opt/element.hh +++ b/milena/mln/opt/element.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -60,8 +61,9 @@ namespace mln template <typename I> inline mln_rvalue(I) element_impl(trait::image::category::domain_morpher, - const Image<I>& ima, unsigned /* index */) + const Image<I>& ima, unsigned index) { + (void) index; return element(*exact(ima).delegatee_()); } @@ -82,8 +84,9 @@ namespace mln template <typename I> inline mln_lvalue(I) element_impl(trait::image::category::domain_morpher, - Image<I>& ima, unsigned /* index */) + Image<I>& ima, unsigned index) { + (void) index; return element(*exact(ima).delegatee_()); } diff --git a/milena/mln/registration/get_rot.hh b/milena/mln/registration/get_rot.hh index e1babf1..28667cb 100644 --- a/milena/mln/registration/get_rot.hh +++ b/milena/mln/registration/get_rot.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -61,6 +62,12 @@ namespace mln { assert(0 && "TODO"); + (void) c; + (void) mu_c; + (void) ck; + (void) map; + (void) mu_xk; + //////SLOW VERSION //// V1 diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index cb6bbca..66bdd33 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -118,6 +118,11 @@ namespace mln const mln_domain(I)& output_domain, unsigned border_thickness) { + (void) input_; + (void) factor; + (void) output_domain; + (void) border_thickness; + // To be written... mlc_abort(I)::check(); @@ -314,6 +319,11 @@ namespace mln const mln_domain(I)& output_domain, unsigned border_thickness) { + (void) input; + (void) factor; + (void) output_domain; + (void) border_thickness; + // Not implemented yet. mlc_abort(I)::check(); } diff --git a/milena/mln/subsampling/gaussian_subsampling.hh b/milena/mln/subsampling/gaussian_subsampling.hh index 4e8f24e..8855b9c 100644 --- a/milena/mln/subsampling/gaussian_subsampling.hh +++ b/milena/mln/subsampling/gaussian_subsampling.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -66,6 +67,8 @@ namespace mln trace::entering("subsampling::gaussian_subsampling"); mln_precondition(exact(input).is_valid()); + (void) sigma; + mln_concrete(I) temp(exact(input).domain()); mln_concrete(I) output(geom::nrows(input) / gap, geom::ncols(input) / gap); //FIXME : image2d only diff --git a/milena/mln/topo/center_only_iter.hh b/milena/mln/topo/center_only_iter.hh index ff072aa..9d52099 100644 --- a/milena/mln/topo/center_only_iter.hh +++ b/milena/mln/topo/center_only_iter.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,7 +45,7 @@ namespace mln { // Forward declaration. - template <unsigned D> class face; + template <unsigned D> struct face; /*----------------------------. @@ -63,7 +64,7 @@ namespace mln as well, since it always contains a single element, the center/reference face (and the traversal order is meaningless). - + This iterator is essentially used to implement other iterators. \see mln::topo::centered_iter_adapter \see mln::complex_lower_window diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index da95019..c9b58b0 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -49,7 +49,7 @@ namespace mln template <unsigned D> class complex; template <unsigned N, unsigned D> class n_face; template <unsigned N, unsigned D> class face_data; - template <unsigned N> class algebraic_face; + template <unsigned N> struct algebraic_face; /*-------. diff --git a/milena/mln/topo/face_data.hh b/milena/mln/topo/face_data.hh index de8028b..1622e51 100644 --- a/milena/mln/topo/face_data.hh +++ b/milena/mln/topo/face_data.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -51,7 +51,7 @@ namespace mln { template <unsigned N, unsigned D> struct lower_dim_faces_set_mixin; template <unsigned N, unsigned D> struct higher_dim_faces_set_mixin; - + template <unsigned N, unsigned D> struct lower_dim_adj_faces_if_dim_matches_; template <unsigned N, unsigned D> diff --git a/milena/mln/topo/skeleton/is_simple_point.hh b/milena/mln/topo/skeleton/is_simple_point.hh index 9fa665c..d852c35 100644 --- a/milena/mln/topo/skeleton/is_simple_point.hh +++ b/milena/mln/topo/skeleton/is_simple_point.hh @@ -209,7 +209,6 @@ namespace mln return internal::nb_connexity_c8[res]; default: mln_assertion(0); - } return 0; } diff --git a/milena/mln/trait/image_from_grid.hh b/milena/mln/trait/image_from_grid.hh index eae5e4e..38fc538 100644 --- a/milena/mln/trait/image_from_grid.hh +++ b/milena/mln/trait/image_from_grid.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,7 +48,7 @@ namespace mln // Fwd decls. template <typename T> struct image1d; - template <typename T> struct image2d; + template <typename T> class image2d; template <typename T> struct image3d; diff --git a/milena/mln/trait/images.hh b/milena/mln/trait/images.hh index 409d773..d8e80b0 100644 --- a/milena/mln/trait/images.hh +++ b/milena/mln/trait/images.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -110,16 +111,16 @@ namespace mln // Primitive types. template <typename T> struct image1d; - template <typename T> struct image2d; + template <typename T> class image2d; template <typename T> struct image3d; namespace pw { template <typename F, typename S> class image; } // Morphers. template <typename I, typename F> struct image_if_base; - template <typename I, typename D> class decorated_image; - template <typename I, typename S> class sub_image; + template <typename I, typename D> struct decorated_image; + template <typename I, typename S> struct sub_image; template <typename I> class safe_image; - template <typename T, typename I> class cast_image_; + template <typename T, typename I> struct cast_image_; namespace value { template <unsigned n, typename I> struct stack_image; } diff --git a/milena/mln/transform/influence_zone_geodesic.hh b/milena/mln/transform/influence_zone_geodesic.hh index b9a763f..64d7702 100644 --- a/milena/mln/transform/influence_zone_geodesic.hh +++ b/milena/mln/transform/influence_zone_geodesic.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -87,6 +87,9 @@ namespace mln influence_zone_geodesic(const Image<I>& input, const Neighborhood<N>& nbh) { + (void) input; + (void) nbh; + // FIXME: To be written... mlc_abort(I)::check(); } diff --git a/milena/mln/util/object_id.hh b/milena/mln/util/object_id.hh index 794abc4..525ff15 100644 --- a/milena/mln/util/object_id.hh +++ b/milena/mln/util/object_id.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -136,6 +137,7 @@ namespace mln inline object_id<Tag,V>::object_id(const object_id<Tag2,V2>& id) { + (void) id; typedef object_id<Tag2,V2> id_t; mlc_abort(id_t)::check(); } diff --git a/milena/mln/value/float01.hh b/milena/mln/value/float01.hh index 23f83df..898853f 100644 --- a/milena/mln/value/float01.hh +++ b/milena/mln/value/float01.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -47,7 +48,7 @@ namespace mln { // Fwd decl. - template <unsigned n> class float01_; + template <unsigned n> struct float01_; class float01; diff --git a/milena/mln/value/float01_f.hh b/milena/mln/value/float01_f.hh index 2769200..3edb4ae 100644 --- a/milena/mln/value/float01_f.hh +++ b/milena/mln/value/float01_f.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,7 +44,7 @@ namespace mln // Fwd decls. namespace value { - struct float01; + class float01; struct float01_f; } diff --git a/milena/mln/value/graylevel.hh b/milena/mln/value/graylevel.hh index cca7e08..fc68391 100644 --- a/milena/mln/value/graylevel.hh +++ b/milena/mln/value/graylevel.hh @@ -63,7 +63,7 @@ namespace mln namespace internal { template <unsigned n> class gray_; - class gray_f; + struct gray_f; template <unsigned n_src, unsigned n_dest> long convert(int val); } diff --git a/milena/mln/value/graylevel_f.hh b/milena/mln/value/graylevel_f.hh index e70927a..4194b25 100644 --- a/milena/mln/value/graylevel_f.hh +++ b/milena/mln/value/graylevel_f.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -57,7 +58,7 @@ namespace mln namespace value { /// \{ Forward declarations. - namespace internal {class gray_f; } + namespace internal { struct gray_f; } struct graylevel_f; template <unsigned n> struct graylevel; struct float01_f; diff --git a/milena/mln/value/internal/gray_.hh b/milena/mln/value/internal/gray_.hh index e672c37..c845c21 100644 --- a/milena/mln/value/internal/gray_.hh +++ b/milena/mln/value/internal/gray_.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -57,8 +58,8 @@ namespace mln /// \{ Forward declarations. template <unsigned n> struct graylevel; - template <unsigned N> class graylevel; - class graylevel_f; + template <unsigned N> struct graylevel; + struct graylevel_f; namespace internal { template <unsigned n> class gray_; @@ -488,6 +489,8 @@ namespace mln void operator+(const graylevel<n>& lhs, const I& i) { + (void) lhs; + (void) i; typename graylevel<n>::wrong_use_of_graylevel___Please_use_the__to_enc__method a; } @@ -498,6 +501,8 @@ namespace mln void operator+(const I& i, const graylevel<n>& rhs) { + (void) i; + (void) rhs; typename graylevel<n>::wrong_use_of_graylevel___Please_use_the__to_enc__method a; } @@ -516,6 +521,8 @@ namespace mln void operator-(const graylevel<n>& lhs, const I& i) { + (void) lhs; + (void) i; typename graylevel<n>::wrong_use_of_graylevel___Please_use_the__to_enc__method a; } @@ -526,6 +533,8 @@ namespace mln void operator-(const I& i, const graylevel<n>& rhs) { + (void) i; + (void) rhs; typename graylevel<n>::wrong_use_of_graylevel___Please_use_the__to_enc__method a; } @@ -592,7 +601,7 @@ namespace mln /// \{ Forward declarations. namespace internal { - class gray_f; + struct gray_f; } /// \} diff --git a/milena/mln/value/internal/gray_f.hh b/milena/mln/value/internal/gray_f.hh index 0408ae4..79a443c 100644 --- a/milena/mln/value/internal/gray_f.hh +++ b/milena/mln/value/internal/gray_f.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -63,7 +63,7 @@ namespace mln namespace internal { template <unsigned n> class gray_; - class gray_f; + struct gray_f; } struct float01_f; @@ -378,6 +378,8 @@ namespace mln void operator+(const graylevel_f& lhs, const I& i) { + (void) lhs; + (void) i; typename Object<I>::wrong_use_of_graylevel_f___Please_use_the__to_enc__method a; } @@ -388,6 +390,8 @@ namespace mln void operator+(const I& i, const graylevel_f& rhs) { + (void) i; + (void) rhs; typename Object<I>::wrong_use_of_graylevel_f___Please_use_the__to_enc__method a; } @@ -398,6 +402,8 @@ namespace mln void operator-(const graylevel_f& lhs, const I& i) { + (void) lhs; + (void) i; typename Object<I>::wrong_use_of_graylevel_f___Please_use_the__to_enc__method a; } @@ -408,6 +414,8 @@ namespace mln void operator-(const I& i, const graylevel_f& rhs) { + (void) i; + (void) rhs; typename Object<I>::wrong_use_of_graylevel_f___Please_use_the__to_enc__method a; } diff --git a/milena/mln/value/lut_vec.hh b/milena/mln/value/lut_vec.hh index b86e541..a3eda5b 100644 --- a/milena/mln/value/lut_vec.hh +++ b/milena/mln/value/lut_vec.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2009, 2010 EPITA Research and Development +// Copyright (C) 2007, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -136,8 +136,9 @@ namespace mln template <typename S, typename T> inline unsigned - lut_vec<S,T>::index_of(const T& /* v */) const + lut_vec<S,T>::index_of(const T& v) const { + (void) v; mln_invariant(0); // FIXME return 0; } diff --git a/milena/mln/world/binary_2d/enlarge.hh b/milena/mln/world/binary_2d/enlarge.hh index 1ffd512..da546e1 100644 --- a/milena/mln/world/binary_2d/enlarge.hh +++ b/milena/mln/world/binary_2d/enlarge.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -328,6 +329,9 @@ namespace mln mln_concrete(I) enlarge_dispatch(const I& input, const mln_value(I)&, unsigned n) { + (void) input; + (void) n; + mlc_abort(I)::check(); return mln_concrete(I)(); } -- 1.7.2.5