X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.cxx;h=1ae42af4e01bd6a871cd76cd8d5e0f6adeac55a6;hb=6685f35f9cd58b5d14d39de46e910fc5c5cfc5db;hp=67e3e276c2d0dbe0387a6f50260590c438fc49da;hpb=6c5eca9df49cc2ecbb9b343ec286a91df3998cbf;p=gdcm.git

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 67e3e276..1ae42af4 100644
--- 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/08 09:54:42 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/11/14 18:54:04 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -234,17 +234,19 @@ double DataEntry::GetValue(const uint32_t &id) const
  */
 bool DataEntry::IsValueCountValid() const
 {
-  bool valid;
   uint32_t vm;
   const std::string &strVM = GetVM();
   uint32_t vc = GetValueCount();
+  bool valid = vc == 0;
+  if( valid )
+    return true;
   
   // FIXME : what shall we do with VM = "2-n", "3-n", etc
   
   if( strVM == "1-n" )
   {
     // make sure there is at least one ??? FIXME
-    valid = vc >= 1 || vc == 0;
+    valid = vc >= 1;
   }
   else
   {
@@ -269,7 +271,7 @@ bool DataEntry::IsValueCountValid() const
     // Problem : entry type may depend on the modality and/or the Sequence
     //           it's embedded in !
     //          (Get the information in the 'Conformance Statements' ...)  
-    valid = vc == vm || vc == 0;
+    valid = vc == vm;
   }
   return valid;
 }