[med-svn] r7652 - trunk/packages/volview/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-09-03 22:16:00 +0000 (Sat, 03 Sep 2011)
New Revision: 7652

Added:
   trunk/packages/volview/trunk/debian/patches/updategdcm.patch
Modified:
   trunk/packages/volview/trunk/debian/patches/series
Log:
fix gdcm compilation

Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series	2011-09-03 17:55:21 UTC (rev 7651)
+++ trunk/packages/volview/trunk/debian/patches/series	2011-09-03 22:16:00 UTC (rev 7652)
@@ -1 +1,2 @@
 addtoplevelcmake.patch
+updategdcm.patch

Added: trunk/packages/volview/trunk/debian/patches/updategdcm.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/updategdcm.patch	                        (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/updategdcm.patch	2011-09-03 22:16:00 UTC (rev 7652)
@@ -0,0 +1,63 @@
+Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx	2011-09-03 23:59:11.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWCommonPro/vtkDICOMCollector.cxx	2011-09-04 00:08:24.000000000 +0200
+@@ -45,10 +45,10 @@
+ #include <assert.h>
+ 
+ #ifdef KWCommonPro_USE_GDCM
+-  #include "gdcmFileHelper.h"
++  //#include "gdcmFileHelper.h"
+   #include "gdcmFile.h"
+-  #include "gdcmDebug.h"
+-  #include "gdcmCommon.h"
++  //#include "gdcmDebug.h"
++  //#include "gdcmCommon.h"
+ #endif
+ 
+ #ifdef KWCommonPro_USE_CTNLIB
+@@ -2567,13 +2567,13 @@
+       (&object, &dcm_table_height, &rtn_length, &ctx) != DCM_NORMAL ||
+       !rtn_length)
+     {
+-    hinfo->SetTableHeight(NULL);
++    //hinfo->SetTableHeight(NULL);
+     }
+   else
+     {
+ #endif
+     table_height[rtn_length] = '\0';
+-    hinfo->SetTableHeight(table_height);
++    //hinfo->SetTableHeight(table_height);
+     }
+ #endif
+   
+@@ -2728,9 +2728,10 @@
+ 
+ #if defined(KWCommonPro_USE_GDCM) && KWCommonPro_USE_GDCM_FOR_IMAGE
+    gdcm::File *file = new gdcm::File();
+-   file->SetFileName(image->GetFileName());
+-   file->Load();
+-   if (!file->IsReadable())
++   //file->SetFileName(image->GetFileName());
++   //file->Load();
++   //if(1||/*!file->IsReadable()*/)
++   if(1)
+ #elif defined(KWCommonPro_USE_CTNLIB)
+   DCM_OBJECT *object = NULL;
+   DCM_Debug(FALSE);
+@@ -2758,10 +2759,10 @@
+ 
+ #if defined(KWCommonPro_USE_GDCM) && KWCommonPro_USE_GDCM_FOR_IMAGE
+ 
+-  gdcm::FileHelper *file_helper = new gdcm::FileHelper(file);
+-  size_t image_data_size = file_helper->GetImageDataSize();
+-  memcpy(data, file_helper->GetImageData(), image_data_size);
+-  delete file_helper;
++  //gdcm::FileHelper *file_helper = new gdcm::FileHelper(file);
++  //size_t image_data_size = file_helper->GetImageDataSize();
++  //memcpy(data, file_helper->GetImageData(), image_data_size);
++  //delete file_helper;
+ 
+   high_bit = bits_stored - 1;
+