ENH: hopefully fixed swig wrapping

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 1e63ca139b54a9b773938597c174a147b44786a3..8c2d95d369ffa593eae0c49909b7f904d1319db8 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -61,7 +61,7 @@ typedef unsigned long long uint64_t;
 
 ////////////////////////////////////////////////
 // Convert a DocEntry * to the real derived class
-%typemap(out) gdcm::DocEntry * 
+%typemap(out) gdcm::DocEntry *
 {
    PyObject *newEntry;
 

diff --git a/src/gdcmMacro.h b/src/gdcmMacro.h
index 5719b3d898ffabce11b3f78eb0db0023a6e31a2a..561d99fd7214565ce49b3a9e75f8c68d3f74fdfa 100644 (file)
--- a/src/gdcmMacro.h
+++ b/src/gdcmMacro.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmMacro.h,v $
   Language:  C++
-  Date:      $Date: 2006/05/11 19:49:38 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2006/05/23 14:16:08 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,11 +39,11 @@
 //Example usage:
 //
 //   // @deprecated Replaced by MyOtherMethod() as of gdcm 2.0.
-//   GDCM_LEGACY(void MyMethod());
+//   GDCM_LEGACY(void MyMethod())
 #if defined(GDCM_LEGACY_REMOVE)
   // Remove legacy methods completely.
 # define GDCM_LEGACY(method)
-#elif defined(GDCM_LEGACY_SILENT) || defined(SWIG)
+#elif defined(GDCM_LEGACY_SILENT)
   // Provide legacy methods with no warnings.
 # define GDCM_LEGACY(method) method;
 #else

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index f52fefd90e598520b93ede457cacd33619b57fcb..f06d256f4e386382d49c01b15112dfd0c83c1039 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.51 $
+  Date:      $Date: 2006/05/23 14:16:08 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1032,5 +1032,13 @@ void SerieHelper::Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *f
  std::sort(fileList->begin(), fileList->end(), pt2Func );
 }
 
+#ifndef GDCM_LEGACY_REMOVE
+bool SerieHelper::AddGdcmFile(File* header)
+{
+  return AddFile(header);
+}
+#endif
+
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 2743a112e63b8e607e5a0dfe77535a05e195db7f..ca6f727ee7fdd6f4b8a528b201a49380fda535d3 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2006/05/11 19:49:38 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2006/05/23 14:16:08 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -79,9 +79,7 @@ public:
    /// \todo should return bool or throw error ?
    void AddFileName(std::string const &filename);
    bool AddFile(File *header);
-#ifndef GDCM_LEGACY_REMOVE
-   bool AddGdcmFile(File* header) { return AddFile(header); }
-#endif
+   GDCM_LEGACY(bool AddGdcmFile(File* header))
 
    void SetDirectory(std::string const &dir, bool recursive=false);
    bool IsCoherent(FileList *fileSet);