Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/28 13:02:32 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2005/11/04 15:31:34 $
+ Version: $Revision: 1.18 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if( strVM == "1-n" )
{
- // make sure it is at least one ??? FIXME
+ // make sure there is at least one ??? FIXME
valid = vc >= 1 || vc == 0;
}
else
os.str( strVM );
os >> vm;
// Two cases:
- // vm respect the one from the dict
+ // vm respects the one from the dict
// vm is 0 (we need to check if this element is allowed to be empty) FIXME
// note (JPR)
{
if( value.size() > 0 )
{
- // FIXME : should be quicker if we don't create one more std::string
- // just to make even the length of a char array ...
-
- /*
- std::string finalVal = Util::DicomString( value.c_str() );
- SetLength(finalVal.size());
- NewBinArea();
-
- memcpy(BinArea, &(finalVal[0]), finalVal.size());
- */
-
size_t l = value.size();
SetLength(l + l%2);
NewBinArea();
- //memcpy(BinArea, &(value[0]), l);
memcpy(BinArea, value.c_str(), l);
if (l%2)
BinArea[l] = '\0';
StrArea=s.str();
}
else
+ {
StrArea.append((const char *)BinArea,GetLength());
-
+ // to avoid gdcm propagate oddities in lengthes
+ if ( GetLength()%2)
+ StrArea.append(" ",1);
+ }
return StrArea;
}
/**
}
}
/**
- * \brief Writes the value of a DataEntry
+ * \brief Writes the 'value' area of a DataEntry
* @param fp already open ofstream pointer
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
// --> forget Big Endian Transfer Syntax writting!
// Next DICOM version will give it up ...
- // WARNING - Implicit VR private element :
+ // WARNING - For Implicit VR private element,
// we have *no choice* but considering them as
// something like 'OB' values.
// we rewrite them as we found them on disc.
// (Same stuff, mutatis mutandis, for Little/Big)
// 8/16 bits Pixels problem should be solved automatiquely,
- // since we ensure the VR is conform to Pixel size.
+ // since we ensure the VR (OB vs OW) is conform to Pixel size.
uint8_t *data = BinArea; //safe notation
size_t l = GetLength();
+ gdcmDebugMacro ("in DataEntry::WriteContent " << GetKey()
+ << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR())
+ );
if (BinArea) // the binArea was *actually* loaded
{
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
fp->seekp(l, std::ios::cur);
}
+ // to avoid gdcm to propagate oddities
+ // (length was already modified)
+ if (l%2)
+ fp->seekp(1, std::ios::cur);
}
//-----------------------------------------------------------------------------