This is a merge commit message of the following branches: Merge: 85d28da 2af4004 Conflicts: milena/mln/canvas/browsing/snake_vert.hh milena/mln/fun/v2v/hsi_to_rgb.hh milena/mln/literal/grays.hh milena/ChangeLog | 16 +++++++++++ milena/mln/canvas/browsing/snake_vert.hh | 10 +++++++ milena/mln/fun/v2v/hsi_to_rgb.hh | 9 ++++++ milena/mln/fun/v2v/rgb_to_hsi.hh | 8 +++++ milena/mln/fun/v2v/rgb_to_hsl.hh | 7 +++++ milena/mln/literal/grays.hh | 44 ++++++++++++++++++++++++----- milena/mln/literal/identity.hh | 15 ++++++++-- milena/mln/literal/max.hh | 13 +++++++- milena/mln/literal/min.hh | 10 ++++++- milena/mln/literal/one.hh | 16 +++++++++-- milena/mln/literal/origin.hh | 15 ++++++++-- milena/mln/literal/zero.hh | 18 +++++++++--- 12 files changed, 157 insertions(+), 24 deletions(-) diff --cc milena/ChangeLog index a07ebe5,555ea72..2ad2782 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,190 -1,19 +1,206 @@@ 2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix more compilation issues with g++ 4.6.1 and clang++. + + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/grays.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/zero.hh: Add default constructors. + ++2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; ++ + * headers.mk: Regen. + +2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation issues. + + * apps/papers/levillain.09.ismm/graph.cc: Fix wrong changes. + + * doc/examples/tuto4_genericity_and_algorithms.cc: Add a missing + include. + +2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Improve tests for literal classes. + + * tests/literal/Makefile.am: Update targets. + + * tests/literal/colors.cc, + * tests/literal/identity.cc, + * tests/literal/max.cc, + * tests/literal/min.cc, + * tests/literal/origin.cc: New. + + * tests/literal/medium_gray.cc: Make a real test. + +2011-11-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation with multiple files. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/grays.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/white.hh: Add missing inline keyword and + MLN_WO_GLOBAL_VARS guards. + +2011-11-22 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Add two variants of the threshold function. + + * apps/papers/levillain.09.ismm/graph.cc, + * doc/examples/tuto4_genericity_and_algorithms.cc, + * mln/binarization/threshold.hh, + * mln/fun/v2b/all.hh, + * mln/fun/v2b/essential.hh, + * mln/world/binary_2d/enlarge.hh, + * tests/labeling/n_max.cc: Update includes and use of threshold + function. + + * mln/fun/v2b/threshold.hh: Replaced... + + * mln/fun/v2b/threshold_ge.hh, + * mln/fun/v2b/threshold_le.hh: ... by these files. + + * tests/unit_test/unit-tests.mk: Regen. + +2011-11-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/geom/crop_without_localization.hh: Fix preconditions. + +2011-11-16 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation Warnings with latest g++ versions. + + * apps/papers/levillain.09.ismm/graph.cc, + * mln/canvas/browsing/diagonal2d.hh, + * mln/morpho/watershed/topological.hh: Remove unused variable. + + * mln/canvas/labeling/sorted.hh, + * mln/core/concept/accumulator.hh, + * mln/core/concept/box.hh, + * mln/core/concept/gdpoint.hh, + * mln/core/concept/generalized_pixel.hh, + * mln/core/concept/gpoint.hh, + * mln/core/concept/graph.hh, + * mln/core/concept/image.hh, + * mln/core/concept/iterator.hh, + * mln/core/concept/neighborhood.hh, + * mln/core/concept/proxy.hh, + * mln/core/concept/pseudo_site.hh, + * mln/core/concept/site_iterator.hh, + * mln/core/concept/site_proxy.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/value_iterator.hh, + * mln/core/concept/value_set.hh, + * mln/core/concept/weighted_window.hh, + * mln/core/concept/window.hh, + * mln/core/image/imorph/decorated_image.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/morpho/reconstruction/by_erosion/union_find.hh, + * mln/topo/internal/complex_relative_iterator_base.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point1d.cc, + * tests/metal/unconst.cc, + * tests/morpho/complex_image_wst.cc, + * apps/papers/levillain.09.ismm/graph.cc, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/labeling/sorted.hh, + * mln/core/concept/accumulator.hh, + * mln/core/concept/box.hh, + * mln/core/concept/gdpoint.hh, + * mln/core/concept/generalized_pixel.hh, + * mln/core/concept/gpoint.hh, + * mln/core/concept/graph.hh, + * mln/core/concept/image.hh, + * mln/core/concept/iterator.hh, + * mln/core/concept/neighborhood.hh, + * mln/core/concept/proxy.hh, + * mln/core/concept/pseudo_site.hh, + * mln/core/concept/site_iterator.hh, + * mln/core/concept/site_proxy.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/value_iterator.hh, + * mln/core/concept/value_set.hh, + * mln/core/concept/weighted_window.hh, + * mln/core/concept/window.hh, + * mln/core/image/imorph/decorated_image.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/morpho/reconstruction/by_erosion/union_find.hh, + * mln/morpho/watershed/topological.hh, + * mln/topo/internal/complex_relative_iterator_base.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point1d.cc, + * tests/metal/unconst.cc, + * tests/morpho/complex_image_wst.cc, + * tests/trait/super.cc: Fix unused variable warnings. + +2011-10-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/image/dmorph/slice_image.hh: Add operator=() for + image2d. + +2011-10-18 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/io/dicom/load.hh: Fix memory leak. + +2011-10-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Invert threshold function test. + + * mln/fun/v2b/threshold.hh: Here. + +2011-10-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Add new crop routines. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh: New. + +2011-10-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/value/builtin/floatings.hh: Fix string name for builtin + double type. + +2011-10-04 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Handle the case of filling an empty border. + + * mln/border/fill.hh (mln::border::impl::fill_size_1): Here. + Aesthetic changes. + * tests/border/fill_0.cc: New test. + * tests/border/Makefile.am (check_PROGRAMS): Add fill_0. + (fill_0_SOURCES): New. + 2011-11-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Fix compilation issues with g++ 4.6.1 and clang++. diff --cc milena/mln/fun/v2v/rgb_to_hsi.hh index a0cf9b9,7001813..12e2a9d --- a/milena/mln/fun/v2v/rgb_to_hsi.hh +++ b/milena/mln/fun/v2v/rgb_to_hsi.hh @@@ -69,8 -68,13 +71,14 @@@ namespace ml f_rgb_to_hsi_f_t f_rgb_to_hsi_f; /// \} +# endif // ! MLN_WO_GLOBAL_VARS + + template <typename T_hsi> + f_rgb_to_hsi_<T_hsi>::f_rgb_to_hsi_() + { + } + template <typename T_hsi> template <typename T_rgb> inline diff --cc milena/mln/fun/v2v/rgb_to_hsl.hh index e7486ca,0f63ccd..b28036c --- a/milena/mln/fun/v2v/rgb_to_hsl.hh +++ b/milena/mln/fun/v2v/rgb_to_hsl.hh @@@ -77,9 -77,13 +79,14 @@@ namespace ml f_rgb_to_hsl_f_t f_rgb_to_hsl_f; /// \} +# endif // ! MLN_WO_GLOBAL_VARS template <typename T_hsl> + f_rgb_to_hsl_f_t<T_hsl>::f_rgb_to_hsl_f_t() + { + } + + template <typename T_hsl> template <typename T_rgb> inline T_hsl diff --cc milena/mln/literal/grays.hh index 0a8687b,42dce90..1618a83 --- a/milena/mln/literal/grays.hh +++ b/milena/mln/literal/grays.hh @@@ -64,15 -74,30 +74,33 @@@ namespace ml # ifndef MLN_INCLUDE_ONLY # ifndef MLN_WO_GLOBAL_VARS - const light_gray_t& light_gray = light_gray_t(); - const medium_gray_t& medium_gray = medium_gray_t(); + const light_gray_t light_gray; - const dark_gray_t& dark_gray = dark_gray_t(); + const medium_gray_t medium_gray; + + const dark_gray_t dark_gray; + + # endif // ! MLN_WO_GLOBAL_VARS + + inline + light_gray_t::light_gray_t() + { + } + + inline + medium_gray_t::medium_gray_t() + { + } + + inline + dark_gray_t::dark_gray_t() + { + } +# endif // ! MLN_WO_GLOBAL_VARS + + # endif // !MLN_INCLUDE_ONLY } // end of namespace mln::literal hooks/post-receive -- Olena, a generic and efficient image processing platform