X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirMeta.cxx;h=c19de1aae43e5f39b91d9488f401d9388785077c;hb=46590a1960c6ff290e5a6404ca8a7c70cb9349bb;hp=2d23a8ad09c41fe6994d51441bddc6dccbe0eb47;hpb=25b8b1283cdf4cbf91bf60be75ccced82e6bcc95;p=gdcm.git diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx index 2d23a8ad..c19de1aa 100644 --- a/src/gdcmDicomDirMeta.cxx +++ b/src/gdcmDicomDirMeta.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirMeta.cxx,v $ Language: C++ - Date: $Date: 2005/11/03 17:22:41 $ - Version: $Revision: 1.32 $ + Date: $Date: 2007/03/23 15:30:15 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,6 +22,7 @@ #include "gdcmGlobal.h" #include "gdcmUtil.h" #include "gdcmDataEntry.h" + namespace gdcm { //----------------------------------------------------------------------------- @@ -52,15 +53,19 @@ DicomDirMeta::~DicomDirMeta() /** * \brief Writes the Meta Elements * @param fp ofstream to write to - * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) + * @param filetype type of the file (ImplicitVR, ExplicitVR, ...) * @return */ void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype) -{ +{ // 'File Meta Information Version' - uint8_t fmiv[2] = {0x02,0x00}; - SetEntryBinArea(fmiv, 0x0002,0x0001, 2); - + + uint8_t fmiv[2] = {0x02,0x00}; + // FIXME : the following doesn't make the job (?!?) + //SetEntryBinArea(fmiv, 0x0002,0x0001, 2); + DataEntry *e00002_0001 = GetDataEntry(0x0002,0x0001); + e00002_0001->CopyBinArea(fmiv, 2); + // 'Media Storage SOP Instance UID' DataEntry *e00002_0003 = GetDataEntry(0x0002,0x0003); e00002_0003->SetString(Util::CreateUniqueUID()); @@ -76,9 +81,9 @@ void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype) e0000->SetString(sLen.str()); for (ListDocEntry::iterator i = DocEntries.begin(); - i != DocEntries.end(); - ++i) - { + i!= DocEntries.end(); + ++i) + { (*i)->WriteContent(fp, filetype); } }