- Olena-patches

branch next updated: olena-2.0-14-ge2e8ec0
by git＠lrde.epita.fr 24 Nov '11

24 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 e2e8ec06e477c50bb1a3448650b43dc400ec4b46 (commit) from ac769b6c00fb4324d067a750bb0b6d1638031dea (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 ----------------------------------------------------------------- e2e8ec0 Fix compilation with multiple files. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 26 ++++++++++++++++++++ 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 | 4 ++- milena/mln/fun/v2v/hsi_to_rgb.hh | 4 ++- milena/mln/fun/v2v/rgb_to_hsi.hh | 6 ++++- milena/mln/fun/v2v/rgb_to_hsl.hh | 7 ++++- milena/mln/literal/black.hh | 1 + milena/mln/literal/colors.hh | 14 ++++++++++ milena/mln/literal/max.hh | 6 ++++- milena/mln/literal/min.hh | 5 +++- milena/mln/literal/white.hh | 1 + 20 files changed, 97 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-42-g54defbb New routine in Milena.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

* mln/data/compute_in_window.hh: New. * tests/data/Makefile.am: New target. * tests/data/compute_in_window.cc: New test. --- milena/ChangeLog | 10 + milena/mln/data/compute_in_window.hh | 248 ++++++++++++++++++++ milena/tests/data/Makefile.am | 2 + ...ithout_localization.cc => compute_in_window.cc} | 66 +++--- 4 files changed, 292 insertions(+), 34 deletions(-) create mode 100644 milena/mln/data/compute_in_window.hh copy milena/tests/data/{paste_without_localization.cc => compute_in_window.cc} (61%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 900764c..a628305 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + New routine in Milena. + + * mln/data/compute_in_window.hh: New. + + * tests/data/Makefile.am: New target. + + * tests/data/compute_in_window.cc: New test. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix compilation with multiple files. * mln/canvas/browsing/backdiagonal2d.hh, diff --git a/milena/mln/data/compute_in_window.hh b/milena/mln/data/compute_in_window.hh new file mode 100644 index 0000000..297a923 --- /dev/null +++ b/milena/mln/data/compute_in_window.hh @@ -0,0 +1,248 @@ +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_DATA_COMPUTE_HH +# define MLN_DATA_COMPUTE_HH + +/// \file +/// +/// Compute an accumulator for each image pixel values using neighbor +/// pixel values. + +# include <mln/accu/image/init.hh> +# include <mln/accu/image/to_result.hh> +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/border/mirror.hh> +# include <mln/extension/adjust.hh> + +# include <mln/debug/println_with_border.hh> + +namespace mln +{ + + namespace data + { + + + /// Compute an accumulator for each image pixel values using neighbor + /// pixel values. + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window(const Accumulator<A>& a, const Image& input, + const Window<W>& win); + + /// \overload + /// + /// \param[in] a A meta-accumulator. + /// \param[in] input The input image. + /// \return The accumulator result. + /// + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window(const Meta_Accumulator<A>& a, const Image& input, + const Window<W>& win); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename A, typename I, typename W> + void + compute_in_window_tests(const Accumulator<A>& a, const Image& input_, + const Window<W>& win_) + { + (void) a; + const W& win = exact(win_); + const I& input = exact(input_); + + mln_assertion(win.is_valid()); + mln_assertion(input.is_valid()); + } + + } // end of namespace mln::data::internal + + + namespace impl + { + + namespace generic + { + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window(const Accumulator<A>& a, + const Image& input_, + const Window<W>& win_) + { + trace::entering("mln::impl::generic::compute_in_window"); + + const I& input = exact(input_); + const W& win = exact(win_); + + internal::compute_in_window_tests(a, input, win); + + mln_ch_value(I, A) accu; + initialize(accu, input); + + accu::image::init(accu); + + mln_piter(I) p(accu.domain()); + mln_qiter(W) q(win, p); + + for_all(p) + for_all(q) + if (input.domain().has(q)) + accu(p).take(input(q)); + + mln_ch_value(I, mln_result(A)) + output = accu::image::to_result(accu); + + trace::exiting("mln::impl::generic::compute_in_window"); + return output; + } + + } // end of namespace mln::impl::generic + + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window_fastest(const Accumulator<A>& a, + const Image& input_, + const Window<W>& win_) + { + trace::entering("mln::impl::generic::compute_in_window_fastest"); + + const W& win = exact(win_); + const I& input = exact(input_); + + internal::compute_in_window_tests(a, input, win); + + typedef mln_ch_value(I, A) J; + J accu; + initialize(accu, input); + + accu::image::init(accu); + + extension::adjust(input, win); + border::mirror(input); + + mln_pixter(J) p(accu); + mln_qixter(J, W) q(p, win); + + for_all(p) + for_all(q) + p.val().take(input.element(q.offset())); + + mln_ch_value(I, mln_result(A)) + output = accu::image::to_result(accu); + + trace::exiting("mln::impl::generic::compute_in_window_fastest"); + return output; + } + + + } // end of namespace mln::data::impl + + + // Dispatch + + namespace internal + { + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window_dispatch(const Accumulator<A>& a, + const Image& input, + const Window<W>& win, + trait::image::speed::fastest) + { + return impl::compute_in_window_fastest(a, input, win); + } + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window_dispatch(const Accumulator<A>& a, + const Image& input, + const Window<W>& win, + trait::image::speed::any) + { + return impl::generic::compute_in_window(a, input, win); + } + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window_dispatch(const Accumulator<A>& a, + const Image& input, + const Window<W>& win) + { + return compute_in_window_dispatch(a, input, win, + mln_trait_image_speed(I)()); + } + + } // end of namespace mln::data::internal + + + + // Facades. + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window(const Accumulator<A>& a, const Image& input, + const Window<W>& win) + { + trace::entering("data::compute_in_window"); + + internal::compute_in_window_tests(a, input, win); + + mln_ch_value(I, mln_result(A)) + output = data::internal::compute_in_window_dispatch(a, input, win); + + trace::exiting("data::compute_in_window"); + return output; + } + + + template <typename A, typename I, typename W> + mln_ch_value(I, mln_result(A)) + compute_in_window(const Meta_Accumulator<A>& a, const Image& input, + const Window<W>& win) + { + typedef mln_accu_with(A, mln_value(I)) A_; + A_ a_ = accu::unmeta(exact(a), mln_value(I)()); + + return data::compute_in_window(a_, input, win); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::data + +} // end of namespace mln + + +#endif // ! MLN_DATA_COMPUTE_HH diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 205337e..4b04dfb 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -23,6 +23,7 @@ check_PROGRAMS = \ apply \ compare \ compute \ + compute_in_window \ convert \ fill \ fill_with_image \ @@ -45,6 +46,7 @@ abs_SOURCES = abs.cc apply_SOURCES = apply.cc compare_SOURCES = compare.cc compute_SOURCES = compute.cc +compute_in_window_SOURCES = compute_in_window.cc convert_SOURCES = convert.cc fill_SOURCES = fill.cc fill_with_image_SOURCES = fill_with_image.cc diff --git a/milena/tests/data/paste_without_localization.cc b/milena/tests/data/compute_in_window.cc similarity index 61% copy from milena/tests/data/paste_without_localization.cc copy to milena/tests/data/compute_in_window.cc index dd0f479..8df7f7a 100644 --- a/milena/tests/data/paste_without_localization.cc +++ b/milena/tests/data/compute_in_window.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,59 +23,57 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <mln/debug/println.hh> #include <mln/core/image/image2d.hh> - -#include <mln/data/paste_without_localization.hh> -#include <mln/data/compare.hh> - +#include <mln/core/alias/window2d.hh> +#include <mln/data/compute_in_window.hh> #include <mln/debug/iota.hh> -#include <mln/debug/println.hh> +#include <mln/accu/stat/mean.hh> +#include <mln/make/image2d.hh> +#include <mln/data/compare.hh> +#include <mln/data/convert.hh> int main() { using namespace mln; - box2d b(point2d(1,2), point2d(6,8)); - image2d<unsigned> ima(b, 3); + image2d<int> ima(3, 3); debug::iota(ima); - image2d<unsigned> tmp(6, 7, 3); - image2d<unsigned> ref(6, 7, 3); - debug::iota(ref); + // Generic + { + int data[] = { + 3, 3, 4, + 4, 5, 5, + 6, 6, 7 + }; + accu::stat::mean<int> m; + image2d<float> res = data::impl::generic::compute_in_window(m, ima, win_c8p()); + image2d<int> res_i = data::convert(int(), res); - // Lines - { - data::impl::paste_without_localization_lines(ima, tmp); - mln_assertion(tmp == ref); + image2d<int> ref = make::image2d(data); + + mln_assertion(res_i == ref); } // Fastest { - data::impl::paste_without_localization_fastest(ima, tmp); - mln_assertion(tmp == ref); - } + int data[] = { + 2, 3, 4, + 4, 5, 6, + 6, 7, 8 + }; - // Fast - { - data::impl::paste_without_localization_fast(ima, tmp); - mln_assertion(tmp == ref); - } - - // Generic - { - data::impl::generic::paste_without_localization(ima, tmp); - mln_assertion(tmp == ref); - } + accu::stat::mean<int> m; + image2d<float> res = data::compute_in_window(m, ima, win_c8p()); + image2d<int> res_i = data::convert(int(), res); + image2d<int> ref = make::image2d(data); - // Dispatch - { - data::paste_without_localization(ima, tmp); - mln_assertion(tmp == ref); + mln_assertion(res_i == ref); } - } -- 1.7.2.5

1 0

Re: [Olena-patches] [Olena] #95: Create an Olena 1.x port for the MacPorts (Mac OS X)
by Olena Trac 23 Nov '11

23 Nov '11

#95: Create an Olena 1.x port for the MacPorts (Mac OS X) ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Comment(by lazzara): Since Olena 2.0, the PortFile can be generated. It has been submitted to macports maintainers: https://trac.macports.org/ticket/32206 Currently, this is a single portfile for the whole platform providing modules as port variants. Scribo is enabled by default whereas Swilena is not. -- Ticket URL: <https://trac.lrde.org/olena/ticket/95#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

olena-2.0-41-gd5de133 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: 7307887 e2e8ec0 Conflicts: milena/mln/canvas/browsing/snake_vert.hh milena/ChangeLog | 26 ++++++++++++++++++++++++++ milena/mln/canvas/browsing/snake_vert.hh | 2 +- milena/mln/fun/v2v/hsi_to_rgb.hh | 2 +- milena/mln/literal/grays.hh | 3 --- 4 files changed, 28 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-14-ge2e8ec0 Fix compilation with multiple files.
by Guillaume Lazzara 23 Nov '11

23 Nov '11

* 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. --- milena/ChangeLog | 26 ++++++++++++++++++++ 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 | 4 ++- milena/mln/fun/v2v/hsi_to_rgb.hh | 4 ++- milena/mln/fun/v2v/rgb_to_hsi.hh | 6 ++++- milena/mln/fun/v2v/rgb_to_hsl.hh | 7 ++++- milena/mln/literal/black.hh | 1 + milena/mln/literal/colors.hh | 14 ++++++++++ milena/mln/literal/max.hh | 6 ++++- milena/mln/literal/min.hh | 5 +++- milena/mln/literal/white.hh | 1 + 20 files changed, 97 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 555ea72..b51d355 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 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-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, diff --git a/milena/mln/canvas/browsing/backdiagonal2d.hh b/milena/mln/canvas/browsing/backdiagonal2d.hh index 0ec455e..adfdecb 100644 --- a/milena/mln/canvas/browsing/backdiagonal2d.hh +++ b/milena/mln/canvas/browsing/backdiagonal2d.hh @@ -102,6 +102,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline backdiagonal2d_t::backdiagonal2d_t() { } diff --git a/milena/mln/canvas/browsing/breadth_first_search.hh b/milena/mln/canvas/browsing/breadth_first_search.hh index a637114..a7a8bce 100644 --- a/milena/mln/canvas/browsing/breadth_first_search.hh +++ b/milena/mln/canvas/browsing/breadth_first_search.hh @@ -91,12 +91,17 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - const breadth_first_search_t breadth_first_search; - + inline breadth_first_search_t::breadth_first_search_t() { } +# ifndef MLN_WO_GLOBAL_VARS + + const breadth_first_search_t breadth_first_search; + +# endif // ! MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::canvas::browsing diff --git a/milena/mln/canvas/browsing/depth_first_search.hh b/milena/mln/canvas/browsing/depth_first_search.hh index ecb2c08..5aacdea 100644 --- a/milena/mln/canvas/browsing/depth_first_search.hh +++ b/milena/mln/canvas/browsing/depth_first_search.hh @@ -97,6 +97,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline depth_first_search_t::depth_first_search_t() { } diff --git a/milena/mln/canvas/browsing/diagonal2d.hh b/milena/mln/canvas/browsing/diagonal2d.hh index 246f930..0dc2cf7 100644 --- a/milena/mln/canvas/browsing/diagonal2d.hh +++ b/milena/mln/canvas/browsing/diagonal2d.hh @@ -99,6 +99,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline diagonal2d_t::diagonal2d_t() { } diff --git a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh index 0037229..6e6f3a1 100644 --- a/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh +++ b/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh @@ -98,8 +98,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const dir_struct_elt_incr_update_t dir_struct_elt_incr_update; +# endif // ! MLN_WO_GLOBAL_VARS + + inline dir_struct_elt_incr_update_t::dir_struct_elt_incr_update_t() { } diff --git a/milena/mln/canvas/browsing/directional.hh b/milena/mln/canvas/browsing/directional.hh index 8931cad..03b9956 100644 --- a/milena/mln/canvas/browsing/directional.hh +++ b/milena/mln/canvas/browsing/directional.hh @@ -107,6 +107,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline directional_t::directional_t() { } diff --git a/milena/mln/canvas/browsing/fwd.hh b/milena/mln/canvas/browsing/fwd.hh index 86c9bf8..63204bf 100644 --- a/milena/mln/canvas/browsing/fwd.hh +++ b/milena/mln/canvas/browsing/fwd.hh @@ -84,8 +84,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const fwd_t fwd; +# endif // ! MLN_WO_GLOBAL_VARS + + + inline fwd_t::fwd_t() { } diff --git a/milena/mln/canvas/browsing/hyper_directional.hh b/milena/mln/canvas/browsing/hyper_directional.hh index 65bb794..84e8e9c 100644 --- a/milena/mln/canvas/browsing/hyper_directional.hh +++ b/milena/mln/canvas/browsing/hyper_directional.hh @@ -86,8 +86,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const hyper_directional_t hyper_directional; +# endif // ! MLN_WO_GLOBAL_VARS + + + inline hyper_directional_t::hyper_directional_t() { } diff --git a/milena/mln/canvas/browsing/snake_fwd.hh b/milena/mln/canvas/browsing/snake_fwd.hh index 06b72df..855723e 100644 --- a/milena/mln/canvas/browsing/snake_fwd.hh +++ b/milena/mln/canvas/browsing/snake_fwd.hh @@ -101,6 +101,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline snake_fwd_t::snake_fwd_t() { } diff --git a/milena/mln/canvas/browsing/snake_generic.hh b/milena/mln/canvas/browsing/snake_generic.hh index af9f799..b0ba22e 100644 --- a/milena/mln/canvas/browsing/snake_generic.hh +++ b/milena/mln/canvas/browsing/snake_generic.hh @@ -95,6 +95,7 @@ namespace mln # endif // ! MLN_WO_GLOBAL_VARS + inline snake_generic_t::snake_generic_t() { } diff --git a/milena/mln/canvas/browsing/snake_vert.hh b/milena/mln/canvas/browsing/snake_vert.hh index c984192..f4614e6 100644 --- a/milena/mln/canvas/browsing/snake_vert.hh +++ b/milena/mln/canvas/browsing/snake_vert.hh @@ -95,7 +95,9 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - const snake_vert_t snake_vert = snake_vert_t(); +# ifndef MLN_WO_GLOBAL_VARS + + const snake_vert_t snake_vert; # endif // ! MLN_WO_GLOBAL_VARS diff --git a/milena/mln/fun/v2v/hsi_to_rgb.hh b/milena/mln/fun/v2v/hsi_to_rgb.hh index 40201db..0011e2b 100644 --- a/milena/mln/fun/v2v/hsi_to_rgb.hh +++ b/milena/mln/fun/v2v/hsi_to_rgb.hh @@ -72,6 +72,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + /// Global variable. /// \{ f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; @@ -79,12 +81,12 @@ namespace mln # 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 7001813..12e2a9d 100644 --- a/milena/mln/fun/v2v/rgb_to_hsi.hh +++ b/milena/mln/fun/v2v/rgb_to_hsi.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. // @@ -63,11 +64,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + /// Global variables. /// \{ f_rgb_to_hsi_f_t f_rgb_to_hsi_f; /// \} +# endif // ! MLN_WO_GLOBAL_VARS template <typename T_hsi> diff --git a/milena/mln/fun/v2v/rgb_to_hsl.hh b/milena/mln/fun/v2v/rgb_to_hsl.hh index 0f63ccd..b28036c 100644 --- a/milena/mln/fun/v2v/rgb_to_hsl.hh +++ b/milena/mln/fun/v2v/rgb_to_hsl.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. // @@ -72,11 +72,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + /// Global variables. /// \{ 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() diff --git a/milena/mln/literal/black.hh b/milena/mln/literal/black.hh index 6ffbe33..3b0bd2f 100644 --- a/milena/mln/literal/black.hh +++ b/milena/mln/literal/black.hh @@ -65,6 +65,7 @@ namespace mln # endif + inline black_t::black_t() { } diff --git a/milena/mln/literal/colors.hh b/milena/mln/literal/colors.hh index 52c05d0..e70d843 100644 --- a/milena/mln/literal/colors.hh +++ b/milena/mln/literal/colors.hh @@ -195,58 +195,72 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline red_t::red_t() { } + inline green_t::green_t() { } + inline blue_t::blue_t() { } + inline brown_t::brown_t() { } + inline lime_t::lime_t() { } + inline orange_t::orange_t() { } + inline pink_t::pink_t() { } + inline purple_t::purple_t() { } + inline teal_t::teal_t() { } + inline violet_t::violet_t() { } + inline cyan_t::cyan_t() { } + inline magenta_t::magenta_t() { } + inline yellow_t::yellow_t() { } + inline olive_t::olive_t() { } diff --git a/milena/mln/literal/max.hh b/milena/mln/literal/max.hh index 630584c..1085750 100644 --- a/milena/mln/literal/max.hh +++ b/milena/mln/literal/max.hh @@ -72,7 +72,11 @@ namespace mln } - const max_t& max = max_t(); +# ifndef MLN_WO_GLOBAL_VARS + + const max_t max; + +# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/literal/min.hh b/milena/mln/literal/min.hh index eb1abc8..3ac5014 100644 --- a/milena/mln/literal/min.hh +++ b/milena/mln/literal/min.hh @@ -70,8 +70,11 @@ namespace mln return mln_min(T); } +# ifndef MLN_WO_GLOBAL_VARS - const min_t& min = min_t(); + const min_t min; + +# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/literal/white.hh b/milena/mln/literal/white.hh index 620a73a..7f7a80b 100644 --- a/milena/mln/literal/white.hh +++ b/milena/mln/literal/white.hh @@ -65,6 +65,7 @@ namespace mln # endif + inline white_t::white_t() { } -- 1.7.2.5

1 0

[Olena] #243: Missing user-provided default constructor
by Olena Trac 23 Nov '11

23 Nov '11

#243: Missing user-provided default constructor ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Compilation problem with Clang (LLVM), reported by Fabien Freling: * https://www.lrde.epita.fr/pipermail/olena-bugs/2011-April/000146.html -- Ticket URL: <https://trac.lrde.org/olena/ticket/243> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 4

[Olena] #239: Have Scribo be compatible with (also) Tesseract 3.0
by Olena Trac 23 Nov '11

23 Nov '11

#239: Have Scribo be compatible with (also) Tesseract 3.0 -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Component: Scribo | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Scribo's optional parts requiring Tesseract work well with its version 2.0, but this is no longer true with version 3.0, at least with !MacPorts' version (`libtesseract_full.a` is missing). It would be nice to be able to support both versions, since 2.0 is Debian's default, and 3.0 is !MacPorts' version. -- Ticket URL: <https://trac.lrde.org/olena/ticket/239> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #229: Have Olena's BuildBot generate GitStats information
by Olena Trac 23 Nov '11

23 Nov '11

#229: Have Olena's BuildBot generate GitStats information -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: trivial | Milestone: Olena 1.1 Component: other | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Git statistics are generated by my (Roland's) account for a limited set of branches, each night. It'd be smarter to have one of the buildslave invoke a script running `gitstats` and uploading the result (as `lrde- upload.sh` does) prior to building the project. We could even filter branches (having statistics for all branches might not be relevant). -- Ticket URL: <https://trac.lrde.org/olena/ticket/229> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 4

branch unstable/scribo updated: olena-2.0-39-g7307887
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 7307887029d66c125b3fc70de134e40913814c30 (commit) via ac769b6c00fb4324d067a750bb0b6d1638031dea (commit) via ec0f3af5c5c4fd3208e26d58fb61b3e6d75381a0 (commit) from e916a0335fe6e931a87fb8de965948ae7674f10c (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 ----------------------------------------------------------------- 7307887 Merge branch 'next' into unstable/scribo ----------------------------------------------------------------------- Summary of changes: 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

branch next updated: olena-2.0-13-gac769b6
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 ac769b6c00fb4324d067a750bb0b6d1638031dea (commit) via ec0f3af5c5c4fd3208e26d58fb61b3e6d75381a0 (commit) from 2af40042f361fe4b3fd281354e5e961ab3569730 (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 ----------------------------------------------------------------- ac769b6 lrde-scmstats.sh: Compute stats per branches. ec0f3af lrde-upload.sh: Update list of branches. ----------------------------------------------------------------------- Summary of changes: 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