From: malaterre <malaterre>
Date: Thu, 13 Nov 2003 10:23:38 +0000 (+0000)
Subject: *FIX: Change GetLUTRGBA to return unsigned char instead of void, nicer for python... 
X-Git-Tag: Version0.3.1~37
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ec5c97e570cd68bd66ccf41b61e96d11c87bbd5b;p=gdcm.git

*FIX: Change GetLUTRGBA to return unsigned char instead of void, nicer for python level
---

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 1c539c53..c8cb8da3 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -78,6 +78,14 @@ IF(GDCM_VTK)
                          vtkCommonPython
                          vtkIOPython)
   ENDIF (GDCM_WRAP_PYTHON)
+  
+  #generate a setup.py according to VTK installation 
+  #put it in subdir in order to not override old one
+  CONFIGURE_FILE(
+      ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
+      ${GDCM_BINARY_DIR}/gdcmPython/setup.py
+  )
+
 ENDIF(GDCM_VTK)
 
 #I should install in path of PYTHON_LIBRARY
diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 4b22d148..69fba758 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -372,7 +372,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
          
    unsigned char * newDest = (unsigned char *)malloc(lgrTotale);
    unsigned char * a       = (unsigned char *)destination;	 
-   unsigned char * lutRGBA = (unsigned char *)GetLUTRGBA();
+   unsigned char * lutRGBA =                  GetLUTRGBA();
    if (lutRGBA) { 	    
       int l = lgrTotaleRaw;
       memmove(newDest, destination, l);// move Gray pixels to temp area	    
diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index ddfe7557..09eb2d4e 100644
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.115 2003/11/12 15:35:19 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.116 2003/11/13 10:23:40 malaterre Exp $
 
 #include "gdcmHeader.h"
 
@@ -2236,7 +2236,7 @@ int gdcmHeader::GetLUTNbits(void) {
   * @return Lookup Table RGBA
   */ 
   
-void * gdcmHeader::GetLUTRGBA(void) {
+unsigned char * gdcmHeader::GetLUTRGBA(void) {
 // Not so easy : see 
 // http://www.barre.nom.fr/medical/dicom2/limitations.html#Color%20Lookup%20Tables
 // and  OT-PAL-8-face.dcm
diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index 9a88dd53..9d704b5a 100644
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.43 2003/11/12 15:35:19 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.44 2003/11/13 10:23:40 malaterre Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
@@ -211,7 +211,7 @@ public:
    std::string GetTransferSyntaxName(void);
    int    HasLUT(void);
    int    GetLUTNbits(void);
-   void * GetLUTRGBA(void);
+   unsigned char * GetLUTRGBA(void);
            
 
 };
diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 426018c0..b9aa0732 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.27 2003/11/12 14:06:36 malaterre Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.28 2003/11/13 10:23:41 malaterre Exp $
 // //////////////////////////////////////////////////////////////
 // WARNING TODO CLENAME 
 // Actual limitations of this code:
@@ -481,7 +481,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
     {
     size               = GdcmFile.GetImageDataSizeRaw();
     Source             = (unsigned char*) GdcmFile.GetImageDataRaw();
-    unsigned char *Lut = (unsigned char*) GdcmFile.GetLUTRGBA();
+    unsigned char *Lut =                  GdcmFile.GetLUTRGBA();
   
     if(!this->LookupTable) this->LookupTable = vtkLookupTable::New();
     this->LookupTable->SetNumberOfTableValues(256);