Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/11/09 10:18:44 $
- Version: $Revision: 1.303 $
+ Date: $Date: 2007/04/12 13:22:49 $
+ Version: $Revision: 1.329 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdio.h> //sscanf
#include <stdlib.h> // for atoi
-namespace gdcm
+namespace gdcm
{
//-----------------------------------------------------------------------------
GrPixel = 0x7fe0; // to avoid further troubles
NumPixel = 0x0010;
BasicOffsetTableItemValue = 0;
+ FourthDimensionLocation = TagKey(0,0);
}
/**
* \brief Canonical destructor.
*/
-File::~File ()
+File::~File()
{
if ( RLEInfo )
delete RLEInfo;
* @return false if file cannot be open or no swap info was found,
* or no tag was found.
*/
+
bool File::Load( )
{
if ( ! this->Document::Load( ) )
*/
bool File::DoTheLoadingJob( )
{
-
// for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010
// We may encounter the 'RETired' (0x0028, 0x0200) tag
// (Image Location") . This entry contains the number of
}
else
{
+
GrPixel = (uint16_t) atoi( imgLocation.c_str() );
}
// The changed DictEntry will have
// - a correct PixelVR OB or OW)
// - the name to "Pixel Data"
+
+ //==>Take it easy!
+ //==> Just change the VR !
+
+/*
DataEntry *oldEntry = dynamic_cast<DataEntry *>(entry);
if (oldEntry)
{
// Change only made if usefull
if ( PixelVR != oldEntry->GetVR() )
- {
- DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
- PixelVR,"1","Pixel Data");
-
- DataEntry *newEntry = DataEntry::New(newDict);
- newDict->Delete();
- newEntry->Copy(entry);
- newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
- oldEntry->SetSelfArea(false);
-
- RemoveEntry(oldEntry);
- AddEntry(newEntry);
- newEntry->Delete();
+ {
+ //DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
+ // PixelVR,"1","Pixel Data");
+ //DataEntry *newEntry = DataEntry::New(newDict);
+ //newDict->Delete();
+ //newEntry->Copy(entry);
+ //newEntry->SetBinArea(oldEntry->GetBinArea(),oldEntry->IsSelfArea());
+ //oldEntry->SetSelfArea(false);
+
+ //RemoveEntry(oldEntry);
+ //AddEntry(newEntry);
+ //newEntry->Delete();
+
}
}
+*/
+ VRKey PixelVR;
+ // 8 bits allocated is a 'OB(ytes)' , as well as 24 (old ACR-NEMA RGB)
+ // more than 8 (i.e 12, 16) is a 'OW(ords)'
+ if ( GetBitsAllocated() == 8 || GetBitsAllocated() == 24 )
+ PixelVR = "OB";
+ else
+ PixelVR = "OW";
+ // Change only made if usefull
+ if ( PixelVR != entry->GetVR() )
+ {
+ entry->SetVR(PixelVR);
+ }
}
return true;
}
+
/**
* \brief This predicate, based on hopefully reasonable heuristics,
* decides whether or not the current File was properly parsed
return 1;
}
+/**
+ * \brief Retrieve the -unnormalized- number of 'times' of '4D image'.
+ * User has to tell gdcm the location of this '4th Dimension component'
+ * using SetFourthDimensionLocation() method before.
+ * \warning The defaulted value is 1.
+ * @return The encountered size when found, 1 by default
+ * (The file doesn't contain a '4D image'.).
+ */
+int File::GetTSize()
+{
+ if (FourthDimensionLocation == TagKey(0,0) )// 4D location is not set : not a 4D object
+ return 1;
+
+ DataEntry *entry = GetDataEntry(FourthDimensionLocation.GetGroup(),
+ FourthDimensionLocation.GetElement() );
+ if( !entry )
+ {
+ gdcmWarningMacro( " FourthDimensionLocation not found at : " <<
+ std::hex << FourthDimensionLocation.GetGroup()
+ << "|" << FourthDimensionLocation.GetElement());
+ return 1;
+ }
+ else
+ {
+ return (int)entry->GetValue(0);
+ }
+}
+
/**
* \brief gets the info from 0018,1164 : ImagerPixelSpacing
* then 0028,0030 : Pixel Spacing
{
float xspacing = 1.0;
uint32_t nbValue;
+ DataEntry *entry;
+ bool ok = false;
+/*
+From:David Clunie - view profile
+Date:Wed, May 24 2006 1:12 pm
+Email:David Clunie <dclu...@dclunie.com>
+Groups:comp.protocols.dicom
+
+The short answer is that:
+
+- (0018,1164) describes a spacing equivalent to that which
+ would be measured off a film in projection radiography
+
+- (0018,7022) does not describe the image pixels themselves,
+ since detector elements may have been binned to produce
+ pixels
+- (0018,7020) may be different from (0018,7022) since there
+ may be non-sensitive material separating individual
+ detectors (i.e. the size is smaller than the spacing
+ between centers)
+
+Only (0018,1164) is relevant when measuring things; the
+detector-specific attributes are there to describe the
+acquisition.
+
+David
+
+PS. For ultrasound you need to use Region Calibration.
+*/
+
+/*
+It *SHOULD* first find the IOD and then deduce which tags to read
+Eg: Cross section this is in Pixel Spacing (0028,0030)
+CR is in Imager Pixel Spacing (0018,1164)
+US is in Pixel Aspect Ratio (0028,0034)
+RT is in :
+(3002,0011) Image Plane Pixel Spacing
+(3002,0012) RT Image Position
+and
+(3004,000c) for deducing Z spacing
+*/
+
+ std::string SOPClassUID = GetEntryString(0x0008,0x0016);
+
+ /// \todo check the various SOP Class
+ /// to get the Pixel Spacing at the proper location
+
+ ///\todo find images to check if it *actually* works
+
+ if (Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.6")
+ // Ultrasound Image Storage (Retired)
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.6.1")
+ // Ultrasound Image Storage
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.3")
+ // Ultrasound Multi-Frame Storage (Retired)
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.3.1") )
+ // Ultrasound Multi-FrameImage Storage
+ {
+ // - check if SOPClassUID contains 2 parts (e.g. "4\3")
+ // - guess how to deduce the spacing (FOV ?, ??)
+
+ entry = GetDataEntry(0x0028,0x0034);
+ if ( entry )
+ {
+ nbValue = entry->GetValueCount();
+ if( nbValue !=2 ) {
+ gdcmWarningMacro("PixelAspectRatio (0x0028,0x0034) "
+ << "has a wrong number of values :" << nbValue);
+ }
+ xspacing = 1.0; // We get Pixel Aspect Ratio, not Spacing ...
+ ok = true;
+ }
+
+ if (ok)
+ return xspacing;
+ }
+/*
+ if (Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.1") )
+ // Computed Radiography Image Storage
+
+ // CR is in Imager Pixel Spacing (0018,1164)//
+
+*/
+ // go on with old method ...
+ // ---------------------
// To follow David Clunie's advice, we first check ImagerPixelSpacing
- DataEntry *entry = GetDataEntry(0x0018,0x1164);
+ entry = GetDataEntry(0x0018,0x1164);
if( entry )
{
nbValue = entry->GetValueCount();
{
gdcmWarningMacro( "Unfound Pixel Spacing (0028,0030)" );
}
-
return xspacing;
}
*/
float File::GetYSpacing()
{
- float yspacing = 1.0;
+ float yspacing;
+ uint32_t nbValue;
+ DataEntry *entry;
+ bool ok = false;
+
+ std::string SOPClassUID = GetEntryString(0x0008,0x0016);
+
+ /// \todo check the various SOP Class
+ /// to get the Pixel Spacing at the proper location
+
+ ///\todo find images to check if it *actually* works
+
+ if (Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.6")
+ // Ultrasound Image Storage (Retired)
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.6.1")
+ // Ultrasound Image Storage
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.3")
+ // Ultrasound Multi-Frame Storage (Retired)
+ || Util::DicomStringEqual( SOPClassUID,"1.2.840.10008.5.1.4.1.1.3.1") )
+ // Ultrasound Multi-FrameImage Storage
+ {
+ // - check if SOPClassUID contains 2 parts (e.g. "4\3")
+ // - no way to deduce the spacing/
+
+ entry = GetDataEntry(0x0028,0x0034);
+ if ( entry )
+ {
+ nbValue = entry->GetValueCount();
+ 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;
+ }
+
+ // 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
- DataEntry *entry = GetDataEntry(0x0018,0x1164);
+ entry = GetDataEntry(0x0018,0x1164);
if( entry )
{
yspacing = (float)entry->GetValue(0);
* \brief gets the info from 0018,0088 : Space Between Slices
* else from 0018,0050 : Slice Thickness
* else 1.0
+ *
+ * When an element is missing, we suppose slices join together
+ * (no overlapping, no interslice gap) but we have no way to check it !
+ * For *Dicom* images, ZSpacing *should be* calculated using
+ * XOrigin, YOrigin, ZOrigin (of the top left image corner)
+ * of 2 consecutive images, and the Orientation
+ * Computing ZSpacing on a single image is not really meaningfull !
* @return Z dimension of a voxel-to be
*/
float File::GetZSpacing()
{
- // --->
- // ---> Warning :
- // --->
- // For *Dicom* images, ZSpacing should be calculated using
- // XOrigin, YOrigin, ZOrigin (of the top left image corner)
- // of 2 consecutive images, and the Orientation
- //
- // Computing ZSpacing on a single image is not really meaningfull !
float zspacing = 1.0f;
// 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;
// if no 'Spacing Between Slices' is found,
// we assume slices join together
// (no overlapping, no interslice gap)
- // if they don't, we're fucked up
entry = GetDataEntry(0x0018,0x0050);
if( entry )
{
else
gdcmWarningMacro("Unfound Slice Thickness (0018,0050)");
+ // if no 'Spacing Between Slices' is found,
+ // we assume slices join together
+ // (no overlapping, no interslice gap)
+ entry = GetDataEntry(0x3004,0x000c);
+ if( entry )
+ {
+ float z1 = (float)entry->GetValue(0);
+ float z2 = (float)entry->GetValue(1);
+ zspacing = z2 - z1; // can be negative...
+
+ if ( zspacing == 0.0 )
+ zspacing = 1.0;
+ return zspacing;
+ }
+
return zspacing;
}
/**
* \brief gets the info from 0020,0037 : Image Orientation Patient
* or from 0020 0035 : Image Orientation (RET)
+ *
* (needed to organize DICOM files based on their x,y,z position)
- * @param iop adress of the (6)float array to receive values
- * @return true when one of the tag is found
- * false when nothing is found
+ *
+ * @param iop adress of the (6)float array to receive values.
+ * (defaulted as 1.,0.,0.,0.,1.,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::GetImageOrientationPatient( float iop[6] )
{
std::string strImOriPat;
//iop is supposed to be float[6]
- iop[0] = iop[1] = iop[2] = iop[3] = iop[4] = iop[5] = 0.;
+ iop[0] = iop[4] = 1.;
+ iop[1] = iop[2] = iop[3] = iop[5] = 0.;
// 0020 0037 DS REL Image Orientation (Patient)
if ( (strImOriPat = GetEntryString(0x0020,0x0037)) != GDCM_UNFOUND )
<< " Less than 6 values were found." );
return false;
}
+ return true;
}
//For ACR-NEMA
// 0020 0035 DS REL Image Orientation (RET)
<< "Less than 6 values were found." );
return false;
}
+ return true;
}
- return true;
+ 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;
}
/**
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() )
{
/**
*\brief gets the info from 0028,1052 : Rescale Intercept
- * @return Rescale Intercept
+ * @return Rescale Intercept. defaulted to 0.0 is not found or empty
*/
float File::GetRescaleIntercept()
{
/**
*\brief gets the info from 0028,1053 : Rescale Slope
- * @return Rescale Slope
+ * @return Rescale Slope. defaulted to 1.0 is not found or empty
*/
float File::GetRescaleSlope()
{
/**
* \brief This function is intended to user who doesn't want
* to have to manage a LUT and expects to get an RBG Pixel image
- * (or a monochrome one ...)
+ * (or a monochrome one, if no LUT found ...)
* \warning to be used with GetImagePixels()
* @return 1 if Gray level, 3 if Color (RGB, YBR, *or PALETTE COLOR*)
*/
it != UserAnonymizeList.end();
++it)
{
+
+ //std::cout << "File::AnonymizeNoLoad -------" << std::hex <<(*it).Group <<"|"<<
+ // (*it).Elem
+ // << "[" << (*it).Value << "] "<< std::dec << std::endl;
d = GetDocEntry( (*it).Group, (*it).Elem);
if ( d == NULL)
gdcmWarningMacro( "You cannot 'Anonymize' a SeqEntry ");
continue;
}
+
+ valLgth = (*it).Value.size();
+ if (valLgth == 0)
+ continue;
offset = d->GetOffset();
lgth = d->GetLength();
+
+ //std::cout << "lgth " << lgth << " valLgth " << valLgth << std::endl;
if (valLgth < lgth)
{
spaces = new std::string( lgth-valLgth, ' ');
(*it).Value = (*it).Value + *spaces;
+ //std::cout << "[" << (*it).Value << "] " << lgth << std::endl;
delete spaces;
}
fp->seekp( offset, std::ios::beg );
e0000->SetString(sLen.str());
}
- // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
+ /// \todo FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
if( writetype != JPEG )
{
int i_lgPix = GetEntryLength(GrPixel, NumPixel);
// 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);
+ InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL");
}
}
Document::WriteContent(fp, writetype);
// Offset Table information on fragments of this current Frame.
// Note that the fragment pixels themselves are not loaded
// (but just skipped).
- long frameOffset = Fp->tellg();
+ long frameOffset = Fp->tellg(); // once per fragment
uint32_t nbRleSegments = ReadInt32();
if ( nbRleSegments > 16 )
// Make sure that we encounter a 'Sequence Delimiter Item'
// at the end of the item :
- if ( !ReadTag(0xfffe, 0xe0dd) )
+ if ( !ReadTag(0xfffe, 0xe0dd) ) // once per RLE File
{
gdcmWarningMacro( "No sequence delimiter item at end of RLE item sequence");
}
i++;
}
- long fragmentOffset = Fp->tellg();
+ long fragmentOffset = Fp->tellg(); // Once per fragment
// Store the collected info
JPEGFragment *newFragment = new JPEGFragment;
newFragment->SetOffset(fragmentOffset);
* 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.
+ * \ref 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.
*/
bool File::ReadTag(uint16_t testGroup, uint16_t testElem)
{
- long positionOnEntry = Fp->tellg();
- long currentPosition = Fp->tellg(); // On debugging purposes
+ long positionOnEntry = Fp->tellg(); // Only when reading fragments
+ //long currentPosition = positionOnEntry; // On debugging purposes
// Read the Item Tag group and element, and make
// sure they are what we expected:
return false;
}
if ( itemTagGroup != testGroup || itemTagElem != testElem )
- {
+ {
// in order not to pollute output we don't warn on 'delimitors'
if (itemTagGroup != 0xfffe || testGroup != 0xfffe )
- gdcmErrorMacro( "Wrong Item Tag found:"
+ gdcmWarningMacro( "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 << ")"
+ << (unsigned int)positionOnEntry << std::dec << ")"
) ;
Fp->seekg(positionOnEntry, std::ios::beg);
* 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.
+ * 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.
+ * \ref 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
}
//// Then read the associated Item Length
- long currentPosition = Fp->tellg();
+
+ // long currentPosition = Fp->tellg(); // save time // JPRx
uint32_t itemLength = ReadInt32();
gdcmDebugMacro( "Basic Item Length is: " << itemLength
- << " at address: " << std::hex << (unsigned int)currentPosition);
+// << " at address: " << std::hex << (unsigned int)currentPosition
+ );
return itemLength;
}
// 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 )
// These are the deprecated method that one day should be removed (after the next release)
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/*
* \ brief Loader. (DEPRECATED : temporaryly kept not to break the API)
* @ param fileName file to be open for parsing
* @ return false if file cannot be open or no swap info was found,
* or no tag was found.
- * @ deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
+ * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
*/
+ /*
bool File::Load( std::string const &fileName )
{
GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2",
return DoTheLoadingJob( );
}
#endif
-
+*/
//-----------------------------------------------------------------------------
// Print