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/24 16:00:48 $
+ Version: $Revision: 1.290 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
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());
RemoveEntry(oldEntry);
AddEntry(newEntry);
+ newEntry->Delete();
}
}
}
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(0);
}
return 0.0f;
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(1);
}
return 0.0f;
{
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)");
{
if( entry->GetValueCount() == 3 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(0); // VM=1 !
}
gdcmWarningMacro( "Wrong Slice Location (0020,1041)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmAssertMacro( entry->IsValueCountValid() );
+ gdcmErrorMacro( entry->IsValueCountValid() );
return (float)entry->GetValue(0);
}
gdcmWarningMacro( "Wrong Location (0020,0050)");
// 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( )
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 )
{