X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=cab302f3e8423f5ca5cdd296225cd9f2d3165958;hb=3eff461b8ad6c34c5d4a9fa6b4ce1eca87daf550;hp=bc79a67529d62409f16936ade3ec814f1ecbcae5;hpb=0855225b6696582988c4b13ec472c627b4f7a810;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index bc79a675..cab302f3 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmHeader.cxx,v $ Language: C++ - Date: $Date: 2005/01/11 20:49:44 $ - Version: $Revision: 1.230 $ + Date: $Date: 2005/01/14 15:06:37 $ + Version: $Revision: 1.232 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -196,11 +196,12 @@ bool Header::Write(std::string fileName, FileType filetype) } } +/* #ifdef GDCM_WORDS_BIGENDIAN - // Super Duper hack that will make gdcm a BOMB ! but should + // Super Super hack that will make gdcm a BOMB ! but should // Fix temporarily the dashboard - BinEntry *b = GetBinEntry(0x7fe0,0x0010); - if ( GetEntry(0x0028,0x0100) == "16") + BinEntry *b = GetBinEntry(GrPixel,NumPixel); + if ( GetPixelSize() == 16 ) { uint16_t *im16 = (uint16_t*)b->GetBinArea(); int lgr = b->GetLength(); @@ -210,12 +211,14 @@ bool Header::Write(std::string fileName, FileType filetype) } } #endif //GDCM_WORDS_BIGENDIAN +*/ Document::WriteContent(fp,filetype); +/* #ifdef GDCM_WORDS_BIGENDIAN // Flip back the pixel ... I told you this is a hack - if ( GetEntry(0x0028,0x0100) == "16") + if ( GetPixelSize() == 16 ) { uint16_t *im16 = (uint16_t*)b->GetBinArea(); int lgr = b->GetLength(); @@ -225,6 +228,7 @@ bool Header::Write(std::string fileName, FileType filetype) } } #endif //GDCM_WORDS_BIGENDIAN +*/ fp->close(); delete fp; @@ -1193,39 +1197,6 @@ int Header::GetLUTNbits() return lutNbits; } -/** - * \brief Accesses the info from 0002,0010 : Transfer Syntax and TS - * else 1. - * @return The full Transfer Syntax Name (as opposed to Transfer Syntax UID) - */ -std::string Header::GetTransferSyntaxName() -{ - // use the TS (TS : Transfer Syntax) - std::string transferSyntax = GetEntry(0x0002,0x0010); - - if ( transferSyntax == GDCM_NOTLOADED ) - { - gdcmVerboseMacro( "Transfer Syntax not loaded. " << std::endl - << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE" ); - return "Uncompressed ACR-NEMA"; - } - if ( transferSyntax == GDCM_UNFOUND ) - { - gdcmVerboseMacro( "Unfound Transfer Syntax (0002,0010)"); - return "Uncompressed ACR-NEMA"; - } - - while ( ! isdigit((unsigned char)transferSyntax[transferSyntax.length()-1]) ) - { - transferSyntax.erase(transferSyntax.length()-1, 1); - } - // we do it only when we need it - TS* ts = Global::GetTS(); - std::string tsName = ts->GetValue( transferSyntax ); - - //delete ts; /// \todo Seg Fault when deleted ?! - return tsName; -} //----------------------------------------------------------------------------- // Protected