ENH: Adding IsValueCountValid. Should save a lot of time for dev, since we you really...

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 95a51268bcf8845d491ad62902790b867b4f8a54..def9a2ba8bd8d53bbc5f7e4c4f92232d073eea79 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/19 19:36:54 $
-  Version:   $Revision: 1.283 $
+  Date:      $Date: 2005/10/21 14:09:41 $
+  Version:   $Revision: 1.286 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -230,10 +230,11 @@ bool File::DoTheLoadingJob( )
          // Change only made if usefull
          if ( PixelVR != oldEntry->GetVR() )
          {
-            DictEntry* newDict = NewVirtualDictEntry(GrPixel,NumPixel,
-                                                     PixelVR,"1","Pixel Data");
+            DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
+                                                PixelVR,"1","Pixel Data");
 
             DataEntry *newEntry = new DataEntry(newDict);
+            newDict->Delete();
             newEntry->Copy(entry);
             newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
             oldEntry->SetSelfArea(false);
@@ -888,7 +889,6 @@ float File::GetZOrigin()
    entry = GetDataEntry(0x0020,0x0050);
    if( entry )
    {
-      gdcmWarningMacro( "Unfound Location (0020,0050)");
       if( entry->GetValueCount() == 1 )
          return (float)entry->GetValue(0);
       gdcmWarningMacro( "Wrong Location (0020,0050)");
@@ -2093,7 +2093,7 @@ 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
@@ -2108,7 +2108,7 @@ 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,