- Olena-patches

olena-2.0-39-g7307887 Merge branch 'next' into unstable/scribo
by Guillaume Lazzara 23 Nov '11

23 Nov '11

This is a merge commit message of the following branches: Merge: e916a03 ac769b6 ChangeLog | 8 ++++++++ lrde-scmstats.sh | 10 +++++----- lrde-upload.sh | 5 +++-- 3 files changed, 16 insertions(+), 7 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-13-gac769b6 lrde-scmstats.sh: Compute stats per branches.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

--- ChangeLog | 4 ++++ lrde-scmstats.sh | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b84677b..1a7d31f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * lrde-scmstats.sh: Compute stats per branches. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * lrde-upload.sh: Update list of branches. 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/lrde-scmstats.sh b/lrde-scmstats.sh index 0c84c4c..4919f80 100755 --- a/lrde-scmstats.sh +++ b/lrde-scmstats.sh @@ -27,14 +27,14 @@ branch=$1 # We might want to filter stats for specific branches. # Currently gitstats does not allow that. -#case "$branch" in +case "$branch" in # # Consider these branches only. -# master|next|swilena|mesh-segm-skel|next-build-test) ;; + master|next|swilena|mesh-segm-skel|stable/scribo|unstable/scribo) ;; # # Don't upload other branches. -# *) exit ;; -#esac + *) exit ;; +esac DEST=/lrde/dload/olena/stats/ -gitstats . $DEST +gitstats -c commit_end=$branch . $DEST/$branch -- 1.7.2.5

1 0

olena-2.0-12-gec0f3af lrde-upload.sh: Update list of branches.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

--- ChangeLog | 4 ++++ lrde-upload.sh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2515596..b84677b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lrde-upload.sh: Update list of branches. + 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> * README (Bibliography): Mention the GRETSI 2011 paper. diff --git a/lrde-upload.sh b/lrde-upload.sh index c491891..a4f6169 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -1,6 +1,7 @@ #! /bin/sh -# 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. # @@ -45,7 +46,7 @@ branch=$1 case "$branch" in # Consider these branches only. - master|next|swilena|mesh-segm-skel|next-build-test) ;; + master|next|swilena|mesh-segm-skel|stable/scribo|unstable/scribo) ;; # Don't upload other branches. *) exit ;; esac -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-36-ge916a03
by git＠lrde.epita.fr 23 Nov '11

23 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via e916a0335fe6e931a87fb8de965948ae7674f10c (commit) via 85d28da864d15cf517e3857141d802c411f21047 (commit) via 923296ed8b82d64c6cba045374136c12f8d4d685 (commit) via 6b6f7a188e2a850f405bec64e81f2000e848cfe9 (commit) via ef341a251501dd4c232dfb6ac0f85e41086c4d4f (commit) via 2af40042f361fe4b3fd281354e5e961ab3569730 (commit) via 317c7bee067b7bd678eb55e5ed866861ac892274 (commit) from b926dc165dc73387115470edbbba0b6b2e0964d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- e916a03 Merge branch 'next' into unstable/scribo 85d28da Regenerate mk files. 923296e headers.mk: Regen. 6b6f7a1 Fix compilation issues. ef341a2 Improve tests for literal classes. 317c7be Fix compilation with multiple files. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 69 ++++++++++++++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 4 +- .../examples/tuto4_genericity_and_algorithms.cc | 2 + milena/headers.mk | 5 +- milena/mln/canvas/browsing/backdiagonal2d.hh | 1 + milena/mln/canvas/browsing/breadth_first_search.hh | 9 ++- milena/mln/canvas/browsing/depth_first_search.hh | 1 + milena/mln/canvas/browsing/diagonal2d.hh | 1 + .../canvas/browsing/dir_struct_elt_incr_update.hh | 5 ++ milena/mln/canvas/browsing/directional.hh | 1 + milena/mln/canvas/browsing/fwd.hh | 6 ++ milena/mln/canvas/browsing/hyper_directional.hh | 6 ++ milena/mln/canvas/browsing/snake_fwd.hh | 1 + milena/mln/canvas/browsing/snake_generic.hh | 1 + milena/mln/canvas/browsing/snake_vert.hh | 13 ++++ milena/mln/fun/v2v/hsi_to_rgb.hh | 15 ++++- milena/mln/fun/v2v/rgb_to_hsi.hh | 14 ++++- milena/mln/fun/v2v/rgb_to_hsl.hh | 14 ++++- milena/mln/literal/black.hh | 1 + milena/mln/literal/colors.hh | 14 ++++ milena/mln/literal/grays.hh | 48 +++++++++++-- milena/mln/literal/identity.hh | 15 ++++- milena/mln/literal/max.hh | 19 +++++- milena/mln/literal/min.hh | 15 ++++- milena/mln/literal/one.hh | 16 ++++- milena/mln/literal/origin.hh | 15 ++++- milena/mln/literal/white.hh | 1 + milena/mln/literal/zero.hh | 18 ++++- milena/tests/literal/Makefile.am | 12 +++- .../tests/literal/colors.cc | 62 ++++++++++-------- .../tests/literal/identity.cc | 31 ++++----- .../color_type.hh => milena/tests/literal/max.cc | 27 ++++---- milena/tests/literal/medium_gray.cc | 25 +++---- .../color_type.hh => milena/tests/literal/min.cc | 27 ++++---- .../{core/site_set/box.cc => literal/origin.cc} | 18 +++--- scribo/ChangeLog | 7 ++ scribo/headers.mk | 12 +++- scribo/tests/unit_test/unit-tests.mk | 24 +++++-- 38 files changed, 433 insertions(+), 142 deletions(-) copy scribo/tests/filter/object_links_left_aligned.cc => milena/tests/literal/colors.cc (55%) copy scribo/scribo/core/def/color_type.hh => milena/tests/literal/identity.cc (79%) copy scribo/scribo/core/def/color_type.hh => milena/tests/literal/max.cc (79%) copy scribo/scribo/core/def/color_type.hh => milena/tests/literal/min.cc (79%) copy milena/tests/{core/site_set/box.cc => literal/origin.cc} (81%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: olena-2.0-11-g2af4004
by git＠lrde.epita.fr 23 Nov '11

23 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 2af40042f361fe4b3fd281354e5e961ab3569730 (commit) from 93ca680bd5b2d8e1291f4a542c24548828e92e7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 2af4004 Fix more compilation issues with g++ 4.6.1 and clang++. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 16 ++++++++++ milena/mln/canvas/browsing/snake_vert.hh | 11 +++++++ milena/mln/fun/v2v/hsi_to_rgb.hh | 13 ++++++++- milena/mln/fun/v2v/rgb_to_hsi.hh | 8 +++++ milena/mln/fun/v2v/rgb_to_hsl.hh | 7 ++++ milena/mln/literal/grays.hh | 45 ++++++++++++++++++++++++----- 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, 162 insertions(+), 25 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-36-ge916a03 Merge branch 'next' into unstable/scribo
by Guillaume Lazzara 23 Nov '11

23 Nov '11

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 <z(a)lrde.epita.fr> + 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 <z(a)lrde.epita.fr> ++ + * headers.mk: Regen. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> + + * mln/geom/crop_without_localization.hh: Fix preconditions. + +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> + + * mln/core/image/dmorph/slice_image.hh: Add operator=() for + image2d. + +2011-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/load.hh: Fix memory leak. + +2011-10-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Invert threshold function test. + + * mln/fun/v2b/threshold.hh: Here. + +2011-10-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new crop routines. + + * mln/geom/crop.hh, + * mln/geom/crop_without_localization.hh: New. + +2011-10-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/builtin/floatings.hh: Fix string name for builtin + double type. + +2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> + + 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 <z(a)lrde.epita.fr> 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

1 0

olena-2.0-11-g2af4004 Fix more compilation issues with g++ 4.6.1 and clang++.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

* 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. --- milena/ChangeLog | 16 ++++++++++ milena/mln/canvas/browsing/snake_vert.hh | 11 +++++++ milena/mln/fun/v2v/hsi_to_rgb.hh | 13 ++++++++- milena/mln/fun/v2v/rgb_to_hsi.hh | 8 +++++ milena/mln/fun/v2v/rgb_to_hsl.hh | 7 ++++ milena/mln/literal/grays.hh | 45 ++++++++++++++++++++++++----- 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, 162 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 724f344..555ea72 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + 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-21 Guillaume Lazzara <z(a)lrde.epita.fr> Fix compilation issues with g++ 4.6.1 and clang++. diff --git a/milena/mln/canvas/browsing/snake_vert.hh b/milena/mln/canvas/browsing/snake_vert.hh index 416786c..c984192 100644 --- a/milena/mln/canvas/browsing/snake_vert.hh +++ b/milena/mln/canvas/browsing/snake_vert.hh @@ -83,6 +83,10 @@ namespace mln struct snake_vert_t : public Browsing< snake_vert_t > { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + snake_vert_t(); + template <typename F> void operator()(F& f) const; }; @@ -93,6 +97,13 @@ namespace mln const snake_vert_t snake_vert = snake_vert_t(); +# endif // ! MLN_WO_GLOBAL_VARS + + inline + snake_vert_t::snake_vert_t() + { + } + template <typename F> inline void diff --git a/milena/mln/fun/v2v/hsi_to_rgb.hh b/milena/mln/fun/v2v/hsi_to_rgb.hh index 947e7c4..40201db 100644 --- a/milena/mln/fun/v2v/hsi_to_rgb.hh +++ b/milena/mln/fun/v2v/hsi_to_rgb.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. // @@ -57,6 +58,8 @@ namespace mln { typedef T_rgb result; + f_hsi_to_rgb_(); + template <typename T_hsi> T_rgb operator()(const T_hsi& hsi) const; @@ -74,6 +77,14 @@ namespace mln f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; /// \} +# endif // ! MLN_WO_GLOBAL_VARS + + + template <typename T_rgb> + f_hsi_to_rgb_<T_rgb>::f_hsi_to_rgb_() + { + } + template <typename T_rgb> template <typename T_hsi> inline diff --git a/milena/mln/fun/v2v/rgb_to_hsi.hh b/milena/mln/fun/v2v/rgb_to_hsi.hh index e80cd00..7001813 100644 --- a/milena/mln/fun/v2v/rgb_to_hsi.hh +++ b/milena/mln/fun/v2v/rgb_to_hsi.hh @@ -49,6 +49,8 @@ namespace mln { typedef T_hsi result; + f_rgb_to_hsi_(); + template <typename T_rgb> T_hsi operator()(const T_rgb& rgb) const; @@ -67,6 +69,12 @@ namespace mln /// \} + + template <typename T_hsi> + f_rgb_to_hsi_<T_hsi>::f_rgb_to_hsi_() + { + } + template <typename T_hsi> template <typename T_rgb> inline diff --git a/milena/mln/fun/v2v/rgb_to_hsl.hh b/milena/mln/fun/v2v/rgb_to_hsl.hh index a3da15d..0f63ccd 100644 --- a/milena/mln/fun/v2v/rgb_to_hsl.hh +++ b/milena/mln/fun/v2v/rgb_to_hsl.hh @@ -58,6 +58,8 @@ namespace mln { typedef T_hsl result; + f_rgb_to_hsl_(); + template <typename T_rgb> T_hsl operator()(const T_rgb& rgb) const; @@ -77,6 +79,11 @@ namespace mln 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 --git a/milena/mln/literal/grays.hh b/milena/mln/literal/grays.hh index 79aef78..42dce90 100644 --- a/milena/mln/literal/grays.hh +++ b/milena/mln/literal/grays.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_LITERAL_GRAYS_HH /*! \file - * \brief Definition of the colors literal. + * \brief Definition of the grays literal. * */ @@ -42,32 +43,60 @@ namespace mln /// Type of literal grays. struct light_gray_t : public Literal<light_gray_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + light_gray_t(); }; struct medium_gray_t : public Literal<medium_gray_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + medium_gray_t(); }; struct dark_gray_t : public Literal<dark_gray_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + dark_gray_t(); }; /// Literal light gray. - extern const light_gray_t& light_gray; + extern const light_gray_t light_gray; /// Literal medium_gray. - extern const medium_gray_t& medium_gray; + extern const medium_gray_t medium_gray; /// Literal dark gray. - extern const dark_gray_t& dark_gray; + extern const dark_gray_t dark_gray; # ifndef MLN_INCLUDE_ONLY - const light_gray_t& light_gray = light_gray_t(); +# ifndef MLN_WO_GLOBAL_VARS - 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_INCLUDE_ONLY diff --git a/milena/mln/literal/identity.hh b/milena/mln/literal/identity.hh index f07081f..8e78aad 100644 --- a/milena/mln/literal/identity.hh +++ b/milena/mln/literal/identity.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,16 +43,24 @@ namespace mln /// Type of literal identity. struct identity_t : public Literal<identity_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + identity_t(); }; /// Literal identity. - extern const identity_t& identity; + extern const identity_t identity; # ifndef MLN_INCLUDE_ONLY + inline + identity_t::identity_t() + { + } + # ifndef MLN_WO_GLOBAL_VARS - const identity_t& identity = identity_t(); + const identity_t identity; # endif // !MLN_WO_GLOBAL_VARS diff --git a/milena/mln/literal/max.hh b/milena/mln/literal/max.hh index f590f8f..630584c 100644 --- a/milena/mln/literal/max.hh +++ b/milena/mln/literal/max.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. // @@ -43,6 +44,9 @@ namespace mln /// Type of literal max. struct max_t : public Literal<max_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + max_t(); template <typename T> operator T () const; @@ -50,11 +54,16 @@ namespace mln /// Literal max. - extern const max_t& max; + extern const max_t max; # ifndef MLN_INCLUDE_ONLY + inline + max_t::max_t() + { + } + template <typename T> inline max_t::operator T () const diff --git a/milena/mln/literal/min.hh b/milena/mln/literal/min.hh index 5d37857..eb1abc8 100644 --- a/milena/mln/literal/min.hh +++ b/milena/mln/literal/min.hh @@ -43,6 +43,9 @@ namespace mln /// Type of literal min. struct min_t : public Literal<min_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + min_t(); template <typename T> operator T () const; @@ -50,11 +53,16 @@ namespace mln /// Literal min. - extern const min_t& min; + extern const min_t min; # ifndef MLN_INCLUDE_ONLY + inline + min_t::min_t() + { + } + template <typename T> inline min_t::operator T () const diff --git a/milena/mln/literal/one.hh b/milena/mln/literal/one.hh index 94babc7..310c6f6 100644 --- a/milena/mln/literal/one.hh +++ b/milena/mln/literal/one.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. // @@ -43,6 +44,10 @@ namespace mln /// Type of literal one. struct one_t : public Literal<one_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + one_t(); + // FIXME: Cf. comments in literal/zero.hh. template <typename T> @@ -51,11 +56,16 @@ namespace mln /// Literal one. - extern const one_t& one; + extern const one_t one; # ifndef MLN_INCLUDE_ONLY + inline + one_t::one_t() + { + } + template <typename T> inline one_t::operator const T () const @@ -66,7 +76,7 @@ namespace mln # ifndef MLN_WO_GLOBAL_VARS - const one_t& one = one_t(); + const one_t one; # endif // !MLN_WO_GLOBAL_VARS diff --git a/milena/mln/literal/origin.hh b/milena/mln/literal/origin.hh index 369ffff..8c99669 100644 --- a/milena/mln/literal/origin.hh +++ b/milena/mln/literal/origin.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. // @@ -43,16 +44,24 @@ namespace mln /// Type of literal origin. struct origin_t : public Literal<origin_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + origin_t(); }; /// Literal origin. - extern const origin_t& origin; + extern const origin_t origin; # ifndef MLN_INCLUDE_ONLY + inline + origin_t::origin_t() + { + } + # ifndef MLN_WO_GLOBAL_VARS - const origin_t& origin = origin_t(); + const origin_t origin; # endif // !MLN_WO_GLOBAL_VARS diff --git a/milena/mln/literal/zero.hh b/milena/mln/literal/zero.hh index 4d3a13b..276cbb4 100644 --- a/milena/mln/literal/zero.hh +++ b/milena/mln/literal/zero.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. // @@ -45,6 +46,10 @@ namespace mln /// Type of literal zero. struct zero_t : public Literal<zero_t> { + // This default constructor is needed for compilation with gcc + // 4.6.0, gcc 4.6.1 and Clang. + zero_t(); + // FIXME: (for the record) Add "friend class Literal<zero_t>;" and a protected ctor. template <typename T> @@ -52,10 +57,15 @@ namespace mln }; /// Literal zero. - extern const zero_t& zero; + extern const zero_t zero; # ifndef MLN_INCLUDE_ONLY + inline + zero_t::zero_t() + { + } + template <typename T> inline zero_t::operator const T () const @@ -66,9 +76,9 @@ namespace mln # ifndef MLN_WO_GLOBAL_VARS - const zero_t& zero = zero_t(); + const zero_t zero; -# endif // !MLN_GLOBAL_VARS +# endif // !MLN_WO_GLOBAL_VARS # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

olena-2.0-34-g85d28da Regenerate mk files.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 12 +++++++++--- scribo/tests/unit_test/unit-tests.mk | 24 ++++++++++++++++++------ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 95b6b98..a105435 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regenerate mk files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + 2011-10-06 Roland Levillain <roland(a)lrde.epita.fr> Mention the ICDAR 2011 paper in SCRIBO's README. diff --git a/scribo/headers.mk b/scribo/headers.mk index f636d04..1fd5eee 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,14 +5,20 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ -scribo/binarization/internal/compute_sauvola_threshold.hh \ +scribo/binarization/internal/compute_local_threshold.hh \ scribo/binarization/internal/first_pass_functor.hh \ -scribo/binarization/internal/sauvola_debug.hh \ +scribo/binarization/internal/local_threshold_debug.hh \ +scribo/binarization/internal/niblack_formula.hh \ +scribo/binarization/internal/sauvola_formula.hh \ scribo/binarization/local_threshold.hh \ +scribo/binarization/niblack.hh \ +scribo/binarization/niblack_threshold.hh \ +scribo/binarization/otsu.hh \ +scribo/binarization/otsu_threshold.hh \ scribo/binarization/sauvola.hh \ scribo/binarization/sauvola_ms.hh \ scribo/binarization/sauvola_ms_split.hh \ -scribo/binarization/sauvola_threshold_image.hh \ +scribo/binarization/sauvola_threshold.hh \ scribo/canvas/integral_browsing.hh \ scribo/convert/from_base64.hh \ scribo/convert/from_qimage.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 667bffa..0318303 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -226,14 +226,20 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ -scribo_binarization_internal_compute_sauvola_threshold \ +scribo_binarization_internal_compute_local_threshold \ scribo_binarization_internal_first_pass_functor \ -scribo_binarization_internal_sauvola_debug \ +scribo_binarization_internal_local_threshold_debug \ +scribo_binarization_internal_niblack_formula \ +scribo_binarization_internal_sauvola_formula \ scribo_binarization_local_threshold \ +scribo_binarization_niblack \ +scribo_binarization_niblack_threshold \ +scribo_binarization_otsu \ +scribo_binarization_otsu_threshold \ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ scribo_binarization_sauvola_ms_split \ -scribo_binarization_sauvola_threshold_image \ +scribo_binarization_sauvola_threshold \ scribo_canvas_integral_browsing \ scribo_convert_to_base64 \ scribo_core_all \ @@ -475,14 +481,20 @@ scribo_all_SOURCES = scribo_all.cc scribo_binarization_all_SOURCES = scribo_binarization_all.cc scribo_binarization_global_threshold_SOURCES = scribo_binarization_global_threshold.cc scribo_binarization_global_threshold_auto_SOURCES = scribo_binarization_global_threshold_auto.cc -scribo_binarization_internal_compute_sauvola_threshold_SOURCES = scribo_binarization_internal_compute_sauvola_threshold.cc +scribo_binarization_internal_compute_local_threshold_SOURCES = scribo_binarization_internal_compute_local_threshold.cc scribo_binarization_internal_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc -scribo_binarization_internal_sauvola_debug_SOURCES = scribo_binarization_internal_sauvola_debug.cc +scribo_binarization_internal_local_threshold_debug_SOURCES = scribo_binarization_internal_local_threshold_debug.cc +scribo_binarization_internal_niblack_formula_SOURCES = scribo_binarization_internal_niblack_formula.cc +scribo_binarization_internal_sauvola_formula_SOURCES = scribo_binarization_internal_sauvola_formula.cc scribo_binarization_local_threshold_SOURCES = scribo_binarization_local_threshold.cc +scribo_binarization_niblack_SOURCES = scribo_binarization_niblack.cc +scribo_binarization_niblack_threshold_SOURCES = scribo_binarization_niblack_threshold.cc +scribo_binarization_otsu_SOURCES = scribo_binarization_otsu.cc +scribo_binarization_otsu_threshold_SOURCES = scribo_binarization_otsu_threshold.cc scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_split.cc -scribo_binarization_sauvola_threshold_image_SOURCES = scribo_binarization_sauvola_threshold_image.cc +scribo_binarization_sauvola_threshold_SOURCES = scribo_binarization_sauvola_threshold.cc scribo_canvas_integral_browsing_SOURCES = scribo_canvas_integral_browsing.cc scribo_convert_to_base64_SOURCES = scribo_convert_to_base64.cc scribo_core_all_SOURCES = scribo_core_all.cc -- 1.7.2.5

1 0

olena-2.0-33-g923296e headers.mk: Regen.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 272b3c6..a07ebe5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation issues. * apps/papers/levillain.09.ismm/graph.cc: Fix wrong changes. diff --git a/milena/headers.mk b/milena/headers.mk index c3d75ab..db0c05f 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -542,7 +542,8 @@ mln/fun/stat/mahalanobis.hh \ mln/fun/v2b/all.hh \ mln/fun/v2b/essential.hh \ mln/fun/v2b/lnot.hh \ -mln/fun/v2b/threshold.hh \ +mln/fun/v2b/threshold_ge.hh \ +mln/fun/v2b/threshold_le.hh \ mln/fun/v2i/all.hh \ mln/fun/v2i/index_of_value.hh \ mln/fun/v2v/abs.hh \ @@ -606,6 +607,8 @@ mln/geom/all.hh \ mln/geom/bbox.hh \ mln/geom/chamfer.hh \ mln/geom/complex_geometry.hh \ +mln/geom/crop.hh \ +mln/geom/crop_without_localization.hh \ mln/geom/delta.hh \ mln/geom/essential.hh \ mln/geom/horizontal_symmetry.hh \ -- 1.7.2.5

1 0

olena-2.0-32-g6b6f7a1 Fix compilation issues.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

* apps/papers/levillain.09.ismm/graph.cc: Fix wrong changes. * doc/examples/tuto4_genericity_and_algorithms.cc: Add a missing include. --- milena/ChangeLog | 9 +++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 4 ++-- .../examples/tuto4_genericity_and_algorithms.cc | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fdf84db..272b3c6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + 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 <z(a)lrde.epita.fr> + Improve tests for literal classes. * tests/literal/Makefile.am: Update targets. diff --git a/milena/apps/papers/levillain.09.ismm/graph.cc b/milena/apps/papers/levillain.09.ismm/graph.cc index bf37df2..db9692d 100644 --- a/milena/apps/papers/levillain.09.ismm/graph.cc +++ b/milena/apps/papers/levillain.09.ismm/graph.cc @@ -38,7 +38,7 @@ #include <mln/debug/println.hh> #include <mln/draw/line.hh> #include <mln/pw/all.hh> -#include <mln/binarization/threshold_ge.hh> +#include <mln/binarization/threshold.hh> #include <mln/value/int_u8.hh> #include <mln/value/label_8.hh> @@ -314,7 +314,7 @@ make_complex_image(const mln::image2d<mln::value::int_u8>& input) unsigned nlabels; image2d<unsigned> label = - labeling::blobs(mln::binarization::threshold_ge(input, 1), c4(), nlabels); + labeling::blobs(mln::binarization::threshold(input, 1), c4(), nlabels); std::cout << "n seeds = " << nlabels << std::endl; { diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index dcc57a3..5639e84 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -33,6 +33,8 @@ #include <mln/core/var.hh> #include <mln/core/alias/neighb2d.hh> +#include <mln/binarization/binarization.hh> + #include <mln/fun/p2b/chess.hh> #include <mln/extract/green.hh> -- 1.7.2.5

1 0