- Olena-patches

branch unstable/scribo updated: olena-2.0-424-g275b60f
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 275b60f548221f4df2457804b2211065d45fec13 (commit) from 1a432a30f9344628f2082772d29ac4b8f03a0cd3 (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 ----------------------------------------------------------------- 275b60f Small fixes. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 +++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-424-g275b60f Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/internal/global_max_stddev_functor.hh: Remove reference to mln namespace. * headers.mk, * scribo/tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 9 +++++++++ scribo/headers.mk | 1 + .../internal/global_max_stddev_functor.hh | 6 ++---- scribo/tests/unit_test/unit-tests.mk | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc93c4f..2434924 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,6 +2,15 @@ Small fixes. + * scribo/binarization/internal/global_max_stddev_functor.hh: + Remove reference to mln namespace. + + * headers.mk: Regen. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + * scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 10aaa60..e360703 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -5,6 +5,7 @@ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ scribo/binarization/global_threshold_auto.hh \ +scribo/binarization/internal/global_max_stddev_functor.hh \ scribo/binarization/internal/local_threshold_core.hh \ scribo/binarization/internal/local_threshold_debug.hh \ scribo/binarization/internal/niblack_formula.hh \ diff --git a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh index e10b77d..de6e91b 100644 --- a/scribo/scribo/binarization/internal/global_max_stddev_functor.hh +++ b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh @@ -28,7 +28,8 @@ /// \file /// -/// +/// \brief Functor computing the maximum standard deviation during an +/// integral image browsing. namespace scribo @@ -37,9 +38,6 @@ namespace scribo namespace binarization { - using namespace mln; - - namespace internal { diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index ec86dde..0484b75 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -186,6 +186,7 @@ scribo_all \ scribo_binarization_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ +scribo_binarization_internal_global_max_stddev_functor \ scribo_binarization_internal_local_threshold_core \ scribo_binarization_internal_local_threshold_debug \ scribo_binarization_internal_niblack_formula \ -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-423-g1a432a3
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 1a432a30f9344628f2082772d29ac4b8f03a0cd3 (commit) via 27abe98ff8779d1e01e11c55f740b079f69b3c35 (commit) from e5b58eb213b3a88a2be6934e9e8f1e3e55d8bd64 (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 ----------------------------------------------------------------- 1a432a3 Small fixes. 27abe98 Share a functor used in Wolf's binarization. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 19 ++++ scribo/scribo/binarization/all.hh | 6 ++ ...olf_formula.hh => global_max_stddev_functor.hh} | 89 ++++++++++++-------- .../internal/niblack_threshold_functor.hh | 6 +- .../internal/sauvola_threshold_functor.hh | 8 +- scribo/scribo/binarization/wolf.hh | 38 +-------- scribo/scribo/binarization/wolf_fast.hh | 38 +-------- 7 files changed, 89 insertions(+), 115 deletions(-) copy scribo/scribo/binarization/internal/{wolf_formula.hh => global_max_stddev_functor.hh} (54%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-423-g1a432a3 Small fixes.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/all.hh: Add missing includes. * scribo/binarization/internal/niblack_threshold_functor.hh, * scribo/binarization/internal/sauvola_threshold_functor.hh: Add input image as attribute. --- scribo/ChangeLog | 10 ++++++++++ scribo/scribo/binarization/all.hh | 6 ++++++ .../internal/niblack_threshold_functor.hh | 6 ++++-- .../internal/sauvola_threshold_functor.hh | 8 +++++--- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1fd80aa..bc93c4f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. + + * scribo/binarization/all.hh: Add missing includes. + + * scribo/binarization/internal/niblack_threshold_functor.hh, + * scribo/binarization/internal/sauvola_threshold_functor.hh: Add + input image as attribute. + +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Share a functor used in Wolf's binarization. * scribo/binarization/internal/global_max_stddev_functor.hh: New. diff --git a/scribo/scribo/binarization/all.hh b/scribo/scribo/binarization/all.hh index d05f996..ef45487 100644 --- a/scribo/scribo/binarization/all.hh +++ b/scribo/scribo/binarization/all.hh @@ -51,14 +51,20 @@ namespace scribo # include <scribo/binarization/local_threshold.hh> # include <scribo/binarization/niblack.hh> +# include <scribo/binarization/niblack_fast.hh> +# include <scribo/binarization/niblack_threshold.hh> # include <scribo/binarization/otsu.hh> +# include <scribo/binarization/otsu_threshold.hh> # include <scribo/binarization/sauvola.hh> # include <scribo/binarization/sauvola_ms.hh> # include <scribo/binarization/sauvola_ms_split.hh> # include <scribo/binarization/sauvola_threshold.hh> +# include <scribo/binarization/singh.hh> + # include <scribo/binarization/wolf.hh> +# include <scribo/binarization/wolf_fast.hh> #endif // ! SCRIBO_BINARIZATION_ALL_HH diff --git a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh index d26d733..621ccd8 100644 --- a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh +++ b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh @@ -77,6 +77,7 @@ namespace scribo typedef mln_concrete(I) th_t; th_t output; + mln_concrete(I) input; mln_value(I)* po; @@ -94,9 +95,10 @@ namespace scribo template <typename I> niblack_threshold_functor::niblack_threshold_functor(const Image& input_, double K) - : K_(K) + : input(input_), + K_(K) { - mln_precondition(exact(input).is_valid()); + mln_precondition(exact(input_).is_valid()); mln_precondition(K > 0.); } diff --git a/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh b/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh index 19b7bf3..bea9d14 100644 --- a/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh +++ b/scribo/scribo/binarization/internal/sauvola_threshold_functor.hh @@ -66,7 +66,7 @@ namespace scribo sauvola_threshold_functor(const Image& input, double K, double R); - init(); + void init(); // Run every 4 pixels. void exec(double mean, double stddev); @@ -77,6 +77,7 @@ namespace scribo typedef mln_concrete(I) th_t; th_t output; + mln_concrete(I) input; mln_value(I)* po; @@ -93,9 +94,10 @@ namespace scribo #ifndef MLN_INCLUDE_ONLY template <typename I> - sauvola_threshold_functor::sauvola_threshold_functor(const Image& input_, + sauvola_threshold_functor::sauvola_threshold_functor(const Image& input, double K, double R) - : K_(K), + : input(input), + K_(K), R_(R) { mln_precondition(exact(input).is_valid()); -- 1.7.2.5

1 0

olena-2.0-422-g27abe98 Share a functor used in Wolf's binarization.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* scribo/binarization/internal/global_max_stddev_functor.hh: New. * scribo/binarization/wolf.hh, * scribo/binarization/wolf_fast.hh: Remove functor declaration. --- scribo/ChangeLog | 9 ++ ...olf_formula.hh => global_max_stddev_functor.hh} | 89 ++++++++++++-------- scribo/scribo/binarization/wolf.hh | 38 +-------- scribo/scribo/binarization/wolf_fast.hh | 38 +-------- 4 files changed, 64 insertions(+), 110 deletions(-) copy scribo/scribo/binarization/internal/{wolf_formula.hh => global_max_stddev_functor.hh} (54%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dd2346c..1fd80aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Share a functor used in Wolf's binarization. + + * scribo/binarization/internal/global_max_stddev_functor.hh: New. + + * scribo/binarization/wolf.hh, + * scribo/binarization/wolf_fast.hh: Remove functor declaration. + 2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> * headers.mk: Regen. diff --git a/scribo/scribo/binarization/internal/wolf_formula.hh b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh similarity index 54% copy from scribo/scribo/binarization/internal/wolf_formula.hh copy to scribo/scribo/binarization/internal/global_max_stddev_functor.hh index a3084a7..e10b77d 100644 --- a/scribo/scribo/binarization/internal/wolf_formula.hh +++ b/scribo/scribo/binarization/internal/global_max_stddev_functor.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,25 +23,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_INTERNAL_WOLF_FORMULA_HH -# define SCRIBO_BINARIZATION_INTERNAL_WOLF_FORMULA_HH - +#ifndef SCRIBO_BINARIZATION_INTERNAL_GLOBAL_MAX_STDDEV_FUNCTOR_HH +# define SCRIBO_BINARIZATION_INTERNAL_GLOBAL_MAX_STDDEV_FUNCTOR_HH /// \file /// -/// \brief Routines computing a threshold using Wolf's binarization -/// formula. - - -// Setup default Wolf's formula parameters values. -// These macros may be used in other variant of Wolf's algorithms. -// -// Values are set according to the following reference: <FIXME> - -# define SCRIBO_DEFAULT_WOLF_K 0.34 - +/// -#include <mln/core/alias/point2d.hh> namespace scribo { @@ -49,47 +37,76 @@ namespace scribo namespace binarization { + using namespace mln; + + namespace internal { - using namespace mln; + /*! \internal \brief Functor computing the maximum standard + deviation during an integral image browsing. - template <typename V> - struct wolf_formula + It is used in Wolf's algorithm. + */ + template <typename I> + struct global_max_stddev { + global_max_stddev(); - /*! \brief Compute a threshold using Wolf's formula. + void init(); - \todo doc! + void exec(double mean, double stddev); - \return A threshold. - */ - double operator()(const double m_x_y, const double s_x_y, - const double K, const double global_max_stddev, - const V& global_min) const; + void end_of_row(int); + void finalize(); + + double max_stddev; }; # ifndef MLN_INCLUDE_ONLY + template <typename I> + global_max_stddev::global_max_stddev() + : max_stddev(0) + { + } + + template <typename I> + void + global_max_stddev::init() + { + } - template <typename V> - inline - double - wolf_formula<V>::operator()(const double m_x_y, const double s_x_y, - const double K, const double global_max_stddev, - const V& global_min) const + template <typename I> + void + global_max_stddev::exec(double mean, double stddev) { - return m_x_y - K * (1 - s_x_y / global_max_stddev) * (m_x_y - global_min); + (void) mean; + if (max_stddev < stddev) + max_stddev = stddev; } -# endif // ! MLN_INCLUDE_ONLY + template <typename I> + void + global_max_stddev::end_of_row(int) + { + } + + template <typename I> + void + global_max_stddev::finalize() + { + } } // end of namespace scribo::binarization::internal - } // end of namespace scribo::binarization +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::binarization } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_INTERNAL_WOLF_FORMULA_HH + +#endif // ! SCRIBO_BINARIZATION_INTERNAL_GLOBAL_MAX_STDDEV_FUNCTOR_HH diff --git a/scribo/scribo/binarization/wolf.hh b/scribo/scribo/binarization/wolf.hh index 840d69f..300e93f 100644 --- a/scribo/scribo/binarization/wolf.hh +++ b/scribo/scribo/binarization/wolf.hh @@ -34,6 +34,7 @@ # include <mln/core/concept/image.hh> # include <scribo/binarization/internal/wolf_functor.hh> # include <scribo/binarization/internal/local_threshold_core.hh> +# include <scribo/binarization/internal/global_max_stddev_functor.hh> # include <scribo/util/integral_sum_sum2_global_min_functor.hh> namespace scribo @@ -93,43 +94,6 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY - namespace internal - { - - template <typename I> - struct global_max_stddev - { - global_max_stddev() - : max_stddev(0) - { - } - - void init() - { - } - - // Run every 4 pixels. - void exec(double mean, double stddev) - { - (void) mean; - if (max_stddev < stddev) - max_stddev = stddev; - } - - void end_of_row(int) - { - } - - void finalize() - { - } - - double max_stddev; - }; - - } // end of namespace scribo::binarization::internal - - // Facades template <typename I> diff --git a/scribo/scribo/binarization/wolf_fast.hh b/scribo/scribo/binarization/wolf_fast.hh index a984532..d5a9a8f 100644 --- a/scribo/scribo/binarization/wolf_fast.hh +++ b/scribo/scribo/binarization/wolf_fast.hh @@ -34,6 +34,7 @@ # include <mln/core/concept/image.hh> # include <scribo/binarization/internal/wolf_functor_fast.hh> # include <scribo/binarization/internal/local_threshold_core.hh> +# include <scribo/binarization/internal/global_max_stddev_functor.hh> # include <scribo/util/integral_sum_sum2_global_min_functor.hh> namespace scribo @@ -92,43 +93,6 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY - namespace internal - { - - template <typename I> - struct global_max_stddev - { - global_max_stddev() - : max_stddev(0) - { - } - - void init() - { - } - - // Run every 4 pixels. - void exec(double mean, double stddev) - { - (void) mean; - if (max_stddev < stddev) - max_stddev = stddev; - } - - void end_of_row(int) - { - } - - void finalize() - { - } - - double max_stddev; - }; - - } // end of namespace scribo::binarization::internal - - // Facades template <typename I> -- 1.7.2.5

1 0

branch exp/metal/is_from_to_convertible created: olena-2.0-422-g80e2be0
by git＠lrde.epita.fr 22 Mar '13

22 Mar '13

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 exp/metal/is_from_to_convertible has been created at 80e2be0f8effba00c2512be4e6cbdcc4405b3f34 (commit) - Log ----------------------------------------------------------------- 80e2be0 Introduce mln_is_from_to_convertible. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-422-g80e2be0 Introduce mln_is_from_to_convertible.
by Guillaume Lazzara 22 Mar '13

22 Mar '13

* mln/metal/is_a.hh: Move yes_/no_ structures... * mln/metal/bool.hh: ... here. * tests/metal/Makefile.am: Add new target. * mln/metal/is_from_to_convertible.hh, * tests/metal/is_from_to_convertible.cc: New. --- milena/ChangeLog | 12 ++++ milena/mln/metal/bool.hh | 12 +++- milena/mln/metal/is_a.hh | 7 +-- .../mln/metal/{is.hh => is_from_to_convertible.hh} | 68 +++++++++++--------- milena/tests/metal/Makefile.am | 5 +- .../is_from_to_convertible.cc} | 19 ++--- 6 files changed, 73 insertions(+), 50 deletions(-) copy milena/mln/metal/{is.hh => is_from_to_convertible.hh} (51%) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => metal/is_from_to_convertible.cc} (76%) diff --git a/milena/ChangeLog b/milena/ChangeLog index c23b608..26c9973 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2013-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce mln_is_from_to_convertible. + + * mln/metal/is_a.hh: Move yes_/no_ structures... + * mln/metal/bool.hh: ... here. + + * tests/metal/Makefile.am: Add new target. + + * mln/metal/is_from_to_convertible.hh, + * tests/metal/is_from_to_convertible.cc: New. + 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/mln/metal/bool.hh b/milena/mln/metal/bool.hh index 4b6ff59..c32acdb 100644 --- a/milena/mln/metal/bool.hh +++ b/milena/mln/metal/bool.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -50,6 +50,14 @@ namespace mln // Fwd decl. template <bool b> struct bool_; + namespace internal + { + + typedef char yes_; + struct no_ { char dummy[2]; }; + + } + /*! \internal diff --git a/milena/mln/metal/is_a.hh b/milena/mln/metal/is_a.hh index 7a0c803..3f7b28f 100644 --- a/milena/mln/metal/is_a.hh +++ b/milena/mln/metal/is_a.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -62,9 +62,6 @@ namespace mln namespace internal { - typedef char yes_; - struct no_ { char dummy[2]; }; - template <typename T> struct make_ { diff --git a/milena/mln/metal/is.hh b/milena/mln/metal/is_from_to_convertible.hh similarity index 51% copy from milena/mln/metal/is.hh copy to milena/mln/metal/is_from_to_convertible.hh index f4f2c10..02eb294 100644 --- a/milena/mln/metal/is.hh +++ b/milena/mln/metal/is_from_to_convertible.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,23 +23,32 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_METAL_IS_HH -# define MLN_METAL_IS_HH +#ifndef MLN_METAL_IS_FROM_TO_CONVERTIBLE_HH +# define MLN_METAL_IS_FROM_TO_CONVERTIBLE_HH /// \file /// -/// \brief Definition of a type that means "is". +/// \brief Definition of a type that checks if a from_to_() conversion +/// routine exists. -# include <mln/metal/is_a.hh> +/// FIXME: Enable this include if the compiler support c++-11 +# include <type_traits> +# include <mln/metal/bool.hh> - -# define mlc_is(T, U) mln::metal::is< T, U > +# define mlc_is_from_to_convertible(T, U) mln::metal::is_from_to_convertible< T, U > namespace mln { + // Forward declarations. + namespace value { + template <unsigned n> struct int_u; + template <unsigned n> struct int_s; + } + + namespace metal { @@ -48,10 +56,22 @@ namespace mln { template <typename T, typename U> - struct helper_is_ + struct helper_is_from_to_convertible_ { - static yes_ selector(U*const); static no_ selector(...); + + + /// FIXME: Enable this implementation if the compiler supports it. + + // template <typename V> + // static yes_ selector(V, typeof(from_to_(*(V*)0, static_cast<U&>(*(U*)0)))* = 0); + + /// FIXME: Enable this implementation with latest compilers supporting c++-11. + + template <typename V, typename C = decltype(from_to_(V(), std::declval<U&>()))> + static yes_ selector(V); + + static const bool value = sizeof(selector(T())) == sizeof(char); }; } // end of namespace mln::metal::internal @@ -60,35 +80,23 @@ namespace mln /*! \internal - \brief "is" check. - Check whether T inherits from U. + \brief Checks if a from_to_() conversion routine exists. + + \warning This structure may use C++-11 features if available or + typeof keyword which is a specific feature of g++. Be sure that + your compiler supports them. */ template <typename T, typename U> - struct is : bool_<( sizeof(internal::helper_is_<T, U>::selector(internal::make_<T>::ptr())) - == - sizeof(internal::yes_) )> + struct is_from_to_convertible : bool_<internal::helper_is_from_to_convertible_<T,U>::value> { }; - template <typename T, typename U> - struct is< const T, const U > : is<T, U>::eval - {}; - - template <typename T, typename U> - struct is< T*, U* > : is<T, U>::eval - {}; - template <typename T, typename U> - struct is< T&, U& > : is<T, U>::eval - {}; + } // end of namespace mln::metal - template <typename T, typename U> - struct is< T**, U** > : false_ - {}; - } // end of namespace mln::metal } // end of namespace mln -#endif // ! MLN_METAL_IS_HH +#endif // ! MLN_METAL_IS_FROM_TO_CONVERTIBLE_HH diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am index cf4be2d..288c5a6 100644 --- a/milena/tests/metal/Makefile.am +++ b/milena/tests/metal/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE) +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE) # # This file is part of Olena. # @@ -22,6 +22,7 @@ SUBDIRS = make math check_PROGRAMS = \ converts_to \ is \ + is_from_to_convertible \ unconst diff --git a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc b/milena/tests/metal/is_from_to_convertible.cc similarity index 76% copy from milena/tests/fun/v2v/qt_rgb_to_int_u.cc copy to milena/tests/metal/is_from_to_convertible.cc index 5b55d49..2c289ec 100644 --- a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc +++ b/milena/tests/metal/is_from_to_convertible.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,22 +23,19 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/core/image/image2d.hh> - -#include <mln/fun/v2v/qt_rgb_to_int_u.hh> -#include <mln/value/qt/rgb32.hh> #include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> +#include <mln/metal/is_from_to_convertible.hh> int main() { using namespace mln; - fun::v2v::qt_rgb_to_int_u<8> f; - - value::qt::rgb32 vcolor(100, 200, 30); - - value::int_u8 vgl = f(vcolor); + bool b = metal::converts_to<value::rgb8, int>::value; + mln_assertion(! b); - mln_assertion(vgl == 110); + b = metal::converts_to<value::int_u8, value::rgb8>::value; + std::cout << metal::converts_to<value::int_u8, value::rgb8>::name() << std::endl; + mln_assertion(b); } -- 1.7.2.5

1 0

olena-2.0-395-gd481951 [ICDAR_13] Check old version XML output with GUI Annotator
by Anthony Seure 22 Mar '13

22 Mar '13

--- scribo/sandbox/icdar_13_table/Makefile | 3 ++- .../competition-entry-region-model.xsd | 0 scribo/sandbox/icdar_13_table/src/main.cc | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) rename scribo/sandbox/icdar_13_table/{ => originals}/competition-entry-region-model.xsd (100%) diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/sandbox/icdar_13_table/Makefile index 7c11bf1..baa9ae1 100644 --- a/scribo/sandbox/icdar_13_table/Makefile +++ b/scribo/sandbox/icdar_13_table/Makefile @@ -1,6 +1,7 @@ CCACHE=ccache CC=g++ CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG -DMLN_WO_GLOBAL_VARS +CFLAGS_OLD=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG CLIBS=-I../../../milena/ -I../../ -I/usr/include/poppler CLEAN=*.o output/* log final.xml @@ -15,7 +16,7 @@ table: $(CCACHE) $(CC) $(CFLAGS) $(CLIBS) $(SRC) -ltesseract -lpoppler-cpp -o $(OUTPUT) old: - $(CCACHE) $(CC) $(CFLAGS) $(CLIBS) $(SRC_OLD) -ltesseract -lpoppler-cpp -o $(OUTPUT_OLD) + $(CCACHE) $(CC) $(CFLAGS_OLD) $(CLIBS) $(SRC_OLD) -ltesseract -lpoppler-cpp -o $(OUTPUT_OLD) clean: rm -rf $(CLEAN) diff --git a/scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd b/scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd similarity index 100% rename from scribo/sandbox/icdar_13_table/competition-entry-region-model.xsd rename to scribo/sandbox/icdar_13_table/originals/competition-entry-region-model.xsd diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/sandbox/icdar_13_table/src/main.cc index be394ba..3aa40c2 100644 --- a/scribo/sandbox/icdar_13_table/src/main.cc +++ b/scribo/sandbox/icdar_13_table/src/main.cc @@ -26,9 +26,12 @@ using namespace mln; -void start_xml(std::ofstream& xml, const char* name, const char* pdf) +void start_xml(std::ofstream& xml, const char* pdf) { - xml.open(name); + //std::ostringstream name; + //name << pdf << "-reg-result.xml"; + //xml.open((name.str()).c_str()); + xml.open("us-005-reg-result.xml"); xml << "<?xml version\"1.0\" encoding=\"UTF-8\"?>" << std::endl << "<document filename='" << pdf << "'>" << std::endl; } @@ -212,7 +215,7 @@ int main(int argc, char** argv) // Loading and binarization std::ofstream xml; - start_xml(xml, "final.xml", argv[1]); + start_xml(xml, argv[1]); //io::ppm::load(original, argv[1]); util::array< image2d<value::rgb8> > pdf; -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-421-ge5b58eb
by git＠lrde.epita.fr 21 Mar '13

21 Mar '13

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 e5b58eb213b3a88a2be6934e9e8f1e3e55d8bd64 (commit) via 7e08fb78a5055a9adf5fba277a9a0c429b20ce5f (commit) via 2d8786ecfd45afcdf0bac86ddbcb0e3029f17f2f (commit) from 9a0159551ff9e29e5c8c52e1f791db137f44c670 (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 ----------------------------------------------------------------- e5b58eb doc/doc.bib: Add a reference to an article. 7e08fb7 headers.mk: Regen. 2d8786e tests/unit_test/unit-tests.mk: Regen. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/doc.bib | 9 +++++++++ milena/ChangeLog | 4 ++++ milena/tests/unit_test/unit-tests.mk | 2 ++ scribo/ChangeLog | 4 ++++ scribo/headers.mk | 29 ++++++++++++++++++++++++++--- 6 files changed, 49 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-421-ge5b58eb doc/doc.bib: Add a reference to an article.
by Guillaume Lazzara 21 Mar '13

21 Mar '13

--- ChangeLog | 4 ++++ doc/doc.bib | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 465c20f..21d3ba1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/doc.bib: Add a reference to an article. + +2013-03-21 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/doc.bib: Fix a reference name. 2013-03-20 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/doc/doc.bib b/doc/doc.bib index 637cf12..2c04307 100644 --- a/doc/doc.bib +++ b/doc/doc.bib @@ -64,4 +64,13 @@ volume={5}, pages={27--29}, year={2005} +} + +@inproceedings{fabrizio2009icip, + title={Text segmentation in natural scenes using toggle-mapping}, + author={Jonathan Fabrizio and Beatriz Marcotegui and Matthieu Cord}, + booktitle={IEEE International Conference on Image Processing}, + pages={2373--2376}, + year={2009}, + organization={IEEE} } \ No newline at end of file -- 1.7.2.5

1 0