Program: gdcm
Module: $RCSfile: exGC.cxx,v $
Language: C++
- Date: $Date: 2005/07/07 17:31:54 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2005/10/25 14:52:27 $
+ 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
#include "gdcmFile.h"
#include "gdcmFileHelper.h"
#include "gdcmDocument.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
+#include "gdcmDataEntry.h"
#include "gdcmSeqEntry.h"
#include <stdlib.h> // for exit
std::cout << argv[1] << std::endl;
- gdcm::File *f = new gdcm::File();
- f->SetLoadMode( 0x00000000);
+ gdcm::File *f = gdcm::File::New();
+ f->SetLoadMode( gdcm::LD_ALL);
f->SetFileName( fileName );
bool res = f->Load();
std::cerr << "Sorry, " << fileName <<" not a gdcm-readable "
<< "DICOM / ACR File"
<<std::endl;
+ f->Delete();
return 0;
}
std::cout << " ... is readable " << std::endl;
// ============================================================
// We need a gdcm::FileHelper, since we want to load the pixels
- gdcm::FileHelper *fh = new gdcm::FileHelper(f);
+ gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
// (unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one)
{
std::cerr << "Sorry, Pixels of" << fileName <<" are not "
<< " gdcm-readable." << std::endl;
+ f->Delete();
+ fh->Delete();
return 0;
}
// ------ without Sequences -------------
- gdcm::FileHelper *copy = new gdcm::FileHelper( output );
+ gdcm::FileHelper *copy = gdcm::FileHelper::New( );
+ copy->SetFileName( output );
+ copy->Load();
gdcm::DocEntry *d = f->GetFirstEntry();
while(d)
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+ if ( gdcm::DataEntry *de = dynamic_cast<gdcm::DataEntry *>(d) )
{
- copy->GetFile()->InsertBinEntry( b->GetBinArea(),b->GetLength(),
- b->GetGroup(),b->GetElement(),
- b->GetVR() );
- }
- else if ( gdcm::ValEntry *v = dynamic_cast<gdcm::ValEntry*>(d) )
- {
- copy->GetFile()->InsertValEntry( v->GetValue(),
- v->GetGroup(),v->GetElement(),
- v->GetVR() );
+ copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(),
+ de->GetGroup(),de->GetElement(),
+ de->GetVR() );
}
else
{
}
}
- std::cout << n << " points put to black (within "
- << imageSize/3 << ")" << std::endl;
+ std::cout << n << " points put to black (within "
+ << imageSize/3 << ")" << std::endl;
n = 0;
for (i = 0; i<imageSize/3; i++)
{
- if ( ((rgb8_t *)imageData)[i].r < threshold
- &&
- ((rgb8_t *)imageData)[i].g < threshold
- &&
- ((rgb8_t *)imageData)[i].b < threshold )
+ if ( ((rgb8_t *)imageData)[i].r < threshold
+ &&
+ ((rgb8_t *)imageData)[i].g < threshold
+ &&
+ ((rgb8_t *)imageData)[i].b < threshold )
{
n++;
((rgb8_t *)imageData)[i].r = (unsigned char)background;
copy->WriteDcmExplVR( output );
- delete f;
- delete fh;
- delete copy;
+ f->Delete();
+ fh->Delete();
+ copy->Delete();
exit (0);
}