Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2005/07/08 13:39:57 $
- Version: $Revision: 1.41 $
+ Date: $Date: 2007/10/30 09:13:45 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmFile.h"
#include "gdcmFileHelper.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
//Generated file:
#include "gdcmDataImages.h"
//////////////// Step 1:
std::cout << " 1...";
-
- gdcm::File *originalH = new gdcm::File( );
- gdcm::File *copyH = new gdcm::File( );
+ GDCM_NAME_SPACE::File *originalH = GDCM_NAME_SPACE::File::New();
+ GDCM_NAME_SPACE::File *copyH = GDCM_NAME_SPACE::File::New();
+
originalH->SetFileName( filename );
originalH->Load( );
//////////////// Step 2:
std::cout << "2...";
- gdcm::DocEntry *d=originalH->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d=originalH->GetFirstEntry();
while(d)
{
- if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
- {
- copyH->InsertBinEntry( b->GetBinArea(),b->GetLength(),
- b->GetGroup(),b->GetElement(),
- b->GetVR() );
- }
- else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- copyH->InsertValEntry( v->GetValue(),
- v->GetGroup(),v->GetElement(),
- v->GetVR() );
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::DataEntry *>(d) )
+ {
+ copyH->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+ de->GetGroup(),de->GetElement(),
+ de->GetVR() );
}
else
{
d=originalH->GetNextEntry();
}
-
- gdcm::FileHelper *original = new gdcm::FileHelper( originalH );
- gdcm::FileHelper *copy = new gdcm::FileHelper( copyH );
+ GDCM_NAME_SPACE::FileHelper *original = GDCM_NAME_SPACE::FileHelper::New(originalH);
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New(copyH);
size_t dataSize = original->GetImageDataSize();
uint8_t *imageData = original->GetImageData();
// Useless to set the image data, because it's already made when
- // copying the corresponding BinEntry that contains the pixel data
+ // copying the corresponding DataEntry that contains the pixel data
+
+ // --> FIXME : Why do we let the following line?
+ // to avoid compile time warnings?
copy->SetImageData(imageData, dataSize);
//////////////// Step 3:
std::cout << " Failed" << std::endl
<< " " << output << " not written" << std::endl;
- delete original;
- delete copy;
- delete originalH;
- delete copyH;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
+ copyH->Delete();
return 1;
}
- delete copy;
- delete copyH;
+ copy->Delete();
+ copyH->Delete();
//////////////// Step 4:
std::cout << "4...";
- copy = new gdcm::FileHelper( output );
-
+// copy = new GDCM_NAME_SPACE::FileHelper( output );
+ copy = GDCM_NAME_SPACE::FileHelper::New(output); // ???
//Is the file written still gdcm parsable ?
if ( !copy->GetFile()->IsReadable() )
{
std::cout << " Failed" << std::endl
<< " " << output << " not readable" << std::endl;
- delete original;
- delete originalH;
+ original->Delete();
+ originalH->Delete();
return 1;
}
<< " Pixel areas lengths differ: "
<< dataSize << " # " << dataSizeWritten << std::endl;
- delete original;
- delete copy;
- delete originalH;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 1;
}
std::cout << " Failed" << std::endl
<< " Pixel differ (as expanded in memory)." << std::endl;
- delete original;
- delete copy;
- delete originalH;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 1;
}
std::cout << "OK." << std::endl ;
- delete original;
- delete copy;
- delete originalH;
+ original->Delete();
+ copy->Delete();
+ originalH->Delete();
return 0;
}