[Olena-patches] olena-2.0-418-g9a01595 Small fixes.

* demo/viewer/image_region.hh: Add Q_INTERFACES. * scribo/binarization/internal/niblack_threshold_functor.hh, * scribo/binarization/internal/singh_functor.hh: Fix declaration of init() member. --- scribo/ChangeLog | 10 ++++++++++ scribo/demo/viewer/image_region.hh | 6 ++++-- .../internal/niblack_threshold_functor.hh | 2 ++ .../scribo/binarization/internal/singh_functor.hh | 4 +++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5c0905a..cc0e7aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -2,6 +2,16 @@ Small fixes. + * demo/viewer/image_region.hh: Add Q_INTERFACES. + + * scribo/binarization/internal/niblack_threshold_functor.hh, + * scribo/binarization/internal/singh_functor.hh: Fix declaration + of init() member. + +2013-03-20 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Small fixes. + * scribo/primitive/extract/lines_h_single.hh: Fix an invalid function name. diff --git a/scribo/demo/viewer/image_region.hh b/scribo/demo/viewer/image_region.hh index 41141f7..2ad0150 100644 --- a/scribo/demo/viewer/image_region.hh +++ b/scribo/demo/viewer/image_region.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -23,7 +24,8 @@ class ImageRegion : public QObject, public QGraphicsItem { - Q_OBJECT + Q_OBJECT; + Q_INTERFACES(QGraphicsItem); public: ImageRegion(region::RegionId id, diff --git a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh index fab5f7b..d26d733 100644 --- a/scribo/scribo/binarization/internal/niblack_threshold_functor.hh +++ b/scribo/scribo/binarization/internal/niblack_threshold_functor.hh @@ -66,6 +66,8 @@ namespace scribo niblack_threshold_functor(const Image<I>& input, double K); + void init(); + // Run every 4 pixels. void exec(double mean, double stddev); diff --git a/scribo/scribo/binarization/internal/singh_functor.hh b/scribo/scribo/binarization/internal/singh_functor.hh index 8a93c44..a0400d0 100644 --- a/scribo/scribo/binarization/internal/singh_functor.hh +++ b/scribo/scribo/binarization/internal/singh_functor.hh @@ -67,6 +67,8 @@ namespace scribo singh_functor(const Image<I>& input, double K); + void init(); + // Run every 4 pixels. void exec(double mean, double stddev); @@ -104,7 +106,7 @@ namespace scribo template <typename I> void - niblack_functor<I>::init() + singh_functor<I>::init() { // This initialization MUST be done here since input image // borders may have changed! -- 1.7.2.5