X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=fb738bd28fd8d9418232cbc4563423534eefd31c;hb=bd7bec4c367d671a9da358584e98a8ec29bb641e;hp=9368a0742c3be0d0661acee2da855c97ef358b98;hpb=7477d623a779ea55a979eb4e3b9a98535b1bae7c;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 9368a074..fb738bd2 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2006/06/20 16:11:17 $ - Version: $Revision: 1.323 $ + Date: $Date: 2008/01/07 17:16:06 $ + Version: $Revision: 1.343 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -96,12 +96,13 @@ #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" #include "gdcmDataEntry.h" +#include "gdcmSQItem.h" #include #include //sscanf #include // for atoi -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- @@ -234,7 +235,7 @@ bool File::DoTheLoadingJob( ) // Change only made if usefull if ( PixelVR != oldEntry->GetVR() ) - { + { //DictEntry* newDict = DictEntry::New(GrPixel,NumPixel, // PixelVR,"1","Pixel Data"); //DataEntry *newEntry = DataEntry::New(newDict); @@ -246,7 +247,6 @@ bool File::DoTheLoadingJob( ) //RemoveEntry(oldEntry); //AddEntry(newEntry); //newEntry->Delete(); - } } */ @@ -470,6 +470,76 @@ int File::GetZSize() return 1; } +// Special case: +// ts["1.2.840.10008.5.1.4.1.1.4.1"] = "Enhanced MR Image Storage"; +bool File::GetSpacing(float &xspacing, float &yspacing, float &zspacing) +{ + xspacing = yspacing = zspacing = 1.0; + TS *ts = Global::GetTS(); + std::string sopclassuid_used; + // D 0002|0002 [UI] [Media Storage SOP Class UID] + + //const std::string &mediastoragesopclassuid_str = GetEntryValue(0x0002,0x0002); + const std::string &mediastoragesopclassuid_str = GetEntryString(0x0002,0x0002); + const std::string &mediastoragesopclassuid = ts->GetValue(mediastoragesopclassuid_str); + //D 0008|0016 [UI] [SOP Class UID] + const std::string &sopclassuid_str = GetEntryString(0x0008,0x0016); + const std::string &sopclassuid = ts->GetValue(sopclassuid_str); + if ( mediastoragesopclassuid == GDCM_UNFOUND && sopclassuid == GDCM_UNFOUND ) + { + return false; + } + else + { + if( mediastoragesopclassuid == sopclassuid ) + { + sopclassuid_used = mediastoragesopclassuid; + } + else + { + gdcmWarningMacro( "Inconsistant SOP Class UID: " + << mediastoragesopclassuid << " and " << sopclassuid ); + return false; + } + } + // ok we have now the correc SOP Class UID + if( sopclassuid_used == "Enhanced MR Image Storage" ) + { + SeqEntry *PerframeFunctionalGroupsSequence = GetSeqEntry(0x5200,0x9230); + unsigned int n = PerframeFunctionalGroupsSequence->GetNumberOfSQItems(); + if( !n ) return false; + SQItem *item1 = PerframeFunctionalGroupsSequence->GetFirstSQItem(); + DocEntry *p = item1->GetDocEntry(0x0028,0x9110); + if( !p ) return false; + SeqEntry *seq = dynamic_cast(p); + unsigned int n1 = seq->GetNumberOfSQItems(); + if( !n1 ) return false; + SQItem *item2 = seq->GetFirstSQItem(); + // D 0028|0030 [DS] [Pixel Spacing] [0.83333331346511\0.83333331346511 ] + DocEntry *p2 = item2->GetDocEntry(0x0028,0x0030); + if( !p2 ) return false; + DataEntry *entry = dynamic_cast(p2); + std::string spacing = entry->GetString(); + if ( sscanf( spacing.c_str(), "%f\\%f", &yspacing, &xspacing) != 2 ) + { + xspacing = yspacing = 1.; + return false; + } + // D 0018|0050 [DS] [Slice Thickness] [1 ] + DocEntry *p3 = item2->GetDocEntry(0x0018,0x0050); + if( !p3 ) return false; + DataEntry *entry2 = dynamic_cast(p3); + std::string thickness = entry2->GetString(); + if ( sscanf( thickness.c_str(), "%f", &zspacing) != 1 ) + { + zspacing = 1.; + return false; + } + return true; + } + return false; + } + /** * \brief Retrieve the -unnormalized- number of 'times' of '4D image'. * User has to tell gdcm the location of this '4th Dimension component' @@ -485,7 +555,7 @@ int File::GetTSize() DataEntry *entry = GetDataEntry(FourthDimensionLocation.GetGroup(), FourthDimensionLocation.GetElement() ); - if( !entry ) + if( !entry ) { gdcmWarningMacro( " FourthDimensionLocation not found at : " << std::hex << FourthDimensionLocation.GetGroup() @@ -496,7 +566,7 @@ int File::GetTSize() { return (int)entry->GetValue(0); } -} +} /** * \brief gets the info from 0018,1164 : ImagerPixelSpacing @@ -507,9 +577,18 @@ int File::GetTSize() float File::GetXSpacing() { float xspacing = 1.0; + float yspacing = 1.0; + float zspacing = 1.0; + uint32_t nbValue; DataEntry *entry; - bool ok = false; + bool ok = false; + if ( GetSpacing(xspacing,yspacing,zspacing) ) + { + return xspacing; + } + // else fallback + /* From:David Clunie - view profile Date:Wed, May 24 2006 1:12 pm @@ -604,7 +683,7 @@ and if( nbValue !=2 ) gdcmWarningMacro("ImagerPixelSpacing (0x0018,0x1164) " << "has a wrong number of values :" << nbValue); - + if( nbValue >= 3 ) xspacing = (float)entry->GetValue(2); else if( nbValue >= 2 ) @@ -628,7 +707,7 @@ and if( nbValue !=2 ) gdcmWarningMacro("PixelSpacing (0x0018,0x0030) " << "has a wrong number of values :" << nbValue); - + if( nbValue >= 3 ) xspacing = (float)entry->GetValue(2); else if( nbValue >= 2 ) @@ -655,11 +734,16 @@ and */ float File::GetYSpacing() { - float yspacing; + float xspacing = 1., yspacing = 1.0, zspacing = 1.; uint32_t nbValue; DataEntry *entry; bool ok = false; - + if ( GetSpacing(xspacing,yspacing,zspacing) ) + { + return yspacing; + } + // else fallback + std::string SOPClassUID = GetEntryString(0x0008,0x0016); /// \todo check the various SOP Class @@ -679,28 +763,38 @@ float File::GetYSpacing() // - check if SOPClassUID contains 2 parts (e.g. "4\3") // - no way to deduce the spacing/ - entry = GetDataEntry(0x0028,0x0034); + entry = GetDataEntry(0x0028,0x0034); if ( entry ) - { + { nbValue = entry->GetValueCount(); - if( nbValue !=2 ) { - gdcmWarningMacro("PixelAspectRatio (0x0028,0x0034) " - << "has a wrong number of values :" << nbValue); - } - yspacing = (float)entry->GetValue(0)/(float)entry->GetValue(1); - //std::cout << "ys " << yspacing << std::endl; - ok = true; + if( nbValue ==2 ) { + yspacing = (float)entry->GetValue(0)/(float)entry->GetValue(1); + //std::cout << "ys " << yspacing << std::endl; + ok = true; } + else + { + gdcmWarningMacro("PixelAspectRatio (0x0028,0x0034) " + << "has a wrong number of values :" << nbValue); + if (nbValue == 0 ) { + ok = false; + } + else if (nbValue == 1 ) { + yspacing = 1.0; // We get Pixel Aspect Ratio, not Spacing ... + ok = true; + } + } + } if (ok) - return yspacing; - } - + return yspacing; + } // go on with old method ... // --------------------- // To follow David Clunie's advice, we first check ImagerPixelSpacing yspacing = 1.0; + // To follow David Clunie's advice, we first check ImagerPixelSpacing entry = GetDataEntry(0x0018,0x1164); if( entry ) @@ -749,7 +843,13 @@ float File::GetYSpacing() float File::GetZSpacing() { - float zspacing = 1.0f; + float xspacing = 1.0; + float yspacing = 1.0; + float zspacing = 1.0; + if ( GetSpacing(xspacing,yspacing,zspacing) ) + { + return zspacing; + } // Spacing Between Slices : distance between the middle of 2 slices // Slices may be : @@ -762,8 +862,7 @@ float File::GetZSpacing() // we suppose slices joint together DataEntry *entry = GetDataEntry(0x0018,0x0088); if( entry ) - { - zspacing = (float)entry->GetValue(0); + { zspacing = (float)entry->GetValue(0); if ( zspacing == 0.0 ) zspacing = 1.0; @@ -987,6 +1086,122 @@ bool File::GetImageOrientationPatient( float iop[6] ) return false; } +/** + * \brief gets the cosine of image X axis, against patient X axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image X axis, against patient X axis + */ +float File::GetXCosineOnX() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[0]); +} + +/** + * \brief gets the cosine of image X axis, against patient Y axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image X axis, against patient Y axis + */ +float File::GetXCosineOnY() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[1]); +} + +/** + * \brief gets the cosine of image X axis, against patient Z axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image X axis, against patient Z axis + */ +float File::GetXCosineOnZ() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[2]); +} + +/** + * \brief gets the cosine of image Y axis, against patient X axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image Y axis, against patient X axis + */ +float File::GetYCosineOnX() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[3]); +} + +/** + * \brief gets the cosine of image Y axis, against patient Y axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image Y axis, against patient Y axis + */ +float File::GetYCosineOnY() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[4]); +} + +/** + * \brief gets the cosine of image Y axis, against patient Z axis + * (Sorry, but Python needs it :-( ) + * @return cosine of image Y axis, against patient Z axis + */ +float File::GetYCosineOnZ() +{ + float iop[6]; + GetImageOrientationPatient( iop ); + return(iop[5]); +} +/** + * \brief gets the info from 0020,0032 : Image Position Patient + * or from 0020 0030 : Image Position (RET) + * + * @param ipp adress of the (3)float array to receive values. + * (defaulted as 0.,0.,0. if nothing -or inconsistent stuff- + * is found. + * @return true when one of the tag -with consistent values- is found + * false when nothing or inconsistent stuff - is found + */ +bool File::GetImagePositionPatient( float ipp[3] ) +{ + std::string strImPosiPat; + //ipp is supposed to be float[3] + ipp[0] = ipp[1] = ipp[2] = 0.; + + // 0020 0032 DS REL Image Position (Patient) + strImPosiPat = GetEntryString(0x0020,0x0032); + if ( strImPosiPat != GDCM_UNFOUND ) + { + if ( sscanf( strImPosiPat.c_str(), "%f \\ %f \\%f ", + &ipp[0], &ipp[1], &ipp[2]) != 3 ) + { + gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)." + << " Less than 3 values were found." ); + return false; + } + return true; + } + //For ACR-NEMA + // 0020 0030 DS REL Image Position (RET) + else if ( (strImPosiPat = GetEntryString(0x0020,0x0030)) != GDCM_UNFOUND ) + { + if ( sscanf( strImPosiPat.c_str(), "%f \\ %f \\%f ", + &ipp[0], &ipp[1], &ipp[2]) != 3 ) + { + gdcmWarningMacro( "wrong Image Position Patient (0020,0030). " + << "Less than 3 values were found." ); + return false; + } + return true; + } + return false; +} + /** * \brief Retrieve the number of Bits Stored (actually used) * (as opposed to number of Bits Allocated) @@ -1127,21 +1342,29 @@ std::string File::GetPixelType() bitsAlloc = "16"; // default and arbitrary value, not to polute the output } - if ( bitsAlloc == "64" ) + else if ( bitsAlloc == "64" ) { return "FD"; } + // useless since we have to bypass a bug ( >8 && < 16) else if ( bitsAlloc == "12" ) { // It will be unpacked bitsAlloc = "16"; } + else if ( bitsAlloc == "24" ) { // (in order no to be messed up by old RGB images) bitsAlloc = "8"; } + int i= atoi(bitsAlloc.c_str()); // fix a bug in some headers + if ( i > 8 && i < 16 ) + { + bitsAlloc = "16"; + } + std::string sign; if( IsSignedPixelData() ) { @@ -1191,6 +1414,9 @@ bool File::IsMonochrome() { gdcmWarningMacro( "Photometric Interpretation (0028,0004) supposed to be " << "mandatory"); + // to deal with old ACR-NEMA images + if (GetNumberOfScalarComponents() == 1) + return true; } return false; } @@ -1227,6 +1453,13 @@ bool File::IsPaletteColor() { return true; } + + // MONOCHROME + [Enhanced CT Image Storage] actually have Palettes + std::string sopClassUid = GetEntryString( 0x0008, 0x0016 ); + if (Util::DicomStringEqual( sopClassUid, "1.2.840.10008.5.1.4.1.1.2.1")) + { + return true; + } if ( PhotometricInterp == GDCM_UNFOUND ) { gdcmDebugMacro( "Not found : Palette color (0028,0004)"); @@ -1241,7 +1474,7 @@ bool File::IsPaletteColor() */ bool File::IsYBRFull() { - std::string PhotometricInterp = GetEntryString( 0x0028, 0x0004 ); + std::string PhotometricInterp = GetEntryString( 0x0028, 0x0004 ); if ( PhotometricInterp == "YBR_FULL" ) { return true; @@ -1280,7 +1513,13 @@ bool File::HasLUT() return false; } // Red Palette Color Lookup Table Data - if ( !GetDocEntry(0x0028,0x1201) ) + bool segmented; + segmented = GetDocEntry(0x0028,0x1221) && + GetDocEntry(0x0028,0x1222) && + GetDocEntry(0x0028,0x1223); + if( segmented ) return true; + + if( !GetDocEntry(0x0028,0x1201) ) { return false; } @@ -1332,11 +1571,80 @@ int File::GetLUTNbits() return lutNbits; } +// Special case: +// ts["1.2.840.10008.5.1.4.1.1.4.1"] = "Enhanced MR Image Storage"; + bool File::GetRescaleSlopeIntercept(double &slope, double &intercept) + { + slope = 1.0; + intercept = 0.0; + TS *ts = Global::GetTS(); + std::string sopclassuid_used; + // D 0002|0002 [UI] [Media Storage SOP Class UID] + const std::string &mediastoragesopclassuid_str = GetEntryString(0x0002,0x0002); + const std::string &mediastoragesopclassuid = ts->GetValue(mediastoragesopclassuid_str); + //D 0008|0016 [UI] [SOP Class UID] + const std::string &sopclassuid_str = GetEntryString(0x0008,0x0016); + const std::string &sopclassuid = ts->GetValue(sopclassuid_str); + if ( mediastoragesopclassuid == GDCM_UNFOUND && sopclassuid == GDCM_UNFOUND ) + { + return false; + } + else + { + if( mediastoragesopclassuid == sopclassuid ) + { + sopclassuid_used = mediastoragesopclassuid; + } + else + { + gdcmWarningMacro( "Inconsistant SOP Class UID: " + << mediastoragesopclassuid << " and " << sopclassuid ); + return false; + } + } + // ok we have now the correc SOP Class UID + if( sopclassuid_used == "Enhanced MR Image Storage" ) + { + SeqEntry *PerframeFunctionalGroupsSequence = GetSeqEntry(0x5200,0x9230); + unsigned int n = PerframeFunctionalGroupsSequence->GetNumberOfSQItems(); + if( !n ) return false; + SQItem *item1 = PerframeFunctionalGroupsSequence->GetFirstSQItem(); + DocEntry *p = item1->GetDocEntry(0x0028,0x9145); + if( !p ) return false; + SeqEntry *seq = dynamic_cast(p); + unsigned int n1 = seq->GetNumberOfSQItems(); + if( !n1 ) return false; + SQItem *item2 = seq->GetFirstSQItem(); + // D 0028|1052 [DS] [Rescale Intercept] [0 ] + DocEntry *p2 = item2->GetDocEntry(0x0028,0x1052); + if( !p2 ) return false; + DataEntry *entry = dynamic_cast(p2); + std::string intercept_str = entry->GetString(); + if ( sscanf( intercept_str.c_str(), "%lf", &intercept) != 1 ) + { + intercept = 0.; + return false; + } + // D 0028|1053 [DS] [Rescale Slope] [5.65470085470085] + DocEntry *p3 = item2->GetDocEntry(0x0028,0x1053); + if( !p3 ) return false; + DataEntry *entry2 = dynamic_cast(p3); + std::string slope_str = entry2->GetString(); + if ( sscanf( slope_str.c_str(), "%lf", &slope) != 1 ) + { + slope = 1.; + return false; + } + return true; + } + return false; + } + /** *\brief gets the info from 0028,1052 : Rescale Intercept - * @return Rescale Intercept. defaulted to 0.0 is not found or empty + * @return Rescale Intercept. defaulted to 0.0 if not found or empty */ -float File::GetRescaleIntercept() +double File::GetRescaleIntercept() { // 0028 1052 DS IMG Rescale Intercept DataEntry *entry = GetDataEntry(0x0028, 0x1052); @@ -1351,18 +1659,28 @@ float File::GetRescaleIntercept() /** *\brief gets the info from 0028,1053 : Rescale Slope - * @return Rescale Slope. defaulted to 1.0 is not found or empty + * @return Rescale Slope. defaulted to 1.0 if not found or empty */ -float File::GetRescaleSlope() +double File::GetRescaleSlope() { - // 0028 1053 DS IMG Rescale Slope - DataEntry *entry = GetDataEntry(0x0028, 0x1053); - if( !entry ) - { - gdcmDebugMacro( "Missing Rescale Slope (0028,1053)"); - return 1.0f; + double resInter = 0.; + double resSlope = 1.; + if ( GetRescaleSlopeIntercept(resSlope, resInter) ) + { + return resSlope; + } + //0028 1053 DS IMG Rescale Slope + std::string strRescSlope = GetEntryString(0x0028,0x1053); + if ( strRescSlope != GDCM_UNFOUND ) + { + if ( sscanf( strRescSlope.c_str(), "%lf ", &resSlope) != 1 ) + { + // bug in the element 0x0028,0x1053 + gdcmWarningMacro( "Rescale Slope (0028,1053) is empty."); + } } - return (float)entry->GetValue(0); + + return resSlope; } /** @@ -1501,7 +1819,7 @@ void File::AnonymizeNoLoad() { std::fstream *fp = new std::fstream(Filename.c_str(), std::ios::in | std::ios::out | std::ios::binary); - gdcm::DocEntry *d; + GDCM_NAME_SPACE::DocEntry *d; uint32_t offset; uint32_t lgth; uint32_t valLgth = 0; @@ -1524,7 +1842,7 @@ void File::AnonymizeNoLoad() gdcmWarningMacro( "You cannot 'Anonymize' a SeqEntry "); continue; } - + valLgth = (*it).Value.size(); if (valLgth == 0) continue; @@ -1580,7 +1898,7 @@ bool File::AnonymizeFile() } else { - gdcm::DocEntry *d; + GDCM_NAME_SPACE::DocEntry *d; for (ListElements::iterator it = UserAnonymizeList.begin(); it != UserAnonymizeList.end(); ++it) @@ -1595,12 +1913,13 @@ bool File::AnonymizeFile() gdcmWarningMacro( "You cannot 'Anonymize' a SeqEntry "); continue; } - +/* if ( dynamic_cast(d) ) { gdcmWarningMacro( "To 'Anonymize' a DataEntry, better use AnonymizeNoLoad (FIXME) "); continue; } +*/ else SetEntryString ((*it).Value, (*it).Group, (*it).Elem); } @@ -1671,6 +1990,7 @@ bool File::AnonymizeFile() */ bool File::Write(std::string fileName, FileType writetype) { + gdcmDebugMacro(" File::Write "); std::ofstream *fp = new std::ofstream(fileName.c_str(), std::ios::out | std::ios::binary); if (*fp == NULL) @@ -1689,18 +2009,18 @@ bool File::Write(std::string fileName, FileType writetype) } /// \todo FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx - if( writetype != JPEG ) + if( writetype != JPEG && writetype != JPEG2000) { int i_lgPix = GetEntryLength(GrPixel, NumPixel); - if (i_lgPix != -2) + if (i_lgPix != -2) /// \todo wtf "-2" ?!? { // no (GrPixel, NumPixel) element std::string s_lgPix = Util::Format("%d", i_lgPix+12); s_lgPix = Util::DicomString( s_lgPix.c_str() ); - InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL"); + InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL"); } } - Document::WriteContent(fp, writetype); + Document::WriteContent(fp, writetype,false,false); fp->close(); delete fp; @@ -1716,7 +2036,7 @@ bool File::Write(std::string fileName, FileType writetype) // Private /** * \brief Parse pixel data from disk of [multi-]fragment RLE encoding. - * Compute the RLE extra information and store it in \ref RLEInfo + * Compute the RLE extra information and store it in RLEInfo * for later pixel retrieval usage. */ void File::ComputeRLEInfo() @@ -1828,7 +2148,7 @@ void File::ComputeRLEInfo() /** * \brief Parse pixel data from disk of [multi-]fragment Jpeg encoding. * Compute the jpeg extra information (fragment[s] offset[s] and - * length) and store it[them] in \ref JPEGInfo for later pixel + * length) and store it[them] in JPEGInfo for later pixel * retrieval usage. */ void File::ComputeJPEGFragmentInfo() @@ -1891,14 +2211,14 @@ void File::ComputeJPEGFragmentInfo() } /** - * \brief Assuming the internal file pointer \ref Document::Fp + * \brief Assuming the internal file pointer Document::Fp * 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 + * \warning On success the internal file pointer Document::Fp * is modified to point after the tag. * On failure (i.e. when the tag wasn't the expected tag * (TestGroup, TestElem) the internal file pointer - * \ref Document::Fp is restored to it's original position. + * Document::Fp is restored to its original position. * @param testGroup The expected group of the tag. * @param testElem The expected Element of the tag. * @return True on success, false otherwise. @@ -1919,8 +2239,9 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) } catch ( FormatError ) { - gdcmErrorMacro( "Can not read tag for " - << " We should have found tag (" + gdcmErrorMacro( "Can not read tag at 0x(" + << std::hex << positionOnEntry + << "). We should have found tag (" << DictEntry::TranslateToKey(testGroup,testElem) << ")" ) ; @@ -1936,7 +2257,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) << " but instead we encountered tag (" << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")" << " at address: " << " 0x(" << std::hex - << (unsigned int)positionOnEntry << std::dec << ")" + << (unsigned int)positionOnEntry << std::dec << ")" ) ; Fp->seekg(positionOnEntry, std::ios::beg); @@ -1946,14 +2267,14 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem) } /** - * \brief Assuming the internal file pointer \ref Document::Fp + * \brief Assuming the internal file pointer Document::Fp * is placed at the beginning of a tag (TestGroup, TestElement), * read the length associated to the Tag. - * \warning On success the internal file pointer \ref Document::Fp - * is modified to point after the tag and it's length. + * \warning On success the internal file pointer Document::Fp + * is modified to point after the tag and its length. * On failure (i.e. when the tag wasn't the expected tag * (TestGroup, TestElement) the internal file pointer - * \ref Document::Fp is restored to it's original position. + * Document::Fp is restored to its original position. * @param testGroup The expected Group of the tag. * @param testElem The expected Element of the tag. * @return On success returns the length associated to the tag. On failure @@ -1973,7 +2294,7 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElem) } //// Then read the associated Item Length - + // long currentPosition = Fp->tellg(); // save time // JPRx uint32_t itemLength = ReadInt32(); gdcmDebugMacro( "Basic Item Length is: " << itemLength @@ -1994,7 +2315,7 @@ void File::ReadEncapsulatedBasicOffsetTable() // When present, read the basic offset table itself. // Notes: - since the presence of this basic offset table is optional // we can't rely on it for the implementation, and we will simply - // trash it's content (when present). + // trash its content (when present). // - still, when present, we could add some further checks on the // lengths, but we won't bother with such fuses for the time being. if ( itemLength != 0 )