X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=e65e2efa9d9537086791e84b58b77ae0cb40cc32;hb=45c38ff14f1a399a07eb2bb660d305577f4b35f8;hp=88b7d144787810412af48e9abfc330af7eef79f1;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 88b7d144..e65e2efa 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/25 14:52:34 $
-  Version:   $Revision: 1.295 $
+  Date:      $Date: 2005/10/26 06:23:37 $
+  Version:   $Revision: 1.297 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -631,7 +631,10 @@ float File::GetXOrigin()
 
    if( entry->GetValueCount() == 3 )
    {
-      gdcmErrorMacro( entry->IsValueCountValid() );
+      if (!entry->IsValueCountValid() )
+      {
+         gdcmErrorMacro( "Invalid Value Count" );
+      }
       return (float)entry->GetValue(0);
    }
    return 0.0f;
@@ -659,7 +662,10 @@ float File::GetYOrigin()
 
    if( entry->GetValueCount() == 3 )
    {
-      gdcmErrorMacro( entry->IsValueCountValid() );
+      if (!entry->IsValueCountValid() )
+      {
+         gdcmErrorMacro( "Invalid Value Count" );
+      }
       return (float)entry->GetValue(1);
    }
    return 0.0f;
@@ -680,7 +686,10 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 3 )
       {
-         gdcmErrorMacro( entry->IsValueCountValid() );
+         if (!entry->IsValueCountValid() )
+         {
+            gdcmErrorMacro( "Invalid Value Count" );
+         }
          return (float)entry->GetValue(2);
       }
       gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)");
@@ -692,7 +701,10 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 3 )
       {
-         gdcmErrorMacro( entry->IsValueCountValid() );
+         if (!entry->IsValueCountValid() )
+         {
+            gdcmErrorMacro( "Invalid Value Count" );
+         }
          return (float)entry->GetValue(2);
       }
       gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)");
@@ -705,7 +717,10 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 1 )
       {
-         gdcmErrorMacro( entry->IsValueCountValid() );
+         if (!entry->IsValueCountValid() )
+         {
+            gdcmErrorMacro( "Invalid Value Count" );
+         }
          return (float)entry->GetValue(0); // VM=1 !
       }
       gdcmWarningMacro( "Wrong Slice Location (0020,1041)");
@@ -717,7 +732,10 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 1 )
       {
-         gdcmErrorMacro( entry->IsValueCountValid() );
+         if (!entry->IsValueCountValid() )
+         {
+            gdcmErrorMacro( "Invalid Value Count" );
+         }
          return (float)entry->GetValue(0);
       }
       gdcmWarningMacro( "Wrong Location (0020,0050)");
@@ -1456,10 +1474,10 @@ bool File::Write(std::string fileName, FileType writetype)
 
    // Derma?.dcm does not have it...let's remove it  FIXME FIXME
    if( writetype != JPEG )
-     {
+   {
      int i_lgPix = GetEntryLength(GrPixel, NumPixel);
      if (i_lgPix != -2)
-       {
+     {
        // no (GrPixel, NumPixel) element
        std::string s_lgPix = Util::Format("%d", i_lgPix+12);
        s_lgPix = Util::DicomString( s_lgPix.c_str() );