* fix GDCM_NOASCII bug... please report your modif in the python part !!!

[gdcm.git] / gdcmPython / gdcm.i

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 6a435af22f1f8b9e3361294131057d1adb33a9c4..fb1a016a8db4570248a43f9ccfa27a08a4f69498 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -1,4 +1,5 @@
 %module gdcm
+#pragma SWIG nowarn=504
 %{
 #include <iostream>
 
@@ -127,9 +128,7 @@ typedef unsigned long long uint64_t;
 // Note: Uses gdcmPythonVoidFunc and gdcmPythonVoidFuncArgDelete defined
 //       in the Swig verbatim section of this gdcm.i i.e. in the above section
 //       enclosed within the %{ ... %} scope operator ).
-%typemap(python, in) ( gdcm::DicomDir::Method *, 
-                       void * = NULL, 
-                       gdcm::DicomDir::Method * = NULL )
+%typemap(python, in) (void(*method)(void *),void *arg,void(*argDelete)(void *))
 {
        if($input!=Py_None)
        {
@@ -204,8 +203,9 @@ typedef unsigned long long uint64_t;
 %ignore gdcm::binary_write(std::ostream &,uint32_t const &);
 %ignore gdcm::binary_write(std::ostream &,uint16_t const &);
 
-//%ignore gdcm::File::File();
-//%ignore gdcm::DicomDir::DicomDir();
+%ignore gdcm::DicomDir::SetStartMethod(DicomDir::Method *method,void *arg = NULL);
+%ignore gdcm::DicomDir::SetProgressMethod(DicomDir::Method *method,void *arg = NULL);
+%ignore gdcm::DicomDir::SetEndMethod(DicomDir::Method *method,void *arg = NULL);
 
 // Ignore all placed in gdcmCommon.h
 %ignore GDCM_UNKNOWN;
@@ -213,12 +213,14 @@ typedef unsigned long long uint64_t;
 %ignore GDCM_BINLOADED;
 %ignore GDCM_NOTLOADED;
 %ignore GDCM_UNREAD;
+%ignore GDCM_NOTASCII;
 
-%constant const char *UNKNOWN   = "gdcm::Unknown";
-%constant const char *UNFOUND   = "gdcm::Unfound";
-%constant const char *BINLOADED = "gdcm::Binary data loaded";
-%constant const char *NOTLOADED = "gdcm::NotLoaded";
-%constant const char *UNREAD    = "gdcm::UnRead";
+%constant const char *UNKNOWN       = "gdcm::Unknown";
+%constant const char *UNFOUND       = "gdcm::Unfound";
+%constant const char *BINLOADED     = "gdcm::Binary data loaded";
+%constant const char *NOTLOADED     = "gdcm::NotLoaded";
+%constant const char *UNREAD        = "gdcm::UnRead";
+%constant const char *GDCM_NOTASCII = "gdcm::NotAscii";
 
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !