Author: malat Date: 2012-05-04 14:00:14 +0000 (Fri, 04 May 2012) New Revision: 10694
Removed: trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch Log: remove duplicate patch Deleted: trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch =================================================================== --- trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch 2012-05-04 13:58:20 UTC (rev 10693) +++ trunk/packages/imagevis3d/trunk/debian/patches/warning1.patch 2012-05-04 14:00:14 UTC (rev 10694) @@ -1,34 +0,0 @@ -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++) { Deleted: trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch =================================================================== --- trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch 2012-05-04 13:58:20 UTC (rev 10693) +++ trunk/packages/imagevis3d/trunk/debian/patches/warning2.patch 2012-05-04 14:00:14 UTC (rev 10694) @@ -1,34 +0,0 @@ -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)"; Deleted: trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch =================================================================== --- trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch 2012-05-04 13:58:20 UTC (rev 10693) +++ trunk/packages/imagevis3d/trunk/debian/patches/warning3.patch 2012-05-04 14:00:14 UTC (rev 10694) @@ -1,23 +0,0 @@ -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 -+++ 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 { _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit