From 030b22f65c2933ac680497672f8a236dcf2a460b Mon Sep 17 00:00:00 2001
From: regrain <regrain>
Date: Mon, 28 Nov 2005 15:30:03 +0000
Subject: [PATCH]    * Fix bug -- sorry    * Imrpovement by removing the
 CommandManager from the DicomEntry    -- BeNours

---
 src/gdcmDebug.h              |  6 +++---
 src/gdcmDicomEntry.h         |  8 ++++----
 src/gdcmDictEntry.cxx        | 24 ++++++------------------
 src/gdcmPixelReadConvert.cxx |  6 +++---
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index 8fb72a08..e0fe0992 100644
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:32 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/11/28 15:30:03 $
+  Version:   $Revision: 1.49 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -215,7 +215,7 @@ private:
    }                                                           \
 }
 #define gdcmAssertMacro(msg)                                   \
-   gdcmAssertBodyMacro(this,msg)
+   gdcmAssertBodyMacro(NULL,msg)
 #define gdcmStaticAssertMacro(msg)                             \
    gdcmAssertBodyMacro(NULL,msg)
 
diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h
index b11e8c37..6f843b58 100644
--- a/src/gdcmDicomEntry.h
+++ b/src/gdcmDicomEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:32 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/11/28 15:30:04 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,7 +20,7 @@
 #define GDCMDICOMENTRY_H
 
 #include "gdcmCommon.h"
-#include "gdcmCommandManager.h"
+#include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
 #include "gdcmTagKey.h"
 
@@ -39,7 +39,7 @@ namespace gdcm
  *  - the VM (Value Multiplicity)
  *  - the corresponding name in english
  */
-class GDCM_EXPORT DicomEntry : public CommandManager
+class GDCM_EXPORT DicomEntry : public RefCounter
 {
    gdcmTypeMacro(DicomEntry);
 
diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 5e647cbc..718bb4c1 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/27 14:12:24 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2005/11/28 15:30:04 $
+  Version:   $Revision: 1.56 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,14 +71,8 @@ DictEntry *DictEntry::New(uint16_t group, uint16_t elem,
  */
 void DictEntry::SetVR(VRKey const &vr) 
 {
-   if ( IsVRUnknown() )
-   {
-      DicomEntry::SetVR(vr);
-   }
-   else 
-   {
-      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
-   }
+   gdcmAssertMacro( IsVRUnknown() );
+   DicomEntry::SetVR(vr);
 }
 
 /**
@@ -88,14 +82,8 @@ void DictEntry::SetVR(VRKey const &vr)
  */
 void DictEntry::SetVM(TagName const &vm) 
 {
-   if ( IsVMUnknown() )
-   {
-      VM = vm;
-   }
-   else 
-   {
-      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
-   }
+   gdcmAssertMacro( IsVMUnknown() );
+   VM = vm;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index a06da263..02ee4dd0 100644
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:34 $
-  Version:   $Revision: 1.103 $
+  Date:      $Date: 2005/11/28 15:30:04 $
+  Version:   $Revision: 1.104 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -831,7 +831,7 @@ void PixelReadConvert::ConvertSwapZone()
    int tempSwapCode = SwapCode;
    if ( IsPrivateGETransferSyntax )
    {
-      gdcmWarningMacro(" IsPrivateGETransferSyntax found; turn the SwapCode"); 
+      gdcmStaticWarningMacro(" IsPrivateGETransferSyntax found; turn the SwapCode"); 
       // PrivateGETransferSyntax only exists for 'true' Dicom images
       // we assume there is no 'exotic' 32 bits endianess!
       if (SwapCode == 1234) 
-- 
2.45.1