Thx to Jean-Michel Rouet for reporting compile error.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85f0488d79b5282811ffc3b81114f2a17ec75984..2d385c98258488dc01f78d8170a3b5c7510e3d9f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # okay in fact you need at least cmake 2.0.4 to get swig working properly
 # and you cannot use cmake 2.0.6 out of the box due to a bug (patched in debian package)
 
+
+     if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 NEW)
+     endif(COMMAND cmake_policy)
+
+
+
 #-----------------------------------------------------------------------------
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index fc36ec5666dcf64eeb30580d350c382d17e81519..07603e1b35b44df1b21cbf1ee27db0b15b81fbb9 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/02/05 09:50:09 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2010/07/09 09:20:20 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -73,7 +73,7 @@ DataEntry::DataEntry(DocEntry *e)
 {
    Flag = FLAG_NONE;
    BinArea = 0;
-   
+
    SelfArea = true;
 
    Copy(e);
@@ -85,7 +85,6 @@ DataEntry::DataEntry(DocEntry *e)
 DataEntry::~DataEntry ()
 {
    DeleteBinArea();
-   
 }
 
 //-----------------------------------------------------------------------------
@@ -137,7 +136,7 @@ void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
 bool DataEntry::IsNumerical()
 {
    const VRKey &vr = GetVR();
-   
+
    return 
           vr == "DS" ||
           vr == "FL" ||
@@ -169,9 +168,9 @@ bool DataEntry::IsNumerical()
     {
        /// \todo rewrite the whole method, in order *not to use* std::string !
        std::vector<std::string> tokens;
-           
+    
        Util::Tokenize ( GetString().c_str(), tokens, "\\" );
-        
+
        int nbValues= tokens.size();
        if (nbValues == 0)
           return false;
@@ -182,14 +181,14 @@ bool DataEntry::IsNumerical()
        else
           for (loop=0; loop<nbValues; loop++) 
              valueVector.push_back(atoi(tokens[loop].c_str()));
-               
+      
        return true;     
     }    
-    
+
     uint32_t nbValues = GetValueCount();
     if (nbValues == 0)
        return false;
-       
+  
     if( vr == "US") {
        for (loop=0; loop<nbValues; loop++)
              valueVector.push_back(((uint16_t *)BinArea)[loop]);  

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 5aa5a850085a165c0119726de8b2022bd1988d31..f9bb7c709a99518e030f7f37fc9532f04ff76463 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/07/01 11:13:09 $
-  Version:   $Revision: 1.384 $
+  Date:      $Date: 2010/07/09 09:20:21 $
+  Version:   $Revision: 1.385 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2255,22 +2255,6 @@ DocEntry *Document::ReadNextDocEntry()
 
    VRKey vr = FindDocEntryVR();
    VRKey realVR = vr;
- /*  
-   std::string vr, realVR;
-   if (group == 0xfffe && (elem == 0xe000 || elem == 0xe00d || elem == 0xe0dd))
-   {
-    // DICOM PS 3.6-2009, page 117 states:
-    // The VR for Data Elements, Item (FFFE,E000), Item Delimitation
-    // Item (FFFE,E00D), and Sequence Delimitation Item (FFFE,E0DD)
-    // do not exist. See PS 3.5 for explanation.
-       vr = GDCM_UNKNOWN;
-       realVR = GDCM_UNKNOWN;   
-   }
-   else
-   {
-      vr = FindDocEntryVR();
-      realVR = vr;
-   }
 
    if ( vr == GDCM_VRUNKNOWN )
    {
@@ -2282,7 +2266,7 @@ DocEntry *Document::ReadNextDocEntry()
       {
          realVR = "UL";
       }
-*/
+
       // Was commented out in order not to generate 'Shadow Groups' where some 
       // Data Elements are Explicit VR and some other ones Implicit VR
       // -> Better we fix the problem at Write time