Program: gdcm
Module: $RCSfile: exImageLighten.cxx,v $
Language: C++
- Date: $Date: 2005/07/06 15:49:31 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/05/23 14:18:05 $
+ 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
int main(int argc, char *argv[])
-{
- gdcm::File *f1;
-
+{
std::cout << "-----------------------------------------------" << std::endl;
std::cout << "Removes from a full gdcm-readable Dicom image" << std::endl;
std::cout << " all the 'Shadow groups' and the 'Sequence' entries"
std::cout << argv[1] << std::endl;
- f1 = new gdcm::File( fileName );
- if (!f1->IsReadable()) {
+ GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+ f->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
+ f->SetFileName( fileName );
+ bool res = f->Load();
+
+ if (!res) {
std::cerr << "Sorry, " << fileName <<" not a gdcm-readable "
<< "DICOM / ACR File"
<<std::endl;
+ f->Delete();
return 0;
}
std::cout << " ... is readable " << std::endl;
// Pixel Reading must be done here, to be sure
// to load the Palettes Color (if any)
- // First, create a gdcm::FileHelper
- gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1);
+ // First, create a GDCM_NAME_SPACE::FileHelper
+ GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f);
// Load the pixels, DO NOT transform LUT (if any) into RGB Pixels
- uint8_t *imageDataRaw = fh1->GetImageDataRaw();
+ uint8_t *imageDataRaw = fh->GetImageDataRaw();
// Get the image data size
- size_t dataRawSize = fh1->GetImageDataRawSize();
+ size_t dataRawSize = fh->GetImageDataRawSize();
// ============================================================
-// Create a new gdcm::Filehelper, to hold new image.
+// Create a new GDCM_NAME_SPACE::Filehelper, to hold new image.
// ============================================================
- gdcm::FileHelper *copy = new gdcm::FileHelper( output );
+ GDCM_NAME_SPACE::FileHelper *copy = GDCM_NAME_SPACE::FileHelper::New( );
+ copy->SetFileName( output );
+ copy->Load();
// ============================================================
// Selective copy of the entries (including Pixel Element).
// ============================================================
- gdcm::DocEntry *d = f1->GetFirstEntry();
-
- d = f1->GetFirstEntry();
+ GDCM_NAME_SPACE::DocEntry *d = f->GetFirstEntry();
while(d)
{
// We skip SeqEntries, since user cannot do much with them
- if ( !(dynamic_cast<gdcm::SeqEntry*>(d))
+ if ( !(dynamic_cast<GDCM_NAME_SPACE::SeqEntry*>(d))
// We skip Shadow Groups, since nobody knows what they mean
&& !( d->GetGroup()%2 ) )
{
- if ( gdcm::BinEntry *b = dynamic_cast<gdcm::BinEntry*>(d) )
+ if ( GDCM_NAME_SPACE::DataEntry *de = dynamic_cast<GDCM_NAME_SPACE::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
{
- // We skip gdcm::SeqEntries
+ // We skip GDCM_NAME_SPACE::SeqEntries
}
}
- d = f1->GetNextEntry();
+ d = f->GetNextEntry();
}
// User wants to keep the Palette Color -if any-
std::cout << std::endl
<< "------------------------------------------------------------"
<< std::endl;
- delete f1;
- delete fh1;
- delete copy;
+
+ f->Delete();
+ fh->Delete();
+ copy->Delete();
exit (0);
}