[med-svn] [sga] 02/05: Fix gcc-7 issue: abs() requires int arguments

[Andreas Tille]

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

tille pushed a commit to tag debian/0.10.15-3
in repository sga.

commit 2198338407affd91a03e745b2420cbfdee37f8e3
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 28 21:30:13 2017 +0200

    Fix gcc-7 issue: abs() requires int arguments
---
 debian/changelog           |  2 ++
 debian/patches/gcc-7.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a950ffb..6be71b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 sga (0.10.15-3) UNRELEASED; urgency=medium
 
   * Standards-Version: 4.1.0 (no changes needed)
+  * abs() requires int arguments
+    Closes: #853656
 
  -- Andreas Tille <tille at debian.org>  Sun, 27 Aug 2017 15:34:21 +0200
 
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..90c1bb1
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,27 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 27 Aug 2017 15:34:21 +0200
+Bug-Debian: https://bugs.debian.org/853656
+Description: abs() requires int arguments
+
+--- a/src/Algorithm/GapFillProcess.cpp
++++ b/src/Algorithm/GapFillProcess.cpp
+@@ -233,7 +233,7 @@ GapFillReturnCode GapFillProcess::select
+ 
+     for(size_t i = 0; i < sequences.size(); ++i)
+     {
+-        int diff = abs(sequences[i].size() - estimatedSize);
++        int diff = abs((int)sequences[i].size() - estimatedSize);
+         //printf("ES: %d S: %zu D: %d\n", estimatedSize, sequences[i].size(), diff);
+ 
+         if(diff < selectedSizeDiff)
+--- a/src/Util/VariantIndex.cpp
++++ b/src/Util/VariantIndex.cpp
+@@ -86,7 +86,7 @@ VariantRecordVector VariantIndex::getNea
+         for(size_t vi = 0; vi < bucket.size(); ++vi)
+         {
+             const VariantRecord& record = m_records[bucket[vi]];
+-            if(abs(record.position - position) < distance)
++            if(abs((int)record.position - position) < distance)
+                 out.push_back(record);
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 39bef58..34ab722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Add-help-to-sga-bam2de.pl.patch
 0005-Remove-extensions-on-scripts-we-ship.patch
 0006-remove-google-addsense.patch
+gcc-7.patch

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