From a212c7275fb6052e882a981534b966c09ecc1d4e Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Fri, 7 Sep 2007 15:44:31 +0000
Subject: [PATCH]   Since gdcm1.3.1 wrote wrongly some images :

 .Uncorrect reading/writting of JPEG/JPE2000 images when BitsAllocated=16/BitsStored=8
 .Uncorrect writing of JPEG/JPE2000 image with an 'Icon' Sequence
 .Uncorrect writting of JPE2000 multiframe images
 .Uncorrect writting of images with a DataElement belonging to group 0002, inside a Sequence

I change the minor version number, to make easier a bug tracking.
If somebody expriences some troubles with a gdcm-written image, he (we!) can check the gdcm version,
using PrintFile filein=fileName.dcm
---
 CMakeLists.txt        |  2 +-
 Dicts/dicomV3.dic     |  1 +
 Dicts/dicomVR.dic     |  1 +
 Doc/Website/News.html | 17 ++++++++++++++++-
 src/gdcmVR.cxx        | 14 ++++++++++----
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823940a2..d988ba74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
 SET(GDCM_MINOR_VERSION 3)
-SET(GDCM_BUILD_VERSION 1)
+SET(GDCM_BUILD_VERSION 2)
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")
 
diff --git a/Dicts/dicomV3.dic b/Dicts/dicomV3.dic
index 9cae3560..5e0425d0 100644
--- a/Dicts/dicomV3.dic
+++ b/Dicts/dicomV3.dic
@@ -3104,6 +3104,7 @@
 6018 1500 LO 1 Overlay Label
 6018 3000 OW 1 Overlay Data
 6018 4000 LT 1 Overlay Comments (RET)
+
 7fe0 0000 UL 1 Group Length
 7fe0 0010 OB 1 Pixel Data
 
diff --git a/Dicts/dicomVR.dic b/Dicts/dicomVR.dic
index 506547e4..9faba0da 100644
--- a/Dicts/dicomVR.dic
+++ b/Dicts/dicomVR.dic
@@ -25,3 +25,4 @@ UL Unsigned Long;         // Exactly 4 bytes
 UN Unknown;               // Any length of bytes
 US Unsigned Short;        // Exactly 2 bytes
 UT Unlimited Text;        // At most 2^32 -1 chars
+RT Undocumented VR in Siemens Sensation 64; // gdcmVR.cxx has to be updated, too.
diff --git a/Doc/Website/News.html b/Doc/Website/News.html
index 6462639a..3e98d723 100644
--- a/Doc/Website/News.html
+++ b/Doc/Website/News.html
@@ -106,12 +106,27 @@ Any contribution is welcome.
 <HR size="1"><ADDRESS style="align: right;"></ADDRESS>
 <H2>
    <A CLASS="anchor" NAME="NewsCurrentVersion">
-   <B>Current Version (CVS)</B></A>
+   <B>Current Version (CVS) : gdcm1.3.2 </B></A>
       <B></B></A>
 </H2>
 
 <UL>
    <LI> <A HREF="News.html#missing">Missing Features</a>
+   <LI>Differences between <b>gdcm 1.3.1</b> and <b>gdcm 1.3.2</b>
+   <UL>
+       <LI> Uncorrect reading/writting of JPEG/JPE2000 images when
+       BitsAllocated=16/BitsStored=8
+       <LI> Uncorrect writing of JPEG/JPE2000 image with an 'Icon' Sequence
+       <LI> Uncorrect writting of JPE2000 multiframe images
+       <LI> Uncorrect writting of images with a DataElement belonging to group
+       0002, inside a Sequence
+       <LI> Uncorrect re-writting of Implicit Value Representation images with
+       'shadow groups' when Explicit Value Representation was asked
+       (unexpected swap to Implicit VR)
+   </UL>
+   If you experience troubles with gdcm-written images, check which
+   gdcm version was used (PrintFile filein=yourFileName.dcm)
+   
    <LI>State of the art
    <UL>    
       <LI>
diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 19596be9..c30cc4e5 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/06/22 10:02:48 $
-  Version:   $Revision: 1.56 $
+  Date:      $Date: 2007/09/07 15:44:32 $
+  Version:   $Revision: 1.57 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -170,10 +170,16 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
 bool VR::IsValidVR(VRKey const &tested)
 {
 //  return vr.find(key) != vr.end();
+
+// "RT" is an undocumented VR, found in some Siemens images.
+// We added it here to be able to read these images.
+// Dict/gdcmVR.dic has to be updated, too.
   static const char VRvalues[] =
-    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
+    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT";
 
-  int nbVal = 26;
+  //int nbVal = strlen(VRvalues)/2; // save CPU time.
+  int nbVal = 27;
+  
   const char *pt = VRvalues;
   for (int i=0;i<nbVal;i++)
   {
-- 
2.45.1