Control: tags -1 patch fixed-upstream
The upstream fix for the sigviewer FTBFS is attached.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
>From 6cd56c2bd2d42ce3daadd3be048586d52f840eab Mon Sep 17 00:00:00 2001
From: Clemens Brunner <clemens.brun...@gmail.com>
Date: Tue, 13 Sep 2016 14:25:49 +0200
Subject: Make it work in C++11
---
src/gui_impl/commands/zoom_gui_command.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui_impl/commands/zoom_gui_command.h b/src/gui_impl/commands/zoom_gui_command.h
index 64b7e15..d1d95a5 100644
--- a/src/gui_impl/commands/zoom_gui_command.h
+++ b/src/gui_impl/commands/zoom_gui_command.h
@@ -76,8 +76,8 @@ private:
//-------------------------------------------------------------------------
float32 minPixelPerSample ();
- static float const ZOOM_FACTOR_ = 2;
- static float const MAX_HORIZONTAL_ZOOM_IN_ = 32;
+ static int const ZOOM_FACTOR_ = 2;
+ static int const MAX_HORIZONTAL_ZOOM_IN_ = 32;
static QString const GOTO_;
static QString const ZOOM_IN_VERTICAL_;
--
2.10.2
