-#include "gdcmHeader.h"
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: TestReadWriteReadCompare.cxx,v $
+ Language: C++
+ Date: $Date: 2005/02/02 10:06:32 $
+ Version: $Revision: 1.10 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
//Generated file:
#include "gdcmDataImages.h"
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
{
if (argc<2)
{
std::cout << " For all images in gdcmData (and not blacklisted in "
"Test/CMakeLists.txt)" << std::endl;
std::cout << " apply the following multistep test: " << std::endl;
- std::cout << " step 1: parse the image (as gdcmHeader) and call"
+ std::cout << " step 1: parse the image (as gdcmFile) and call"
<< " IsReadable(). " << std::endl;
std::cout << " step 2: write the corresponding image in DICOM V3 "
<< "with explicit" << std::endl
//////////////// Step 1 (see above description):
- gdcm::Header *header = new gdcm::Header( filename );
+ gdcm::File *header = new gdcm::File( filename );
if( !header->IsReadable() )
{
std::cerr << "Test::TestReadWriteReadCompare: Image not gdcm compatible:"
//////////////// Step 2:
- gdcm::File* file = new gdcm::File( header );
+ gdcm::FileHelper *file = new gdcm::FileHelper( header );
int dataSize = file->GetImageDataSize();
uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
// Sure, it is : It's up to the user to decide if he wants to
//////////////// Step 3:
- gdcm::File* reread = new gdcm::File( "TestReadWriteReadCompare.dcm" );
- if( !reread->GetHeader()->IsReadable() )
+ gdcm::FileHelper *reread = new gdcm::FileHelper( "TestReadWriteReadCompare.dcm" );
+ if( !reread->GetFile()->IsReadable() )
{
std::cerr << "Test::TestReadWriteReadCompare: Could not reread image "
<< "written:" << filename << std::endl;
std::cout << "3...";
// For the next step:
int dataSizeWritten = reread->GetImageDataSize();
- void* imageDataWritten = reread->GetImageData();
+ uint8_t *imageDataWritten = reread->GetImageData();
//////////////// Step 4:
std::cout << std::endl
<< " Pixel areas lengths differ: "
<< dataSize << " # " << dataSizeWritten << std::endl;
- delete (char*)imageData;
- delete (char*)imageDataWritten;
delete header;
delete file;
delete reread;
(void)res;
std::cout << std::endl
<< " Pixel differ (as expanded in memory)." << std::endl;
- delete (char*)imageData;
- delete (char*)imageDataWritten;
delete header;
delete file;
delete reread;
std::cout << "4...OK." << std::endl ;
//////////////// Clean up:
- delete (char*)imageData;
- delete (char*)imageDataWritten;
delete header;
delete file;
delete reread;