Program: gdcm
Module: $RCSfile: gdcmSegmentedPalette.h,v $
Language: C++
- Date: $Date: 2007/10/03 09:22:45 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/10/27 17:34:16 $
+ Version: $Revision: 1.14 $
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>
-// Ref:
+#ifndef _GDCMSEGMENTEDPALETTE_H_
+#define _GDCMSEGMENTEDPALETTE_H_
+
+#include "gdcmFile.h"
+#include "gdcmTagKey.h"
+#include "gdcmDataEntry.h"
+
+// Notepad from Satomi Takeo:
// 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
+
+// MM: Over 50000 DICOM files I only found two that had a Segmented Palette LUT
+// And both were coming from a ALOKA SSD-4000 station
+//
+// JPRx :
+// It compiles fine under gcc 4.1.2 and msvc 7
+// It doesn't compile on msvc 6, borland and SunOS
+// Any fix welcome !
#include <assert.h>
#include <algorithm>
#include <vector>
#include <iterator>
-namespace {
+// Hack for VS6
+#if defined(_MSC_VER) && (_MSC_VER < 1310)
+#define GDCM_TYPENAME
+#else
+#define GDCM_TYPENAME typename
+#endif
+
+// Hack for Borland
+#if defined(__BORLANDC__)
+#define GDCM_TYPENAME2
+#else
+#define GDCM_TYPENAME2 typename
+#endif
+
+
+namespace GDCM_NAME_SPACE
+{
+// Long stody short: Sun compiler only provide the second interface of std::distance, since the implemenation
+// is so trivial, I'd rather redo it myself.
+// Ref:
+// http://www.sgi.com/tech/stl/distance.html#2
+// The second version of distance was the one defined in the original STL, and the first version is the one defined in the draft C++ standard; the definition was changed because the older interface was clumsy and error-prone. The older interface required the use of a temporary variable, and it has semantics that are somewhat nonintuitive: it increments n by the distance from first to last, rather than storing that distance in n
+ template<typename InputIterator>
+ inline int32_t
+ mydistance(InputIterator first, InputIterator last)
+ {
+ int32_t n = 0;
+ while (first != last)
+ {
+ ++first;
+ ++n;
+ }
+ return n;
+ }
+
// abstract class for segment.
template <typename EntryType>
class Segment {
const EntryType* First() const { return _first; }
const EntryType* Last() const { return _last; }
struct ToMap {
- std::pair<
- typename SegmentMap::key_type,
- typename SegmentMap::mapped_type
- >
+ typename SegmentMap::value_type
operator()(const Segment* segment) const
{ return std::make_pair(segment->First(), segment); }
};
= (*pOffset) | (static_cast<unsigned long>(*(pOffset + 1)) << 16);
const EntryType* copied_part_head
= first_segment + offsetBytes / sizeof(EntryType);
- typename SegmentMap::const_iterator ppHeadSeg = instances.find(copied_part_head);
+ GDCM_TYPENAME SegmentMap::const_iterator ppHeadSeg = instances.find(copied_part_head);
if ( ppHeadSeg == instances.end() ) {
// referred segment not found
return false;
}
EntryType nNumCopies = *(this->_first + 1);
- typename SegmentMap::const_iterator ppSeg = ppHeadSeg;
- while ( std::distance(ppHeadSeg, ppSeg) <nNumCopies ) {
+ GDCM_TYPENAME SegmentMap::const_iterator ppSeg = ppHeadSeg;
+ while ( mydistance(ppHeadSeg, ppSeg) < nNumCopies ) {
+ // assert( mydistance(ppHeadSeg, ppSeg) == std::distance(ppHeadSeg, ppSeg) );
assert( ppSeg != instances.end() );
ppSeg->second->Expand(instances, expanded);
++ppSeg;
typedef std::deque<Segment<EntryType>*> SegmentList;
SegmentList segments;
const EntryType* raw_seg = raw_values;
- while ( (std::distance(raw_values, raw_seg) * sizeof(EntryType)) <length ) {
+ while ( (mydistance(raw_values, raw_seg) * sizeof(EntryType)) < length ) {
+ // assert( mydistance(raw_values, raw_seg) == std::distance(raw_values, raw_seg) );
Segment<EntryType>* segment = NULL;
if ( *raw_seg == 0 ) {
segment = new DiscreteSegment<EntryType>(raw_seg);
// invalid opcode
break;
}
+
}
- typename Segment<EntryType>::SegmentMap instances;
+ GDCM_TYPENAME Segment<EntryType>::SegmentMap instances;
std::transform(segments.begin(), segments.end(),
- std::inserter(instances, instances.end()), typename Segment<EntryType>::ToMap());
- typename SegmentList::iterator ppSeg = segments.begin();
- typename SegmentList::iterator endOfSegments = segments.end();
+ std::inserter(instances, instances.end()), GDCM_TYPENAME2 Segment<EntryType>::ToMap());
+ GDCM_TYPENAME SegmentList::iterator ppSeg = segments.begin();
+ GDCM_TYPENAME SegmentList::iterator endOfSegments = segments.end();
for ( ; ppSeg != endOfSegments; ++ppSeg ) {
(*ppSeg)->Expand(instances, palette);
}
}
}
- void ReadPalette(GDCM_NAME_SPACE::File* pds, const GDCM_NAME_SPACE::TagKey& descriptor,
- const GDCM_NAME_SPACE::TagKey& segment)
+ 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] = {0,0,0};
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;
GDCM_NAME_SPACE::DataEntry* pe = NULL;
- pe = pds->GetDataEntry(segment.GetGroup(), segment.GetElement() ); {
+ pe = pds->GetDataEntry(segment.GetGroup(), segment.GetElement() );
+ {
//if ( pds->findAndGetElement(segment, pe).good() )
unsigned long length = pe->GetLength();
- if ( entry_size == 8 ) {
+ if ( entry_size == 8 )
+ {
uint8_t* segment_values = NULL;
//if ( pe->getUint8Array(segment_values).good() )
- segment_values = (uint8_t*)pe->GetBinArea(); {
+ segment_values = (uint8_t*)pe->GetBinArea();
+ {
std::vector<uint8_t> palette;
palette.reserve(num_entries);
ExpandPalette(segment_values, length, palette);
- }
- } else if ( entry_size == 16 ) {
+ memcpy(lut, &palette[0], palette.size() );
+ }
+ }
+ else if ( entry_size == 16 )
+ {
uint16_t* segment_values = NULL;
- segment_values = (uint16_t*)pe->GetBinArea(); {
+ segment_values = (uint16_t*)pe->GetBinArea();
+ {
//if ( pe->getUint16Array(segment_values).good() )
std::vector<uint16_t> palette;
palette.reserve(num_entries);
ExpandPalette(segment_values, length, palette);
-// std::copy(palette.begin(), palette.end(),
-// std::ostream_iterator<uint16_t>(std::cout, "\n"));
+ memcpy(lut, &palette[0], palette.size()*2 );
+ }
}
}
}
- }
}
-} // end namespace
+} // end namespace gdcm
+
+// do not pollute namespace:
+#undef GDCM_TYPENAME
+#endif