* Fix compilation warnings

[gdcm.git] / src / gdcmDataEntry.cxx

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index a57cb406a7a8cf3e4f0233f4e5fac6a31fa87fd3..97afe0cb24cb22876179ae42ed5039eda4c8336c 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: 2005/11/21 09:46:24 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/11/29 12:48:45 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -286,14 +286,15 @@ uint32_t DataEntry::GetValueCount( ) const
       return GetLength()/sizeof(uint16_t);
    else if( vr == "UL" || vr == "SL" )
       return GetLength()/sizeof(uint32_t);
-   else if( vr == "FL" )
-      return GetLength()/sizeof(float);
+   else if( vr == "FL" || vr == "OF" )
+      return GetLength()/4 ; // FL has a *4* length! sizeof(float);
    else if( vr == "FD" )
-      return GetLength()/sizeof(double);
+      return GetLength()/8;  // FD has a *8* length! sizeof(double);
    else if( Global::GetVR()->IsVROfStringRepresentable(vr) )
    {
       // Some element in DICOM are allowed to be empty
-      if( !GetLength() ) return 0;
+      if( !GetLength() ) 
+         return 0;
       // Don't use std::string to accelerate processing
       uint32_t count = 1;
       for(uint32_t i=0;i<GetLength();i++)
@@ -303,7 +304,6 @@ uint32_t DataEntry::GetValueCount( ) const
       }
       return count;
    }
-
    return GetLength();
 }
 /**
@@ -452,9 +452,11 @@ std::string const &DataEntry::GetString() const
    }
    return StrArea;
 }
+
 /**
- * \brief   Copies all the attributes from an other DocEntry 
+ * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
+ * @remarks The content BinArea is copied too
  */
 void DataEntry::Copy(DocEntry *doc)
 {
@@ -468,6 +470,7 @@ void DataEntry::Copy(DocEntry *doc)
       CopyBinArea(entry->BinArea,entry->GetLength());
    }
 }
+
 /**
  * \brief   Writes the 'value' area of a DataEntry
  * @param fp already open ofstream pointer