* src/gdcmDocument.cxx: FIX ::ComputeRLEInfo() rleSegmentOffsetTable[]

     was erroneously defined with a size of 15 instead of 16. [many thanks
     to Jean Michel Rouet for pointing out this bug].
   * FIX: src/* fix the doxygen warnings.
   * src/gdcmVR.cxx: removed some redundant tests (e.g. LO)

diff --git a/ChangeLog b/ChangeLog
index c7070570a566066f212cd2c2d97db4a751718717..ce610cb82bbcdb15917e543ebaf237cba47fc36d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,12 @@
    * src/gdcmDocument.cxx : fix memory leaks. Fix possible bugs : use an object
      after it have been deleted
 
-2004-11-09 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
+2004-11-16 Eric Boix <Eric.Boix@creatis.insa-lyon.fr>
    * FIX: src/* fix the doxygen warnings.
+   * src/gdcmVR.cxx: removed some redundant tests (e.g. LO)
+   * src/gdcmDocument.cxx: FIX ::ComputeRLEInfo() rleSegmentOffsetTable[]
+     was erroneously defined with a size of 15 instead of 16. [many thanks
+     to Jean Michel Rouet for pointing out this bug].
 
 2004-11-15 Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
     1. Finish merging JMR patch for writting DICOM from scratch

diff --git a/Testing/TestAllReadCompareDicom.cxx b/Testing/TestAllReadCompareDicom.cxx
index f373b5f82b318c90c782b4a504a87d3b2f087dce..2eb4cf604b9844aee238f8d91ae5a4eaba91e2eb 100644 (file)
--- a/Testing/TestAllReadCompareDicom.cxx
+++ b/Testing/TestAllReadCompareDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestAllReadCompareDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 04:28:20 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/11/16 14:48:19 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,9 +63,9 @@ int InternalTest(std::string const & filename,
       gdcm::File* reference = new gdcm::File( referenceFileName );
       if( !reference->GetHeader()->IsReadable() )
       {
-         std::cout << "      Reference image " << std::endl
-                   << "      " << referenceFileName <<std::endl
-                   << "      is not gdcm compatible." << std::endl;
+         std::cout << "      Failed: reference image " << std::endl
+                   << "              " << referenceFileName <<std::endl
+                   << "              is not gdcm compatible." << std::endl;
          delete tested;
          delete reference;
          return 1;
@@ -81,7 +81,7 @@ int InternalTest(std::string const & filename,
 
       if (testedDataSize != referenceDataSize)
       {
-         std::cout << "        Pixel areas lengths differ: "
+         std::cout << "      Failed: pixel areas lengths differ: "
                    << testedDataSize << " # " << referenceDataSize
                    << std::endl;
          delete tested;
@@ -93,18 +93,18 @@ int InternalTest(std::string const & filename,
                            testedDataSize) != 0 )
       {
          (void)res;
-         std::cout << "        Pixel differ (as expanded in memory)."
+         std::cout << "      Failed: pixel differ (as expanded in memory)."
                    << std::endl;
          delete tested;
          delete reference;
          return 1;
       }
-      std::cout << "      Passed..." << std::endl;
 
       //////////////// Clean up:
       delete tested;
       delete reference;
-      std::cout << "      Passed clean up." << std::endl ;
+
+      std::cout << "      Passed..." << std::endl;
       
       return 0;
 }

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 45cf710fd3787229e7d173e18b7ead1742cc9748..7399e23c67632e00418c81a6ffe31202cd913e75 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/25 04:08:20 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2004/11/16 14:48:19 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -166,8 +166,8 @@ protected:
    /// How many details are to be printed (value : 0,1,2)      
    int PrintLevel;
 
-   /// \brief Generalized key (i.e. a BaseTagKey prepending a TagKey)
-   ///        of this DocEntry
+   /// \brief Generalized key of this DocEntry (for details on
+   ///        the generalized key refer to \ref TagKey documentation).
    TagKey Key;
 };
 } // end namespace gdcm

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 71408a8bd3e02c77ab989b9d505296a3105d466f..226dc896918e2947e6ed8e2329e11ecd6b8e4aee 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 11:19:05 $
-  Version:   $Revision: 1.127 $
+  Date:      $Date: 2004/11/16 14:48:19 $
+  Version:   $Revision: 1.128 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2916,7 +2916,7 @@ void Document::ComputeRLEInfo()
          dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
       }
  
-      uint32_t rleSegmentOffsetTable[15];
+      uint32_t rleSegmentOffsetTable[16];
       for( int k = 1; k <= 15; k++ )
       {
          rleSegmentOffsetTable[k] = ReadInt32();

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 02eb2c893f34d1717cd805b9da998417e85e4a8f..22e54fc60198393f2d36066295eeaaba54dbc72f 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 18:08:56 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2004/11/16 14:48:19 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -151,11 +151,24 @@ bool VR::IsVROfGdcmStringRepresentable(VRKey const & tested)
       return false;
    }
 
-   if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
-       tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
-       tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
-       tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
-       tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
+   if ( tested == "AE" ||
+        tested == "AS" ||
+        tested == "CS" ||
+        tested == "DA" ||
+        tested == "DS" ||
+        tested == "IS" || 
+        tested == "LO" ||
+        tested == "LT" ||
+        tested == "PN" ||
+        tested == "SH" ||
+        tested == "SL" ||
+        tested == "SS" ||
+        tested == "ST" ||
+        tested == "TM" ||
+        tested == "UI" ||
+        tested == "UL" ||
+        tested == "UN" ||
+        tested == "US" )
    {
       return true;
    }