[med-svn] r8940 - trunk/packages/imagevis3d/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-13 17:51:24 +0000 (Tue, 13 Dec 2011)
New Revision: 8940

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
   trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch
   trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch
   trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
More patch from upstream.

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2011-12-13 16:58:52 UTC (rev 8939)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2011-12-13 17:51:24 UTC (rev 8940)
@@ -11,3 +11,7 @@
 libs3.patch
 tuvok_details.patch
 maxpath.patch
+warning.patch
+warning1.patch
+warning2.patch
+warning3.patch

Added: trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning.patch	2011-12-13 17:51:24 UTC (rev 8940)
@@ -0,0 +1,13 @@
+Index: imagevis3d-2.0.1/Tuvok/Basics/SystemInfo.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/Basics/SystemInfo.cpp	2011-12-09 15:48:07.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/Basics/SystemInfo.cpp	2011-12-13 18:49:12.000000000 +0100
+@@ -192,7 +192,7 @@
+     #else
+       std::cerr << "Unknown system, can't lookup max memory.  "
+                 << "Using a hard setting of 10 gb." << std::endl;
+-      return 1024*1024*1024*10;
++      return 1024ULL*1024ULL*1024ULL*10ULL;
+     #endif
+   #endif
+ }

Added: trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch	2011-12-13 17:51:24 UTC (rev 8940)
@@ -0,0 +1,33 @@
+Index: imagevis3d-2.0.1/Tuvok/IO/AbstrGeoConverter.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/AbstrGeoConverter.cpp	2011-12-09 15:49:57.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/AbstrGeoConverter.cpp	2011-12-13 18:49:43.000000000 +0100
+@@ -115,7 +115,6 @@
+   if(v.size() < 2) return;
+ 
+   // find AA projection direction that is not coplanar to the polygon
+-  size_t iPlane = 0;
+   size_t iPlaneX = 2;
+   size_t iPlaneY = 1;
+ 
+@@ -124,15 +123,13 @@
+   FLOATVECTOR3 norm = tan%bin;
+ 
+   if (norm.y != 0) {
+-    iPlane = 1; 
+-    iPlaneX = 0; 
+-    iPlaneY = 2; 
++    iPlaneX = 0;
++    iPlaneY = 2;
+   } else
+   if (norm.z != 0) {
+-    iPlane = 2;
+-    iPlaneX = 0; 
+-    iPlaneY = 1; 
+-  } // else use default wich is the x-plane
++    iPlaneX = 0;
++    iPlaneY = 1;
++  } // else use default which is the x-plane
+ 
+   // move bottom element to front of array
+   for (size_t i = 1;i<v.size();i++) {

Added: trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch	2011-12-13 17:51:24 UTC (rev 8940)
@@ -0,0 +1,34 @@
+Index: imagevis3d-2.0.1/Tuvok/IO/DICOM/DICOMParser.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/DICOM/DICOMParser.cpp	2011-12-09 15:49:57.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/DICOM/DICOMParser.cpp	2011-12-13 18:50:14.000000000 +0100
+@@ -359,7 +359,9 @@
+   fileDICOM.seekg(128);  // skip first 128 bytes
+ 
+   string value;
++#ifdef DEBUG_DICOM
+   float fSliceSpacing = 0;
++#endif
+   short iGroupID, iElementID;
+   UINT32 iElemLength;
+   DICOM_eType elementType;  
+@@ -389,7 +391,9 @@
+   } else {
+     // Ok, at this point we are very sure that we are dealing with a DICOM File,
+     // lets find out the dimensions, the sequence numbers
++#ifdef DEBUG_DICOM
+     fSliceSpacing = 0;
++#endif
+     int iMetaHeaderEnd=0;
+     bool bParsingMetaHeader = true;
+ 
+@@ -559,8 +563,8 @@
+               case 0x88 : { // Spacing
+                     value.resize(iElemLength);
+                     fileDICOM.read(&value[0],iElemLength);
+-                    fSliceSpacing = float(atof(value.c_str()));
+                     #ifdef DEBUG_DICOM
++                    fSliceSpacing = float(atof(value.c_str()));
+                     {
+                       stringstream ss;
+                       ss << fSliceSpacing << " (Slice Spacing: recognized)";

Added: trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch	2011-12-13 17:51:24 UTC (rev 8940)
@@ -0,0 +1,22 @@
+Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.h
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.h	2011-12-09 15:49:57.000000000 +0100
++++ imagevis3d-2.0.1/Tuvok/IO/IOManager.h	2011-12-13 18:50:41.000000000 +0100
+@@ -309,9 +309,6 @@
+     FLOATVECTOR3 vecBrickOffset(vBrickOffset);
+     vecBrickOffset = vecBrickOffset * m_vScale;
+ 
+-    FLOATVECTOR3 domShift = 0.5f * fMaxSize / FLOATVECTOR3(m_vDataSize);
+-
+-
+     for (int i = 0;i<m_pMarchingCubes->m_Isosurface->iVertices;i++) {
+         m_vertices.push_back((m_pMarchingCubes->m_Isosurface->vfVertices[i]+vecBrickOffset-FLOATVECTOR3(m_vDataSize)/2.0f)/fMaxSize);
+     }
+@@ -343,7 +340,6 @@
+   tuvok::VertVec     m_vertices;
+   tuvok::NormVec     m_normals;
+   tuvok::IndexVec    m_indices;
+-
+ };
+ 
+ class IOManager {