To allow testsuite go on.

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index dac8355c49667d19ac514493952b464d29a35eaa..14a8a81d6b5d176e425a054cdcf503df63c32ec2 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/07/04 07:58:50 $
-  Version:   $Revision: 1.84 $
+  Date:      $Date: 2007/02/23 15:29:56 $
+  Version:   $Revision: 1.87 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -103,7 +103,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    binary_write( *fp, elem);  //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
-   if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )
+   if ( filetype == ExplicitVR || filetype == JPEG || filetype == JPEG2000 || group == 0x0002 )
    {
 // ----------- Writes the common part : the VR + the length 
   
@@ -139,7 +139,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
           ||  (vr == "UN") || (vr == "UT") )
          {
             binary_write(*fp, zero);
-            if (filetype == JPEG && GetGroup() == 0x7fe0 && GetElement() == 0x0010)
+           if ( (filetype == JPEG || filetype == JPEG2000) && group == 0x7fe0 && elem == 0x0010)
             {
                gdcmAssertMacro( GetVR() == "OW" );
                binary_write(*fp, ffff);
@@ -234,33 +234,6 @@ uint32_t DocEntry::GetFullLength()
    return l;
 }
 
-/**
- * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
- *          (fffe,e00d) 
- */
-bool DocEntry::IsItemDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
-}
-
-/**
- * \brief   tells us if entry is the first one of an Item 
- *          (fffe,e000) 
- */
-bool DocEntry::IsItemStarter()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe000);
-}
-
-/**
- * \brief   tells us if entry is the last one of a 'no length' Sequence 
- *          (fffe,e0dd) 
- */
-bool DocEntry::IsSequenceDelimitor()
-{
-   return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
-}
-
 /**
  * \brief Copies all the attributes from an other DocEntry 
  * @param doc entry to copy from
@@ -340,8 +313,14 @@ void DocEntry::Print(std::ostream &os, std::string const & )
    if ( GetElement() == 0x0000 )
       name = "Group Length";
    else
+   {
       name = GetName();
-
+      // prevent Print from any CR at end of name (hope it's enought!)
+      if (name[name.length()-1] == 0x0d || name[name.length()-1] == 0x0a)
+      {  
+         name.replace(name.length()-1, 1, 1, ' ');
+      }
+   }
    if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);