X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSegmentedPalette.h;h=1a53fa745138d9a1fed40664b61a0f49f156a7b0;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=2f2c57c99d9045c92f2eb58e03898207ba52c38c;hpb=add6c88b334e9cf4ddb0ae1849f1380f9844f99c;p=gdcm.git diff --git a/src/gdcmSegmentedPalette.h b/src/gdcmSegmentedPalette.h index 2f2c57c9..1a53fa74 100644 --- a/src/gdcmSegmentedPalette.h +++ b/src/gdcmSegmentedPalette.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSegmentedPalette.h,v $ Language: C++ - Date: $Date: 2007/10/08 15:20:17 $ - Version: $Revision: 1.9 $ + Date: $Date: 2007/11/13 09:37:22 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,7 +23,7 @@ #include "gdcmTagKey.h" #include "gdcmDataEntry.h" -// Ref: +// 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 @@ -34,6 +34,12 @@ // 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, msvc 7 and DarwinG5-g++ +// It doesn't compile on msvc 6, borland and SunOS +// Any fix welcome ! + #include #include #include @@ -43,27 +49,55 @@ // Hack for VS6 #if defined(_MSC_VER) && (_MSC_VER < 1310) -#define GDCM_TYPENAME class +#define GDCM_TYPENAME #else #define GDCM_TYPENAME typename #endif +// Hack for Borland +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) || 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 implementation 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 + inline int32_t + mydistance(InputIterator first, InputIterator last) + { + int32_t n = 0; + while (first != last) + { + ++first; + ++n; + } + return n; + } + // abstract class for segment. - template + template class Segment { public: - typedef std::map SegmentMap; + typedef std::map SegmentMap; virtual bool Expand(const SegmentMap& instances, std::vector& expanded) const = 0; const EntryType* First() const { return _first; } - const EntryType* Last() const { return _last; } + 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); } }; @@ -76,10 +110,12 @@ namespace GDCM_NAME_SPACE }; // discrete segment (opcode = 0) - template + template class DiscreteSegment : public Segment { public: +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; +#endif DiscreteSegment(const EntryType* first) : Segment(first, first+2+*(first+1)) {} virtual bool Expand(const SegmentMap&, @@ -91,10 +127,12 @@ namespace GDCM_NAME_SPACE }; // linear segment (opcode = 1) - template + template class LinearSegment : public Segment { public: +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; +#endif LinearSegment(const EntryType* first) : Segment(first, first+3) {} virtual bool Expand(const SegmentMap&, @@ -120,10 +158,12 @@ namespace GDCM_NAME_SPACE }; // indirect segment (opcode = 2) - template + template class IndirectSegment : public Segment { public: +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; +#endif IndirectSegment(const EntryType* first) : Segment(first, first+2+4/sizeof(EntryType)) {} virtual bool Expand(const SegmentMap& instances, @@ -140,14 +180,15 @@ namespace GDCM_NAME_SPACE = (*pOffset) | (static_cast(*(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; @@ -156,14 +197,15 @@ namespace GDCM_NAME_SPACE } }; - template + template void ExpandPalette(const EntryType* raw_values, uint32_t length, std::vector& palette) { typedef std::deque*> SegmentList; SegmentList segments; const EntryType* raw_seg = raw_values; - while ( (std::distance(raw_values, raw_seg) * sizeof(EntryType)) * segment = NULL; if ( *raw_seg == 0 ) { segment = new DiscreteSegment(raw_seg); @@ -179,12 +221,13 @@ namespace GDCM_NAME_SPACE // invalid opcode break; } + } - typename Segment::SegmentMap instances; + GDCM_TYPENAME Segment::SegmentMap instances; std::transform(segments.begin(), segments.end(), - std::inserter(instances, instances.end()), typename Segment::ToMap()); - typename SegmentList::iterator ppSeg = segments.begin(); - typename SegmentList::iterator endOfSegments = segments.end(); + std::inserter(instances, instances.end()), GDCM_TYPENAME2 Segment::ToMap()); + GDCM_TYPENAME SegmentList::iterator ppSeg = segments.begin(); + GDCM_TYPENAME SegmentList::iterator endOfSegments = segments.end(); for ( ; ppSeg != endOfSegments; ++ppSeg ) { (*ppSeg)->Expand(instances, palette); } @@ -197,7 +240,7 @@ namespace GDCM_NAME_SPACE void ReadPaletteInto(GDCM_NAME_SPACE::File* pds, const GDCM_NAME_SPACE::TagKey& descriptor, const GDCM_NAME_SPACE::TagKey& segment, uint8_t* lut) { - unsigned 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() );