[Olena-patches] olena-2.0-318-gea3b8de Fix compilation related problems in viewer.

* demo/viewer/image_view.cc: Fix a warning; * demo/viewer/main.cc: Include sauvola_ms.hh to compile related global variables. --- scribo/ChangeLog | 9 +++++++++ scribo/demo/viewer/image_view.cc | 15 ++++++++------- scribo/demo/viewer/main.cc | 7 ++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 20b7c94..18a73c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-03-07 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix compilation related problems in viewer. + + * demo/viewer/image_view.cc: Fix a warning; + + * demo/viewer/main.cc: Include sauvola_ms.hh to compile related + global variables. + +2013-03-07 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/binarization/internal/sauvola_ms_functor.hh: Handle global variables correctly. diff --git a/scribo/demo/viewer/image_view.cc b/scribo/demo/viewer/image_view.cc index bb34eb7..9190227 100644 --- a/scribo/demo/viewer/image_view.cc +++ b/scribo/demo/viewer/image_view.cc @@ -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. // @@ -34,13 +35,13 @@ ImageView::wheelEvent(QWheelEvent* event) else sc = 1 / (1 - degrees / 100); - QPointF center = mapToScene(width() / 2, height() / 2); - QPointF mouse = mapToScene(event->pos()); + // QPointF center = mapToScene(width() / 2, height() / 2); + // QPointF mouse = mapToScene(event->pos()); - qreal dx = (mouse.x() - center.x()); - qreal dy = (mouse.y() - center.y()); - QPointF newCenter = QPointF (mouse.x() - dx / sc, - mouse.y() - dy / sc); + // qreal dx = (mouse.x() - center.x()); + // qreal dy = (mouse.y() - center.y()); + // QPointF newCenter = QPointF (mouse.x() - dx / sc, + // mouse.y() - dy / sc); scale(sc, sc); scaleUpdate(); } diff --git a/scribo/demo/viewer/main.cc b/scribo/demo/viewer/main.cc index 0c50c7b..d14e36d 100644 --- a/scribo/demo/viewer/main.cc +++ b/scribo/demo/viewer/main.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -23,9 +23,10 @@ #include <mln/labeling/colorize.hh> #include <mln/math/pi.hh> #include <mln/io/magick/load.hh> -#include <scribo/make/debug_filename.hh> #include <mln/debug/filename.hh> #include <mln/literal/colors.hh> +#include <scribo/make/debug_filename.hh> +#include <scribo/binarization/sauvola_ms.hh> int main(int argc, char** argv) { -- 1.7.2.5