Typo

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index a68c6ae7cf60d3dad606934fd248c66cd98fe2e5..e65e2efa9d9537086791e84b58b77ae0cb40cc32 100644 (file)
--- 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 08:44:51 $
-  Version:   $Revision: 1.292 $
+  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
@@ -491,7 +491,7 @@ float File::GetXSpacing()
       nbValue = entry->GetValueCount();
       if( nbValue >= 3 )
          xspacing = (float)entry->GetValue(2);
-      if( nbValue >= 2 )
+      else if( nbValue >= 2 )
          xspacing = (float)entry->GetValue(1);
       else
          xspacing = (float)entry->GetValue(0);
@@ -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() );
@@ -1731,7 +1749,9 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElem)
 
    if ( !ReadTag(testGroup, testElem) )
    {
-      gdcmErrorMacro( "ReadTag did not succeed for ("
+      // Avoid polutting output
+      if ( testGroup != 0xfffe ) 
+         gdcmErrorMacro( "ReadTag did not succeed for ("
                     << DictEntry::TranslateToKey(testGroup,testElem) 
                     << ")..." );
       return 0;
@@ -1788,21 +1808,6 @@ void File::ReadEncapsulatedBasicOffsetTable()
 // These are the deprecated method that one day should be removed (after the next release)
 
 #ifndef GDCM_LEGACY_REMOVE
-/*
- *  brief  Constructor (DEPRECATED : temporaryly kept not to break the API)
- *  param  filename name of the file whose header we want to analyze
- *  deprecated do not use any longer
- */
-File::File( std::string const &filename )
-     :Document( )
-{    
-   RLEInfo  = new RLEFramesInfo;
-   JPEGInfo = new JPEGFragmentsInfo;
-
-   SetFileName( filename );
-   Load( ); // gdcm::Document is first Loaded, then the 'File part'
-}
-
 /*
  * \ brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
  * @ param   fileName file to be open for parsing