Program: gdcm
Module: $RCSfile: gdcmSegmentedPalette.h,v $
Language: C++
- Date: $Date: 2007/10/03 09:31:16 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/10/03 12:02:55 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
-#include <gdcm.h>
+#ifndef _GDCMSEGMENTEDPALETTE_H_
+#define _GDCMSEGMENTEDPALETTE_H_
+
+#include "gdcmFile.h"
+#include "gdcmTagKey.h"
+#include "gdcmDataEntry.h"
+
// Ref:
// http://blog.goo.ne.jp/satomi_takeo/e/3643e5249b2a9650f9e10ef1c830e8b8
// I bet the code was compiled on VS6. Make it compile on other platform:
// * typedef are not inherited
// * need to explicitely add typename keyword
// * Uint8 / Uint16 are neither C nor C++
-// * replace all dcmtk code with identical gdcm code
+// * replace all dcmtk code with equivalent gdcm code
+// * Add extra parameter to ReadPaletteInto to save extracted info
#include <assert.h>
#include <algorithm>
#include <vector>
#include <iterator>
-namespace {
+namespace GDCM_NAME_SPACE
+{
// abstract class for segment.
template <typename EntryType>
class Segment {
}
EntryType nNumCopies = *(this->_first + 1);
typename SegmentMap::const_iterator ppSeg = ppHeadSeg;
- while ( std::distance(ppHeadSeg, ppSeg) <nNumCopies ) {
+ while ( std::distance(ppHeadSeg, ppSeg) < nNumCopies ) {
assert( ppSeg != instances.end() );
ppSeg->second->Expand(instances, expanded);
++ppSeg;
void ReadPaletteInto(GDCM_NAME_SPACE::File* pds, const GDCM_NAME_SPACE::TagKey& descriptor,
const GDCM_NAME_SPACE::TagKey& segment, uint8_t* lut)
{
- int desc_values[3] = {};
+ unsigned int desc_values[3] = {};
unsigned long count = 0;
//if ( pds->findAndGetUint16Array(descriptor, desc_values, &count).good() )
std::string desc_values_str = pds->GetEntryString(descriptor.GetGroup(), descriptor.GetElement() );
- count = sscanf( desc_values_str.c_str(), "%d\\%d\\%d", desc_values, desc_values+1, desc_values+2 );
+ count = sscanf( desc_values_str.c_str(), "%u\\%u\\%u", desc_values, desc_values+1, desc_values+2 );
{
assert( count == 3 );
unsigned int num_entries = desc_values[0];
if ( num_entries == 0 ) {
num_entries = 0x10000;
}
- int min_pixel_value = desc_values[1];
+ unsigned int min_pixel_value = desc_values[1];
+ assert( min_pixel_value == 0 ); // FIXME
unsigned int entry_size = desc_values[2];
assert( entry_size == 8 || entry_size == 16 );
//DcmElement* pe = NULL;
std::vector<uint16_t> palette;
palette.reserve(num_entries);
ExpandPalette(segment_values, length, palette);
- memcpy(lut, &palette[0], palette.size() );
+ memcpy(lut, &palette[0], palette.size()*2 );
// std::copy(palette.begin(), palette.end(),
// std::ostream_iterator<uint16_t>(std::cout, "\n"));
}
}
}
-} // end namespace
+} // end namespace gdcm
+#endif