STYLE: Lost of minor tweak + fix indentation

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index ada7ecf687df768f1876fca0893a94a73682cba5..0ffc80910084d99d343c6216c4564c289c400f96 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 16:45:52 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/01/12 17:10:15 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 #include "gdcmTS.h"
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <fstream>
 
@@ -91,7 +92,6 @@ void ValEntry::Print(std::ostream &os)
    v  = GetValue();  // not applicable for SQ ...     
    d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
    if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-       //(PrintLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
        (PrintLevel>=3)  || (d2.find(GDCM_NOTLOADED) < d2.length()) )
    {
       s << " [" << d2 << "]";
@@ -199,7 +199,7 @@ void ValEntry::SetValue(std::string const &val)
       else
       {
          std::string finalVal = Util::DicomString( val.c_str() );
-         assert( !(finalVal.size() % 2) );
+         gdcmAssertMacro( !(finalVal.size() % 2) );
 
          l = finalVal.length();
          SetValueOnly(finalVal);
@@ -208,7 +208,7 @@ void ValEntry::SetValue(std::string const &val)
    else
    {
       std::string finalVal = Util::DicomString( val.c_str() );
-      assert( !(finalVal.size() % 2) );
+      gdcmAssertMacro( !(finalVal.size() % 2) );
 
       l = finalVal.length();
       SetValueOnly(finalVal);
@@ -266,7 +266,7 @@ void ValEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return;
    } 
 
-   assert( lgr == GetValue().length() );
+   gdcmAssertMacro( lgr == GetValue().length() );
    binary_write(*fp, GetValue());
 }