X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=6224b551b049469b671de3a294bd18da5a1c871f;hb=0fe2afcdd153ff2ee8f3ba2b4b02478e154a57df;hp=3e218c41968260f8c01ffb1a2c64f84eea4f7f05;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 3e218c41..6224b551 100644
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 10:02:17 $
-  Version:   $Revision: 1.51 $
+  Date:      $Date: 2005/04/19 09:58:19 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,9 +29,7 @@
 namespace gdcm 
 {
 //-----------------------------------------------------------------------------
-#define MAX_SIZE_PRINT_ELEMENT_VALUE 64
 
-//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief   Constructor from a given DictEntry
@@ -62,7 +60,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    uint16_t group = GetGroup();
    VRKey vr       = GetVR();
    uint16_t el    = GetElement();
-   uint32_t lgr   = GetLength();
+   uint32_t lgth  = GetLength();
 
    if ( group == 0xfffe && el == 0x0000 )
    {
@@ -95,7 +93,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
 
       uint16_t z = 0;
-      uint16_t shortLgr = lgr;
+      uint16_t shortLgr = (uint16_t)lgth;
 
       if (vr == GDCM_UNKNOWN)
       {
@@ -121,7 +119,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
             }
             else
             {
-               binary_write(*fp, lgr);
+               binary_write(*fp, lgth);
             }
          }
          else
@@ -138,7 +136,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
       }
       else
       {
-         binary_write(*fp, lgr);
+         binary_write(*fp, lgth);
       }
    }
 }
@@ -168,18 +166,6 @@ uint32_t DocEntry::GetFullLength()
    return l;
 }
 
-/**
- * \brief   Copies all the attributes from an other DocEntry 
- * @param doc entry to copy from
- */
-void DocEntry::Copy(DocEntry *doc)
-{
-   Length     = doc->Length;
-   ReadLength = doc->ReadLength;
-   ImplicitVR = doc->ImplicitVR;
-   Offset     = doc->Offset;
-}
-
 /**
  * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
  *          (fffe,e00d) 
@@ -198,6 +184,18 @@ bool DocEntry::IsSequenceDelimitor()
    return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
 }
 
+/**
+ * \brief   Copies all the attributes from an other DocEntry 
+ * @param doc entry to copy from
+ */
+void DocEntry::Copy(DocEntry *doc)
+{
+   Length     = doc->Length;
+   ReadLength = doc->ReadLength;
+   ImplicitVR = doc->ImplicitVR;
+   Offset     = doc->Offset;
+}
+
 //-----------------------------------------------------------------------------
 // Protected