More verbosity when troubles

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 62f286563ac8bc275fb601c84a192973ab035df7..3740437816336ba7e3a2b00a5dfb3330a19e6b6d 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: 2008/01/07 18:12:02 $
-  Version:   $Revision: 1.379 $
+  Date:      $Date: 2008/06/12 13:18:15 $
+  Version:   $Revision: 1.380 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1546,7 +1546,7 @@ void Document::FindDocEntryLength( DocEntry *entry )
    // (the 'straight' images will no longer be readable ...)
    
       if ( vr == "OB" || vr == "OW" || vr == "OL" || vr == "SQ" || vr == "UT" 
-                                                          || vr == "UN" || changeFromUN == true)
+                                                         || vr == "UN"  || changeFromUN == true)
       {
          changeFromUN = false;
          // The following reserved two bytes (see PS 3.5-2003, section

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index c12ae7b9e7a1a76fb17a230277430f44f00330f6..33807ec5cff62c055767344aa534cb6ff0e41ee7 100644 (file)
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -4,8 +4,8 @@
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
 
-  Date:      $Date: 2007/10/25 07:52:59 $
-  Version:   $Revision: 1.136 $
+  Date:      $Date: 2008/06/12 13:18:15 $
+  Version:   $Revision: 1.137 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -875,7 +875,14 @@ bool FileHelper::CheckWriteIntegrity()
             if ( abs((long)(decSize-userDataSize))>1) // ignore padding zero
             {
                gdcmWarningMacro( "Data size (Raw) is incorrect. Should be " 
-                           << decSize << " / Found :" 
+                           << decSize << "(" 
+                           << FileInternal->GetXSize() << " * "
+                           << FileInternal->GetYSize() << " * "
+                           << FileInternal->GetZSize() << " * "
+                           << FileInternal->GetTSize() << " * "   
+                           << FileInternal->GetSamplesPerPixel() << " * "
+                           << numberBitsAllocated / 8   
+                           << ") / Found :" 
                            << userDataSize );
                return false;
             }