[med-svn] r17177 - in trunk/packages/imagevis3d/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-06-16 10:34:34 +0000 (Mon, 16 Jun 2014)
New Revision: 17177

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/fixsparc.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/changelog
   trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
fix sparc

Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog	2014-06-16 10:04:21 UTC (rev 17176)
+++ trunk/packages/imagevis3d/trunk/debian/changelog	2014-06-16 10:34:34 UTC (rev 17177)
@@ -1,3 +1,9 @@
+imagevis3d (3.1.0-3) unstable; urgency=low
+
+  * Fix compilation on sparc. Closes: #751374
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 16 Jun 2014 12:34:10 +0200
+
 imagevis3d (3.1.0-2) unstable; urgency=low
 
   * Make sure to use recent lz4. Closes: #751227

Added: trunk/packages/imagevis3d/trunk/debian/patches/fixsparc.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fixsparc.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fixsparc.patch	2014-06-16 10:34:34 UTC (rev 17177)
@@ -0,0 +1,35 @@
+From b315da9ea4e3a94300aef612acf1029c7bf90d59 Mon Sep 17 00:00:00 2001
+From: Tom Fogal <tfogal at alumni.unh.edu>
+Date: Thu, 12 Jun 2014 11:39:15 +0200
+Subject: [PATCH] hopefully fix sparc compilation problem.
+
+---
+ IO/DynamicBrickingDS.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+Index: imagevis3d-3.1.0/Tuvok/IO/DynamicBrickingDS.cpp
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/IO/DynamicBrickingDS.cpp	2014-04-07 10:09:36.000000000 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/DynamicBrickingDS.cpp	2014-06-16 12:33:10.897268867 +0200
+@@ -423,13 +423,15 @@
+     idx[2] == bl[2]-1,
+   }};
+   const BrickSize no_ghost = BrickSansGhost(bsize);
++  const BrickSize extra = {{
++    static_cast<size_t>(voxels[0] % no_ghost[0]),
++    static_cast<size_t>(voxels[1] % no_ghost[1]),
++    static_cast<size_t>(voxels[2] % no_ghost[2])
++  }};
+   const BrickSize rv = {{
+-    last[0] && (voxels[0] % no_ghost[0]) ? 4 + (voxels[0]%no_ghost[0])
+-                                         : bsize[0],
+-    last[1] && (voxels[1] % no_ghost[1]) ? 4 + (voxels[1]%no_ghost[1])
+-                                         : bsize[1],
+-    last[2] && (voxels[2] % no_ghost[2]) ? 4 + (voxels[2]%no_ghost[2])
+-                                         : bsize[2]
++    last[0] && extra[0] ? 4 + extra[0] : bsize[0],
++    last[1] && extra[1] ? 4 + extra[1] : bsize[1],
++    last[2] && extra[2] ? 4 + extra[2] : bsize[2]
+   }};
+   return rv;
+ }

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2014-06-16 10:04:21 UTC (rev 17176)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2014-06-16 10:34:34 UTC (rev 17177)
@@ -9,3 +9,4 @@
 typos.patch
 fopenmp.patch
 thirdparty.patch
+fixsparc.patch