* Fix compilation error for the Python part

   -- BeNours

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index e1bdef88ab9147b782986b3d41dc54c1e60bc8d1..e1209af0aecda5eb4a6d89403faeadf8eef34883 100644 (file)
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -134,17 +134,17 @@ ENDIF(WIN32)
 # Install a python path file in site-packages that tells
 # python where to find the gdcmPython module
 IF(UNIX)
-FIND_PATH(PYTHON_DIR "site-packages"
-   /usr/lib/python2.4
-   /usr/lib/python2.3
-   /usr/lib/python2.2
-   /usr/lib/python2.1
-) 
-STRING(REGEX REPLACE "/usr" "" PYTHON_DIR ${PYTHON_DIR})
-
-INSTALL_FILES(${PYTHON_DIR}/site-packages "gdcmPython.pth")
-INSTALL_FILES(/lib/gdcm/gdcmPython "\\.py$")
-INSTALL_FILES(/lib/gdcm/gdcmPython FILES "gdcm.py")
+  FIND_PATH(PYTHON_DIR "site-packages"
+     /usr/lib/python2.4
+     /usr/lib/python2.3
+     /usr/lib/python2.2
+     /usr/lib/python2.1
+  ) 
+  STRING(REGEX REPLACE "/usr" "" PYTHON_DIR ${PYTHON_DIR})
+
+  INSTALL_FILES(${PYTHON_DIR}/site-packages "gdcmPython.pth")
+  INSTALL_FILES(/lib/gdcm/gdcmPython "\\.py$")
+  INSTALL_FILES(/lib/gdcm/gdcmPython FILES "gdcm.py")
 ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------

diff --git a/gdcmPython/demo/CMakeLists.txt b/gdcmPython/demo/CMakeLists.txt
index f50976ab9329b73bfbc16bd294ca0d3bc3e0bd09..23320d75f633ce23b61deed51f25438448553cc8 100644 (file)
--- a/gdcmPython/demo/CMakeLists.txt
+++ b/gdcmPython/demo/CMakeLists.txt
@@ -75,3 +75,7 @@ IF(GDCM_VTK)
       ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py
   )
 ENDIF(GDCM_VTK)
+
+#-----------------------------------------------------------------------------
+INSTALL_FILES(/lib/gdcm/gdcmPython/demo "\\.py$")
+

diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h
index f7744f29ac8c63d02a631e33e0d2da6ae14d5db1..6ac7abe4be287ea5e27eaceff38676f4061a7e82 100644 (file)
--- a/src/gdcmDicomEntry.h
+++ b/src/gdcmDicomEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 07:38:00 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/10/21 11:50:04 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,7 +40,6 @@ namespace gdcm
  */
 class GDCM_EXPORT DicomEntry : public RefCounter
 {
-public:
    gdcmTypeMacro(DicomEntry)
 
 public:

diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h
index d6766fb971112a0f364afb71dbebb7d164c05eff..7f204fb7f305f030c6ac847f57d22d8d1086c744 100644 (file)
--- a/src/gdcmDictEntry.h
+++ b/src/gdcmDictEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 07:38:00 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/10/21 11:50:04 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,6 @@ namespace gdcm
  */
 class GDCM_EXPORT DictEntry : public DicomEntry
 {
-public:
    gdcmTypeMacro(DictEntry)
 
 public:

diff --git a/src/gdcmRefCounter.h b/src/gdcmRefCounter.h
index 6a801ca72fd435cd5547465adecdfacac2daf8f2..70d1262f65f2af10d616dcc8fdcbeada65ce87da 100644 (file)
--- a/src/gdcmRefCounter.h
+++ b/src/gdcmRefCounter.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRefCounter.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 10:40:53 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/10/21 11:50:04 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,7 +31,6 @@ namespace gdcm
  */
 class GDCM_EXPORT RefCounter : public Base
 {
-public:
    gdcmTypeMacro(RefCounter)
 
 public: