X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=da87e9ab9b2fd010ac2a2e53bdbf5dd72b6be98d;hb=c003ab063e99853986884357c1284dfbabc4afff;hp=4c3645fcd312a16cc27408b2427f94eaa08b9f54;hpb=c64a8ba115c9d6b71b2b8dab6b132815b70797f0;p=gdcm.git

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 4c3645fc..da87e9ab 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/21 16:00:55 $
-  Version:   $Revision: 1.288 $
+  Date:      $Date: 2005/10/25 12:41:30 $
+  Version:   $Revision: 1.293 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -233,7 +233,7 @@ bool File::DoTheLoadingJob( )
             DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
                                                 PixelVR,"1","Pixel Data");
 
-            DataEntry *newEntry = new DataEntry(newDict);
+            DataEntry *newEntry = DataEntry::New(newDict);
             newDict->Delete();
             newEntry->Copy(entry);
             newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
@@ -241,6 +241,7 @@ bool File::DoTheLoadingJob( )
 
             RemoveEntry(oldEntry);
             AddEntry(newEntry);
+            newEntry->Delete();
          }
       }
    }
@@ -630,7 +631,7 @@ float File::GetXOrigin()
 
    if( entry->GetValueCount() == 3 )
    {
-      gdcmAssertMacro( entry->IsValueCountValid() );
+      gdcmErrorMacro( entry->IsValueCountValid() );
       return (float)entry->GetValue(0);
    }
    return 0.0f;
@@ -658,7 +659,7 @@ float File::GetYOrigin()
 
    if( entry->GetValueCount() == 3 )
    {
-      gdcmAssertMacro( entry->IsValueCountValid() );
+      gdcmErrorMacro( entry->IsValueCountValid() );
       return (float)entry->GetValue(1);
    }
    return 0.0f;
@@ -679,7 +680,7 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 3 )
       {
-         gdcmAssertMacro( entry->IsValueCountValid() );
+         gdcmErrorMacro( entry->IsValueCountValid() );
          return (float)entry->GetValue(2);
       }
       gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)");
@@ -691,7 +692,7 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 3 )
       {
-         gdcmAssertMacro( entry->IsValueCountValid() );
+         gdcmErrorMacro( entry->IsValueCountValid() );
          return (float)entry->GetValue(2);
       }
       gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)");
@@ -704,7 +705,7 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 1 )
       {
-         gdcmAssertMacro( entry->IsValueCountValid() );
+         gdcmErrorMacro( entry->IsValueCountValid() );
          return (float)entry->GetValue(0); // VM=1 !
       }
       gdcmWarningMacro( "Wrong Slice Location (0020,1041)");
@@ -716,7 +717,7 @@ float File::GetZOrigin()
    {
       if( entry->GetValueCount() == 1 )
       {
-         gdcmAssertMacro( entry->IsValueCountValid() );
+         gdcmErrorMacro( entry->IsValueCountValid() );
          return (float)entry->GetValue(0);
       }
       gdcmWarningMacro( "Wrong Location (0020,0050)");
@@ -1658,7 +1659,7 @@ void File::ComputeJPEGFragmentInfo()
 
 /**
  * \brief   Assuming the internal file pointer \ref Document::Fp 
- *          is placed at the beginning of a tag check whether this
+ *          is placed at the beginning of a tag, check whether this
  *          tag is (TestGroup, TestElem).
  * \warning On success the internal file pointer \ref Document::Fp
  *          is modified to point after the tag.
@@ -1693,15 +1694,17 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem)
       return false;
    }
    if ( itemTagGroup != testGroup || itemTagElem != testElem )
-   {
-      gdcmErrorMacro( "Wrong Item Tag found:"
-       << "   We should have found tag ("
-       << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl
-       << "   but instead we encountered tag ("
-       << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
-       << "  at address: " << "  0x(" << std::hex 
-       << (unsigned int)currentPosition  << std::dec << ")" 
-       ) ;
+   { 
+       // in order not to pollute output we don't warn on 'delimitors'
+      if (itemTagGroup != 0xfffe ||  testGroup != 0xfffe )
+         gdcmErrorMacro( "Wrong Item Tag found:"
+          << "   We should have found tag ("
+          << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl
+          << "   but instead we encountered tag ("
+          << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
+          << "  at address: " << "  0x(" << std::hex 
+          << (unsigned int)currentPosition  << std::dec << ")" 
+          ) ;
       Fp->seekg(positionOnEntry, std::ios::beg);
 
       return false;
@@ -1728,7 +1731,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;
@@ -1785,10 +1790,10 @@ 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
+/*
+ *  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( )
@@ -1800,12 +1805,12 @@ File::File( std::string const &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
- * @return false if file cannot be open or no swap info was found,
+/*
+ * \ brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
+ * @ param   fileName file to be open for parsing
+ * @ return false if file cannot be open or no swap info was found,
  *         or no tag was found.
- * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
+ * @ deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
  */
 bool File::Load( std::string const &fileName ) 
 {