[med-svn] [hyphy] 01/01: Fix error: narrowing conversion from 'double' to 'unsigned char'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository hyphy.

commit faa1d7672d376ffff77b96242531863fe04bf394
Author: Andreas Tille <tille at debian.org>
Date:   Sun Aug 14 21:44:06 2016 +0200

    Fix error: narrowing conversion from 'double' to 'unsigned char'
---
 debian/changelog             |  6 ++++++
 debian/patches/gcc-6.1.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c98369..26d87bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hyphy (2.2.6+dfsg-5) UNRELEASED; urgency=medium
+
+  * Fix error: narrowing conversion from 'double' to 'unsigned char'
+
+ -- Andreas Tille <tille at debian.org>  Sun, 14 Aug 2016 21:44:17 +0200
+
 hyphy (2.2.6+dfsg-4) unstable; urgency=medium
 
   * Fix gcc-6 build issue by incorporating upstream patch
diff --git a/debian/patches/gcc-6.1.patch b/debian/patches/gcc-6.1.patch
new file mode 100644
index 0000000..bcc6240
--- /dev/null
+++ b/debian/patches/gcc-6.1.patch
@@ -0,0 +1,34 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 14 Aug 2016 21:42:54 +0200
+Bug-Debian: https://bugs.debian.org/811866
+Description: Fix error: narrowing conversion from 'double' to 'unsigned char'
+
+--- a/src/gui/HYChartWindow.cpp
++++ b/src/gui/HYChartWindow.cpp
+@@ -100,16 +100,16 @@ extern      _String
+             windowTypeDistribTable;
+ 
+ _HYColor            chartColors [HY_CHART_COLOR_COUNT] = {
+-    {255*.94, 255*.12, 255*.11 },//(Red)
+-    {255*.41, 255*.46, 255*.91 },//(Evening Blue)
+-    {255    , 255*.91, 255*.34 },//(Banana)
+-    {255*.18, 255*.55, 255*.13 },//(Clover)
+-    {255*.55, 255*.38, 255*.21 },//(Dirt)
+-    {255*.42, 255*.09, 255*.69 },//(Royal Violet)
+-    {255*.09, 255*.29, 255*.51 },//(Sea Blue)
+-    {255   ,  255*.57, 255*.09 },//(Orange)
+-    {255*.67, 255*.67, 255*.67 },//(Concrete)
+-    {255*.85, 255*.27, 255*.42 } //(Carnation)
++    {255*94/100, 255*12/100, 255*11/100 },//(Red)
++    {255*41/100, 255*46/100, 255*91/100 },//(Evening Blue)
++    {255    , 255*91/100, 255*34/100 },//(Banana)
++    {255*18/100, 255*55/100, 255*13/100 },//(Clover)
++    {255*55/100, 255*38/100, 255*21/100 },//(Dirt)
++    {255*42/100, 255*9/100, 255*69/100 },//(Royal Violet)
++    {255*9/100, 255*29/100, 255*51/100 },//(Sea Blue)
++    {255   ,  255*57/100, 255*9/100 },//(Orange)
++    {255*67/100, 255*67/100, 255*67/100 },//(Concrete)
++    {255*85/100, 255*27/100, 255*42/100 } //(Carnation)
+ };
+ 
+ extern      _Parameter  pi_const;
diff --git a/debian/patches/series b/debian/patches/series
index 1847aaf..227761f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ setup_fix_clean_target.patch
 python3.5.patch
 remove_arch_specific_flags.patch
 gcc-6.patch
+gcc-6.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hyphy.git