X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=9a3e9cf531243ac674e2e7b0b23a71a048e2c2ba;hb=934741ba56fd719a775e93cc93616c25b3d10901;hp=aa808aeb26e4d4e9bc5b78a7f3254e83cd23def5;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index aa808aeb..9a3e9cf5 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2004/06/23 03:36:24 $ - Version: $Revision: 1.168 $ + Date: $Date: 2004/06/23 09:30:22 $ + Version: $Revision: 1.169 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -41,14 +41,7 @@ gdcmHeader::gdcmHeader(std::string const & filename, bool enable_sequences, bool ignore_shadow): gdcmDocument(filename,exception_on_error,enable_sequences,ignore_shadow) -{ -/* - typedef struct { - guint32 totalSQlength; - guint32 alreadyParsedlength; - } pileElem; -*/ - +{ // for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010 // We may encounter the 'RETired' (0x0028, 0x0200) tag // (Image Location") . This Element contains the number of @@ -144,7 +137,7 @@ int gdcmHeader::GetXSize() { * \brief Retrieve the number of lines of image. * \warning The defaulted value is 1 as opposed to gdcmHeader::GetXSize() * @return The encountered size when found, 1 by default - * (The ACR-MEMA file contains a Signal, not an Image). + * (The ACR-NEMA file contains a Signal, not an Image). */ int gdcmHeader::GetYSize() { std::string StrSize = GetEntryByNumber(0x0028,0x0010); @@ -841,7 +834,7 @@ unsigned char * gdcmHeader::GetLUTRGBA() { // http://www.barre.nom.fr/medical/dicom2/limitations.html#Color%20Lookup%20Tables // if Photometric Interpretation # PALETTE COLOR, no LUT to be done - if (GetEntryByNumber(0x0028,0x0004) != "PALETTE COLOR ") { + if (GetEntryByNumber(0x0028,0x0004) != "PALETTE COLOR ") { return NULL; } int lengthR, debR, nbitsR; @@ -859,7 +852,7 @@ unsigned char * gdcmHeader::GetLUTRGBA() { std::string LutDescriptionB = GetEntryByNumber(0x0028,0x1103); if (LutDescriptionB == GDCM_UNFOUND) return NULL; - + std::vector tokens; tokens.erase(tokens.begin(),tokens.end()); // clean any previous value @@ -890,7 +883,7 @@ unsigned char * gdcmHeader::GetLUTRGBA() { GetEntryVoidAreaByNumber(0x0028,0x1202); unsigned char *lutB = (unsigned char *) GetEntryVoidAreaByNumber(0x0028,0x1203); - + if (!lutR || !lutG || !lutB ) { return NULL; }