[med-svn] r9006 - trunk/packages/imagevis3d/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Fri Dec 16 17:16:02 UTC 2011
Author: malat-guest
Date: 2011-12-16 17:16:02 +0000 (Fri, 16 Dec 2011)
New Revision: 9006
Added:
trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch
trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
Removed:
trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch
trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch
Log:
Document patches
Added: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -0,0 +1,39 @@
+https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52110
+Index: imagevis3d-2.0.1/ImageVis3D/StdDefines.h
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/StdDefines.h 2011-12-12 12:17:25.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/StdDefines.h 2011-12-16 18:11:17.000000000 +0100
+@@ -73,4 +73,13 @@
+ #define UPDATE_VERSION_FILE "Linux_Latest_Version.txt"
+ #endif
+
++// make sure they have a definition, so code that uses the defines always
++// compiles... even if that definition doesn't exactly make sense.
++#ifndef UPDATE_FILE
++# define UPDATE_FILE "ImageVis3D-Unsupported-Latest.zip"
++#endif
++#ifndef UPDATE_VERSION_FILE
++# define UPDATE_VERSION_FILE "Unsupported-Latest-Version.txt"
++#endif
++
+ #endif // STDIMAGEVISDEFINES_H
+Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-16 18:08:05.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-16 18:11:17.000000000 +0100
+@@ -127,6 +127,7 @@
+ }
+
+ void MainWindow::CheckForUpdatesInternal() {
++#ifndef PACKAGE_MANAGER
+ // cleanup updatefile, this codepath is taken for instance when the windows firewall blocked an http request
+ if (m_pUpdateFile && m_pUpdateFile->isOpen()) {
+ m_pUpdateFile->close();
+@@ -156,6 +157,7 @@
+ QByteArray remotePath = QUrl::toPercentEncoding(url.path(), "!$&'()*+,;=:@/");
+ if (remotePath.isEmpty()) remotePath = "/";
+ m_iHttpGetId = m_pHttp->get(remotePath, m_pUpdateFile);
++#endif
+ }
+
+ void MainWindow::httpRequestFinished(int requestId, bool error) {
Modified: trunk/packages/imagevis3d/trunk/debian/patches/manual.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/manual.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,3 +1,4 @@
+https://gforge.sci.utah.edu/gf/project/imagevis3d/scmsvn/?action=ScmCommitDetail&scm_commit_id=52124
Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
===================================================================
--- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-12 12:16:25.000000000 +0100
Modified: trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/maxpath.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,3 +1,4 @@
+https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52071
Index: imagevis3d-2.0.1/Tuvok/Basics/SysTools.cpp
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/Basics/SysTools.cpp 2011-12-09 15:49:51.000000000 +0100
Copied: trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch (from rev 9005, trunk/packages/imagevis3d/trunk/debian/patches/warning.patch)
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/overflow.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -0,0 +1,14 @@
+https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52089
+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
+ }
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-16 17:16:02 UTC (rev 9006)
@@ -11,8 +11,7 @@
libs3.patch
tuvok_details.patch
maxpath.patch
+overflow.patch
warning.patch
-warning1.patch
-warning2.patch
-warning3.patch
manual.patch
+kfreebsd.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tuvok_details.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,3 +1,4 @@
+https://gforge.sci.utah.edu/gf/project/basics/scmsvn/?action=ScmCommitDetail&scm_commit_id=52072
Index: imagevis3d-2.0.1/Tuvok/Basics/StdDefines.h
===================================================================
--- imagevis3d-2.0.1.orig/Tuvok/Basics/StdDefines.h 2011-12-09 15:49:51.000000000 +0100
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/warning.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,13 +0,0 @@
-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/warning.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -0,0 +1,90 @@
+https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
+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++) {
+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)";
+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 {
Modified: trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,3 +1,4 @@
+https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
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
Modified: trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch 2011-12-16 15:23:30 UTC (rev 9005)
+++ trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch 2011-12-16 17:16:02 UTC (rev 9006)
@@ -1,3 +1,4 @@
+https://gforge.sci.utah.edu/gf/project/scio/scmsvn/?action=ScmCommitDetail&scm_commit_id=52091
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
More information about the debian-med-commit
mailing list