[cpl] 01/02: fix broken null values in integer tables (Julian Taylor). This fixes FTBS on big-endian.

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl.

commit 067e69f8ab16fb1ace9ecd226182c28da986b1ad
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Aug 26 11:37:37 2013 +0200

    fix broken null values in integer tables (Julian Taylor). This fixes FTBS on big-endian.
---
 debian/changelog                        |    6 ++++++
 debian/patches/fix-table-null-val.patch |   16 ++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65a8eb2..a4cffbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.3.1-1~exp2) experimental; urgency=low
+
+  * Fix FTBS on big-endian machines. Thanks to Julian Taylor for the patch.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 26 Aug 2013 09:25:12 +0200
+
 cpl (6.3.1-1~exp1) experimental; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix-table-null-val.patch b/debian/patches/fix-table-null-val.patch
new file mode 100644
index 0000000..0b75240
--- /dev/null
+++ b/debian/patches/fix-table-null-val.patch
@@ -0,0 +1,16 @@
+Description: extract integer null from long long array
+Forwarded: yes
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+--- a/cplcore/cpl_table.c
++++ b/cplcore/cpl_table.c
+@@ -25849,8 +25849,9 @@
+                 }
+                 else {
+                     if (found[i]) {
++                        int inval = (int)nval[i];
+                         fits_write_colnull(outfile, TINT, i + 1, k + 1, 1, 
+-                                           spell, idata, nval + i, &status);
++                                           spell, idata, &inval, &status);
+                     }
+                     else {
+                         fits_write_col(outfile, TINT, i + 1, k + 1, 1, spell,
diff --git a/debian/patches/series b/debian/patches/series
index 8e63901..99b788b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ loose_cplfit_test.patch
 disable_some_tests.patch
 no_compiletime_cpucheck.patch
 fix_required_versions.patch
+fix-table-null-val.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl.git