* To remove warnings

     * Add gdcmHeaderHelper to the python part
     -- BeNours

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 69e8a82f14ec51c0ebe174b5025fe4cc18bca6e3..8683251f709bcfaf65e9fbf65c61a3dec43b4495 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -8,6 +8,7 @@
 #include "gdcmElValSet.h"
 #include "gdcmUtil.h"
 #include "gdcmHeader.h"
+#include "gdcmHeaderHelper.h"
 #include "gdcmFile.h"
 using namespace std;
 
@@ -113,5 +114,5 @@ extern gdcmGlobal gdcmGlob;
 %include "gdcmElValSet.h"
 %include "gdcmUtil.h"
 %include "gdcmHeader.h"
+%include "gdcmHeaderHelper.h"
 %include "gdcmFile.h"
-

diff --git a/gdcmPython/win32/gdcmpyembedded.dsp b/gdcmPython/win32/gdcmpyembedded.dsp
index 2878ce6f7a6bb2baecf4d178618dfdf4a734f4fe..1b652b88ed105d6474a322e81728ab16ef18f637 100644 (file)
--- a/gdcmPython/win32/gdcmpyembedded.dsp
+++ b/gdcmPython/win32/gdcmpyembedded.dsp
@@ -53,7 +53,7 @@ LINK32=link.exe
 # Begin Special Build Tool\r
 ProjDir=.\r
 SOURCE="$(InputPath)"\r
-PostBuild_Cmds=move                $(ProjDir)\gdcm.py                $(ProjDir)\..\ \r
+PostBuild_Cmds=move                 $(ProjDir)\gdcm.py                 $(ProjDir)\..\ \r
 # End Special Build Tool\r
 # Begin Target\r
 \r
@@ -112,6 +112,10 @@ SOURCE=..\..\src\gdcmHeader.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\gdcmHeaderHelper.cxx\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\gdcmJpeg.cxx\r
 # End Source File\r
 # Begin Source File\r

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index a8966f1512a7e57e6a2cf2dda41b2e15ae199947..eb927e3c314dd8d3cb1d526bbd91a6d265c02c1a 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -103,7 +103,6 @@ void gdcmHeader::PrintPubDict(std::ostream & os) {
 
 //-----------------------------------------------------------------------------
 // Public
-
 /**
  * \ingroup gdcmHeader
  * \brief  This predicate, based on hopefully reasonable heuristics,
@@ -1251,7 +1250,7 @@ gdcmElValue* gdcmHeader::GetElValueByNumber(guint16 Group, guint16 Elem) {
  * @return  integer acts as a boolean  
  */
 bool gdcmHeader::CheckIfExistByNumber(guint16 Group, guint16 Elem ) {
-   return (PubElValSet.CheckIfExistByNumber(Group, Elem));
+   return (PubElValSet.CheckIfExistByNumber(Group, Elem)>0);
 }
 
 /**

diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 15f0927528fe2c2a1eba36e6cb541a5aa1fc2a23..1f38148f95c259b7c94010d1da930901ba49b3c3 100644 (file)
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -816,7 +816,7 @@ bool gdcmSerieHeaderHelper::ImageNumberOrdering()
   CoherentGdcmFileVector.clear();
   
   delete[] partition;
-  return mult;
+  return (mult!=0);
 }
 
 bool gdcmSerieHeaderHelper::FileNameOrdering()

diff --git a/src/gdcmHeaderHelper.h b/src/gdcmHeaderHelper.h
index 8f44170724c5a2550b4627f4a5f72e842148c670..1b9b5f396f985c2a8df33d6ad554aef4cb580de8 100644 (file)
--- a/src/gdcmHeaderHelper.h
+++ b/src/gdcmHeaderHelper.h
@@ -64,9 +64,9 @@ enum ModalityType {
  */
 class GDCM_EXPORT gdcmHeaderHelper : public gdcmHeader {
 public:
-   gdcmHeaderHelper::gdcmHeaderHelper();
-   gdcmHeaderHelper::gdcmHeaderHelper(const char *filename, 
-                                      bool exception_on_error = false);
+   gdcmHeaderHelper();
+   gdcmHeaderHelper(const char *filename, 
+                    bool exception_on_error = false);
 
    int GetPixelSize();
    std::string GetPixelType();
@@ -110,8 +110,8 @@ For a multiframe dicom image better use directly gdcmHeaderHelper
 */
 class GDCM_EXPORT gdcmSerieHeaderHelper {
 public:
-    gdcmSerieHeaderHelper::gdcmSerieHeaderHelper() {};
-    gdcmSerieHeaderHelper::~gdcmSerieHeaderHelper();
+    gdcmSerieHeaderHelper() {};
+    ~gdcmSerieHeaderHelper();
 
    void AddFileName(std::string filename); //should return bool or throw error ?
    void AddGdcmFile(gdcmHeaderHelper *file);

diff --git a/vtk/win32/vtkgdcm.dsp b/vtk/win32/vtkgdcm.dsp
index ab8759078e6811b2b3ff35dd89f1b98bfb66774f..b6676e4a86404067bb04b1ef28c43dd1bd648dc5 100644 (file)
--- a/vtk/win32/vtkgdcm.dsp
+++ b/vtk/win32/vtkgdcm.dsp
@@ -174,6 +174,10 @@ SOURCE=..\vtkGdcmReader.cxx
 # Begin Group "Header Files"\r
 \r
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=..\vtkGdcmReader.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r