* Testing/TestAllReadCompareDicom.cxx : now use test files (invented file

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 98298ca00e9877b9ed9111d69303eb3c13bebf77..399f6f4fbcfaf4da12cf156d3195bf2afac34965 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -21,12 +21,13 @@
 #include "gdcmFileHelper.h"
 #include "gdcmGlobal.h"
 #include "gdcmFile.h"
-#include "gdcmSerieHeader.h"
+#include "gdcmSerieHelper.h"
 #include "gdcmRLEFramesInfo.h"
 #include "gdcmJPEGFragmentsInfo.h"
 #include "gdcmSQItem.h"
 #include "gdcmUtil.h"
 #include "gdcmDocEntry.h"
+#include "gdcmContentEntry.h"
 #include "gdcmValEntry.h"
 #include "gdcmBinEntry.h"
 #include "gdcmSeqEntry.h"
@@ -280,11 +281,21 @@ typedef unsigned long long uint64_t;
 
 ////////////////////  STL string versus Python str  ////////////////////////
 // Convertion returning a C++ string.
-%typemap(out) string, std::string 
+%typemap(out) std::string
 {
     $result = PyString_FromString(($1).c_str());
 }
 
+%typemap(out) string
+{
+    $result = PyString_FromString(($1).c_str());
+}
+
+%typemap(out) std::string const &
+{
+    $result = PyString_FromString(($1)->c_str());
+}
+
 // Convertion of incoming Python str to STL string
 %typemap(python, in) const std::string, std::string
 {
@@ -356,12 +367,13 @@ typedef unsigned long long uint64_t;
 %include "gdcmDicomDirMeta.h"
 %include "gdcmDocument.h"
 %include "gdcmFile.h"
-%include "gdcmSerieHeader.h"
+%include "gdcmSerieHelper.h"
 %include "gdcmFile.h"
 %include "gdcmUtil.h"
 %include "gdcmGlobal.h"
 %include "gdcmDicomDir.h"
 %include "gdcmDocEntry.h"
+%include "gdcmContentEntry.h"
 %include "gdcmValEntry.h"
 %include "gdcmBinEntry.h"
 %include "gdcmSeqEntry.h"