X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=ef4814503b16b88530e0f8f05b890d40f892a784;hb=172de96c736e43ee4cbd8ac6ffc499f9d683fba3;hp=b26c57d831b59495ceb2d1c672dbccbe757b29c4;hpb=2bfcd91b06ec416462da3f080917576cc8793c18;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index b26c57d8..ef481450 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2005/10/23 15:26:43 $ - Version: $Revision: 1.289 $ + Date: $Date: 2005/10/27 09:52:33 $ + Version: $Revision: 1.298 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -233,7 +233,7 @@ bool File::DoTheLoadingJob( ) DictEntry* newDict = DictEntry::New(GrPixel,NumPixel, PixelVR,"1","Pixel Data"); - DataEntry *newEntry = new DataEntry(newDict); + DataEntry *newEntry = DataEntry::New(newDict); newDict->Delete(); newEntry->Copy(entry); newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea()); @@ -241,6 +241,7 @@ bool File::DoTheLoadingJob( ) RemoveEntry(oldEntry); AddEntry(newEntry); + newEntry->Delete(); } } } @@ -490,7 +491,7 @@ float File::GetXSpacing() nbValue = entry->GetValueCount(); if( nbValue >= 3 ) xspacing = (float)entry->GetValue(2); - if( nbValue >= 2 ) + else if( nbValue >= 2 ) xspacing = (float)entry->GetValue(1); else xspacing = (float)entry->GetValue(0); @@ -630,7 +631,10 @@ float File::GetXOrigin() if( entry->GetValueCount() == 3 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); } return 0.0f; @@ -658,7 +662,10 @@ float File::GetYOrigin() if( entry->GetValueCount() == 3 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(1); } return 0.0f; @@ -679,7 +686,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 3 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(2); } gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)"); @@ -691,7 +701,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 3 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(2); } gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)"); @@ -704,7 +717,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 1 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); // VM=1 ! } gdcmWarningMacro( "Wrong Slice Location (0020,1041)"); @@ -716,7 +732,10 @@ float File::GetZOrigin() { if( entry->GetValueCount() == 1 ) { - gdcmAssertMacro( entry->IsValueCountValid() ); + if (!entry->IsValueCountValid() ) + { + gdcmErrorMacro( "Invalid Value Count" ); + } return (float)entry->GetValue(0); } gdcmWarningMacro( "Wrong Location (0020,0050)"); @@ -844,7 +863,6 @@ int File::GetPlanarConfiguration() DataEntry *entry = GetDataEntry(0x0028,0x0006); if( !entry ) { - gdcmWarningMacro( "Not found : Planar Configuration (0028,0006)"); return 0; } return (int)entry->GetValue(0); @@ -1455,10 +1473,10 @@ bool File::Write(std::string fileName, FileType writetype) // Derma?.dcm does not have it...let's remove it FIXME FIXME if( writetype != JPEG ) - { + { int i_lgPix = GetEntryLength(GrPixel, NumPixel); if (i_lgPix != -2) - { + { // no (GrPixel, NumPixel) element std::string s_lgPix = Util::Format("%d", i_lgPix+12); s_lgPix = Util::DicomString( s_lgPix.c_str() ); @@ -1658,7 +1676,7 @@ void File::ComputeJPEGFragmentInfo() /** * \brief Assuming the internal file pointer \ref Document::Fp - * is placed at the beginning of a tag check whether this + * is placed at the beginning of a tag, check whether this * tag is (TestGroup, TestElem). * \warning On success the internal file pointer \ref Document::Fp * is modified to point after the tag. @@ -1693,15 +1711,17 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) return false; } if ( itemTagGroup != testGroup || itemTagElem != testElem ) - { - gdcmErrorMacro( "Wrong Item Tag found:" - << " We should have found tag (" - << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl - << " but instead we encountered tag (" - << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")" - << " at address: " << " 0x(" << std::hex - << (unsigned int)currentPosition << std::dec << ")" - ) ; + { + // in order not to pollute output we don't warn on 'delimitors' + if (itemTagGroup != 0xfffe || testGroup != 0xfffe ) + gdcmErrorMacro( "Wrong Item Tag found:" + << " We should have found tag (" + << DictEntry::TranslateToKey(testGroup,testElem) << ")" << std::endl + << " but instead we encountered tag (" + << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")" + << " at address: " << " 0x(" << std::hex + << (unsigned int)currentPosition << std::dec << ")" + ) ; Fp->seekg(positionOnEntry, std::ios::beg); return false; @@ -1728,7 +1748,9 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElem) if ( !ReadTag(testGroup, testElem) ) { - gdcmErrorMacro( "ReadTag did not succeed for (" + // Avoid polutting output + if ( testGroup != 0xfffe ) + gdcmErrorMacro( "ReadTag did not succeed for (" << DictEntry::TranslateToKey(testGroup,testElem) << ")..." ); return 0; @@ -1785,21 +1807,6 @@ void File::ReadEncapsulatedBasicOffsetTable() // These are the deprecated method that one day should be removed (after the next release) #ifndef GDCM_LEGACY_REMOVE -/* - * brief Constructor (DEPRECATED : temporaryly kept not to break the API) - * param filename name of the file whose header we want to analyze - * deprecated do not use any longer - */ -File::File( std::string const &filename ) - :Document( ) -{ - RLEInfo = new RLEFramesInfo; - JPEGInfo = new JPEGFragmentsInfo; - - SetFileName( filename ); - Load( ); // gdcm::Document is first Loaded, then the 'File part' -} - /* * \ brief Loader. (DEPRECATED : temporaryly kept not to break the API) * @ param fileName file to be open for parsing