From 745e3abcf3563cd15ebb92316d6dd800d8199340 Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Wed, 22 Aug 2007 16:14:03 +0000
Subject: [PATCH] Try to make gdcm1.2 and gdcm1.3 usable int the same source
 code. (Still don't work : macro and global variables are defined twice)

---
 src/gdcmBase.h                     | 10 +++---
 src/gdcmCallbackCommand.h          |  8 ++---
 src/gdcmCommand.h                  |  8 ++---
 src/gdcmCommandManager.h           |  8 ++---
 src/gdcmCommon.h                   |  8 ++---
 src/gdcmDataEntry.cxx              | 16 ++++-----
 src/gdcmDataEntry.h                |  8 ++---
 src/gdcmDebug.h                    |  8 ++---
 src/gdcmDicomDir.h                 |  8 ++---
 src/gdcmDicomDirElement.h          |  8 ++---
 src/gdcmDicomDirImage.h            |  8 ++---
 src/gdcmDicomDirMeta.h             |  8 ++---
 src/gdcmDicomDirObject.h           |  8 ++---
 src/gdcmDicomDirPatient.h          |  8 ++---
 src/gdcmDicomDirPrivate.h          |  8 ++---
 src/gdcmDicomDirSerie.h            |  8 ++---
 src/gdcmDicomDirStudy.h            |  8 ++---
 src/gdcmDicomDirVisit.h            |  8 ++---
 src/gdcmDicomEntry.h               |  8 ++---
 src/gdcmDict.h                     |  8 ++---
 src/gdcmDictEntry.h                |  8 ++---
 src/gdcmDictGroupName.h            |  8 ++---
 src/gdcmDictSet.h                  |  8 ++---
 src/gdcmDirList.h                  |  8 ++---
 src/gdcmDocEntry.h                 |  8 ++---
 src/gdcmDocEntryArchive.h          |  8 ++---
 src/gdcmDocEntrySet.h              |  8 ++---
 src/gdcmDocument.h                 |  8 ++---
 src/gdcmElementSet.h               |  8 ++---
 src/gdcmException.h                |  8 ++---
 src/gdcmFile.cxx                   | 54 +++++++++++++-----------------
 src/gdcmFile.h                     | 12 +++----
 src/gdcmFileHelper.h               |  8 ++---
 src/gdcmGlobal.h                   |  8 ++---
 src/gdcmJPEGFragment.cxx           |  6 ++--
 src/gdcmJPEGFragment.h             | 10 +++---
 src/gdcmJPEGFragmentsInfo.h        |  8 ++---
 src/gdcmJpeg2000.cxx               |  9 ++---
 src/gdcmMacro.h                    |  8 ++---
 src/gdcmMpeg.cxx                   |  7 ++--
 src/gdcmOrientation.h              |  8 ++---
 src/gdcmPixelReadConvert.h         |  8 ++---
 src/gdcmPixelWriteConvert.cxx      |  8 ++---
 src/gdcmPixelWriteConvert.h        | 10 +++---
 src/gdcmRLEFrame.h                 |  8 ++---
 src/gdcmRLEFramesInfo.h            |  8 ++---
 src/gdcmRefCounter.h               |  8 ++---
 src/gdcmSQItem.h                   |  8 ++---
 src/gdcmSeqEntry.h                 |  8 ++---
 src/gdcmSerieHelper.h              |  8 ++---
 src/gdcmSystem.h                   |  8 ++---
 src/gdcmTS.h                       |  8 ++---
 src/gdcmTagKey.h                   |  8 ++---
 src/gdcmUtil.h                     | 10 +++---
 src/gdcmVR.h                       |  8 ++---
 src/gdcmVRKey.h                    |  8 ++---
 src/gdcmValidator.h                |  8 ++---
 src/gdcmopenjpeg/libopenjpeg/bio.c |  2 +-
 58 files changed, 259 insertions(+), 263 deletions(-)

diff --git a/src/gdcmBase.h b/src/gdcmBase.h
index 3f4024a4..721d8c52 100644
--- a/src/gdcmBase.h
+++ b/src/gdcmBase.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBase.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:07 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMBASE_H
-#define GDCMBASE_H
+#ifndef _GDCMBASE_H_
+#define _GDCMBASE_H_
 
 #include "gdcmCommon.h"
 #include <iostream>
@@ -35,7 +35,7 @@ class GDCM_EXPORT Base
 {
 public:
    /// \brief Constructor
-   Base( ) {PrintLevel = 0;}
+   Base( ) { PrintLevel = 0; }
    /// \brief Canonical Destructor   
    virtual ~Base() {}
    /// \brief Printer
diff --git a/src/gdcmCallbackCommand.h b/src/gdcmCallbackCommand.h
index 365ce602..6f7a7b37 100644
--- a/src/gdcmCallbackCommand.h
+++ b/src/gdcmCallbackCommand.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCallbackCommand.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:07 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMCALLBACKCOMMAND_H
-#define GDCMCALLBACKCOMMAND_H
+#ifndef _GDCMCALLBACKCOMMAND_H_
+#define _GDCMCALLBACKCOMMAND_H_
 
 #include "gdcmDebug.h"
 #include "gdcmCommand.h"
diff --git a/src/gdcmCommand.h b/src/gdcmCommand.h
index fab5737a..1817703b 100644
--- a/src/gdcmCommand.h
+++ b/src/gdcmCommand.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommand.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMCOMMAND_H
-#define GDCMCOMMAND_H
+#ifndef _GDCMCOMMAND_H_
+#define _GDCMCOMMAND_H_
 
 #include "gdcmRefCounter.h"
 
diff --git a/src/gdcmCommandManager.h b/src/gdcmCommandManager.h
index 1a581212..6dac018d 100644
--- a/src/gdcmCommandManager.h
+++ b/src/gdcmCommandManager.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommandManager.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMCOMMANDMANAGER_H
-#define GDCMCOMMANDMANAGER_H
+#ifndef _GDCMCOMMANDMANAGER_H_
+#define _GDCMCOMMANDMANAGER_H_
 
 #include "gdcmRefCounter.h"
 
diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 750effac..98ff3901 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.115 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.116 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMCOMMON_H
-#define GDCMCOMMON_H
+#ifndef _GDCMCOMMON_H_
+#define _GDCMCOMMON_H_
 
 #include "gdcmConfigure.h"
 #include "gdcmSystem.h"
diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 182d7391..5678ac8f 100644
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -137,7 +137,7 @@ void DataEntry::SetValue(const uint32_t &id, const double &val)
 
    if( id > GetValueCount() )
    {
-      gdcmErrorMacro("Index (" << id << ")is greater than the data size");
+      gdcmErrorMacro("Index (" << id << ") is greater than the data size");
       return;
    }
 
@@ -172,7 +172,7 @@ void DataEntry::SetValue(const uint32_t &id, const double &val)
    }
 }
 /**
- * \brief returns, as a double (?!?) one of the values 
+ * \brief returns, as a double one of the values 
  *      (when entry is multivaluated), identified by its index.
  *      Returns 0.0 if index is wrong
  * @param id id
@@ -196,13 +196,11 @@ double DataEntry::GetValue(const uint32_t &id) const
       return 0.0;
    }
 
-   /// \todo FIX the API : user *knows* that entry contains a US
-   ///               and he receives a double ?!?
+   // if user *knows* that entry contains a US, 
+   // he just has to cast the double he receives
    
    const VRKey &vr = GetVR();
-   /// \todo FIX the API : user *knows* that entry contains a US,
-   ///       the method is supposed to return a double
-   ///       but sends a US ?!? 
+
    if( vr == "US" || vr == "SS" )
       return ((uint16_t *)BinArea)[id];
    else if( vr == "UL" || vr == "SL" )
diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h
index 2bae50a1..0fde3e63 100644
--- a/src/gdcmDataEntry.h
+++ b/src/gdcmDataEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDATAENTRY_H
-#define GDCMDATAENTRY_H
+#ifndef G_DCMDATAENTRY_H_
+#define _GDCMDATAENTRY_H_
 
 #include "gdcmDocEntry.h"
 
diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index 5b5c2823..06a9654d 100644
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2007/06/04 13:40:01 $
-  Version:   $Revision: 1.57 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.58 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDEBUG_H
-#define GDCMDEBUG_H
+#ifndef _GDCMDEBUG_H_
+#define _GDCMDEBUG_H_
 
 #include "gdcmCommon.h"
 #include "gdcmCommand.h"
diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index d13b038a..9fcce680 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/20 13:24:04 $
-  Version:   $Revision: 1.80 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.81 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
   
 =========================================================================*/
 
-#ifndef GDCMDICOMDIR_H
-#define GDCMDICOMDIR_H
+#ifndef _GDCMDICOMDIR_H_
+#define _GDCMDICOMDIR_H_
 
 #include "gdcmDocument.h"
 #include "gdcmDebug.h"
diff --git a/src/gdcmDicomDirElement.h b/src/gdcmDicomDirElement.h
index bc4a6bd3..dc93c043 100644
--- a/src/gdcmDicomDirElement.h
+++ b/src/gdcmDicomDirElement.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRELEMENT_H
-#define GDCMDICOMDIRELEMENT_H
+#ifndef _GDCMDICOMDIRELEMENT_H_
+#define _GDCMDICOMDIRELEMENT_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
diff --git a/src/gdcmDicomDirImage.h b/src/gdcmDicomDirImage.h
index 32eb8aa2..86ae4e63 100644
--- a/src/gdcmDicomDirImage.h
+++ b/src/gdcmDicomDirImage.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMIMAGE_H
-#define GDCMDICOMIMAGE_H
+#ifndef _GDCMDICOMIMAGE_H_
+#define _GDCMDICOMIMAGE_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirMeta.h b/src/gdcmDicomDirMeta.h
index e7f8e26f..ee793596 100644
--- a/src/gdcmDicomDirMeta.h
+++ b/src/gdcmDicomDirMeta.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRMETA_H
-#define GDCMDICOMDIRMETA_H
+#ifndef _GDCMDICOMDIRMETA_H_
+#define _GDCMDICOMDIRMETA_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirObject.h b/src/gdcmDicomDirObject.h
index 64ce981a..3643bf01 100644
--- a/src/gdcmDicomDirObject.h
+++ b/src/gdcmDicomDirObject.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirObject.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIROBJECT_H
-#define GDCMDICOMDIROBJECT_H
+#ifndef _GDCMDICOMDIROBJECT_H_
+#define _GDCMDICOMDIROBJECT_H_
 
 #include "gdcmSQItem.h"
 #include "gdcmDicomDirElement.h"
diff --git a/src/gdcmDicomDirPatient.h b/src/gdcmDicomDirPatient.h
index a33e9805..db8a955e 100644
--- a/src/gdcmDicomDirPatient.h
+++ b/src/gdcmDicomDirPatient.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/20 13:24:04 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMPATIENT_H
-#define GDCMPATIENT_H
+#ifndef _GDCMPATIENT_H_
+#define _GDCMPATIENT_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirPrivate.h b/src/gdcmDicomDirPrivate.h
index 69717fa4..ce25ad7d 100755
--- a/src/gdcmDicomDirPrivate.h
+++ b/src/gdcmDicomDirPrivate.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPrivate.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:08 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRPRIVATE_H
-#define GDCMDICOMDIRPRIVATE_H
+#ifndef _GDCMDICOMDIRPRIVATE_H_
+#define _GDCMDICOMDIRPRIVATE_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h
index 4c098802..199ae983 100644
--- a/src/gdcmDicomDirSerie.h
+++ b/src/gdcmDicomDirSerie.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/20 13:24:04 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRSERIE_H
-#define GDCMDICOMDIRSERIE_H
+#ifndef _GDCMDICOMDIRSERIE_H_
+#define _GDCMDICOMDIRSERIE_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirStudy.h b/src/gdcmDicomDirStudy.h
index 56dcb3cf..bdcdf624 100644
--- a/src/gdcmDicomDirStudy.h
+++ b/src/gdcmDicomDirStudy.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/20 13:24:04 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRSTUDY_H
-#define GDCMDICOMDIRSTUDY_H
+#ifndef _GDCMDICOMDIRSTUDY_H_
+#define _GDCMDICOMDIRSTUDY_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomDirVisit.h b/src/gdcmDicomDirVisit.h
index 1fdc3dc4..cf9ffb66 100644
--- a/src/gdcmDicomDirVisit.h
+++ b/src/gdcmDicomDirVisit.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirVisit.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMDIRVISIT_H
-#define GDCMDICOMDIRVISIT_H
+#ifndef _GDCMDICOMDIRVISIT_H_
+#define _GDCMDICOMDIRVISIT_H_
 
 #include "gdcmDicomDirObject.h"
 
diff --git a/src/gdcmDicomEntry.h b/src/gdcmDicomEntry.h
index 3fc1bc1e..f5e469c7 100644
--- a/src/gdcmDicomEntry.h
+++ b/src/gdcmDicomEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomEntry.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICOMENTRY_H
-#define GDCMDICOMENTRY_H
+#ifndef _GDCMDICOMENTRY_H_
+#define _GDCMDICOMENTRY_H_
 
 #include "gdcmCommon.h"
 #include "gdcmRefCounter.h"
diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index a1e72aad..d72fec8d 100644
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.50 $
+  Date:      $Date: 2007/08/22 16:14:03 $
+  Version:   $Revision: 1.51 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICT_H
-#define GDCMDICT_H
+#ifndef _GDCMDICT_H_
+#define _GDCMDICT_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmDictEntry.h"
diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h
index 4e6484c8..61f766fd 100644
--- a/src/gdcmDictEntry.h
+++ b/src/gdcmDictEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICTENTRY_H
-#define GDCMDICTENTRY_H
+#ifndef _GDCMDICTENTRY_H_
+#define _GDCMDICTENTRY_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmTagKey.h"
diff --git a/src/gdcmDictGroupName.h b/src/gdcmDictGroupName.h
index 230bf0fb..d123c6a4 100644
--- a/src/gdcmDictGroupName.h
+++ b/src/gdcmDictGroupName.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictGroupName.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICTGROUPNAME_H
-#define GDCMDICTGROUPNAME_H
+#ifndef _GDCMDICTGROUPNAME_H
+#define _GDCMDICTGROUPNAME_H
 
 #include "gdcmRefCounter.h"
 
diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 3c196d9c..9e2e2d77 100644
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICTSET_H
-#define GDCMDICTSET_H
+#ifndef _GDCMDICTSET_H
+#define _GDCMDICTSET_H
 
 #include "gdcmRefCounter.h"
 #include "gdcmDict.h"
diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index 658079ea..6477cdcc 100644
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/13 08:17:21 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDIRLIST_H
-#define GDCMDIRLIST_H
+#ifndef _GDCMDIRLIST_H_
+#define _GDCMDIRLIST_H_
 
 #include "gdcmBase.h"
 #include "gdcmDicomDirSerie.h"
diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index f5fe3ab2..411fb108 100644
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.69 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDOCENTRY_H
-#define GDCMDOCENTRY_H
+#ifndef _GDCMDOCENTRY_H_
+#define _GDCMDOCENTRY_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmDictEntry.h"
diff --git a/src/gdcmDocEntryArchive.h b/src/gdcmDocEntryArchive.h
index f6afee14..77acc2df 100644
--- a/src/gdcmDocEntryArchive.h
+++ b/src/gdcmDocEntryArchive.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:09 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDOCENTRYARCHIVE_H
-#define GDCMDOCENTRYARCHIVE_H
+#ifndef _GDCMDOCENTRYARCHIVE_H_
+#define _GDCMDOCENTRYARCHIVE_H_
 
 #include "gdcmFile.h"
 
diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 083ec9f8..6f1930ce 100644
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntrySet.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.71 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDOCENTRYSET_H
-#define GDCMDOCENTRYSET_H
+#ifndef _GDCMDOCENTRYSET_H_
+#define _GDCMDOCENTRYSET_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 6f2fbe71..3c5ec515 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2007/06/18 11:10:17 $
-  Version:   $Revision: 1.145 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.146 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
  
 =========================================================================*/
 
-#ifndef GDCMDOCUMENT_H
-#define GDCMDOCUMENT_H
+#ifndef _GDCMDOCUMENT_H_
+#define _GDCMDOCUMENT_H_
 
 #include "gdcmVR.h"
 #include "gdcmDict.h"
diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index c384044c..95550eaa 100644
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.56 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMELEMENTSET_H
-#define GDCMELEMENTSET_H
+#ifndef _GDCMELEMENTSET_H_
+#define _GDCMELEMENTSET_H_
 
 #include "gdcmDocEntrySet.h"
 
diff --git a/src/gdcmException.h b/src/gdcmException.h
index 0565e487..0e460860 100644
--- a/src/gdcmException.h
+++ b/src/gdcmException.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmException.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:10 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCM_EXCEPTION_H
-#define GDCM_EXCEPTION_H
+#ifndef _GDCM_EXCEPTION_H_
+#define _GDCM_EXCEPTION_H_
 
 #include "gdcmCommon.h"
 
diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index e108dfdb..2cc7443f 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/03 08:17:24 $
-  Version:   $Revision: 1.333 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.334 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -142,7 +142,6 @@ File::~File()
  * @return false if file cannot be open or no swap info was found,
  *         or no tag was found.
  */
-
 bool File::Load( ) 
 {
    if ( ! this->Document::Load( ) )
@@ -177,7 +176,6 @@ bool File::DoTheLoadingJob( )
    }
    else
    {
-
       GrPixel = (uint16_t) atoi( imgLocation.c_str() );
    }   
 
@@ -237,7 +235,7 @@ bool File::DoTheLoadingJob( )
 
          // Change only made if usefull
          if ( PixelVR != oldEntry->GetVR() )
-         {       
+         {
             //DictEntry* newDict = DictEntry::New(GrPixel,NumPixel,
             //                                    PixelVR,"1","Pixel Data");
             //DataEntry *newEntry = DataEntry::New(newDict);
@@ -249,7 +247,6 @@ bool File::DoTheLoadingJob( )
             //RemoveEntry(oldEntry);
             //AddEntry(newEntry);
             //newEntry->Delete();
-  
          }
       }
 */
@@ -481,7 +478,7 @@ bool File::GetSpacing(float &xspacing, float &yspacing, float &zspacing)
       TS *ts = Global::GetTS();
       std::string sopclassuid_used;
       // D 0002|0002 [UI] [Media Storage SOP Class UID]
-      
+ 
       //const std::string &mediastoragesopclassuid_str = GetEntryValue(0x0002,0x0002);  
       const std::string &mediastoragesopclassuid_str = GetEntryString(0x0002,0x0002);
       const std::string &mediastoragesopclassuid = ts->GetValue(mediastoragesopclassuid_str);
@@ -540,10 +537,9 @@ bool File::GetSpacing(float &xspacing, float &yspacing, float &zspacing)
           }
         return true;
         }
-   
      return false;
    }
-   
+
 /**
  * \brief   Retrieve the -unnormalized- number of 'times' of '4D image'.
  *          User has to tell gdcm the location of this '4th Dimension component'
@@ -559,7 +555,7 @@ int File::GetTSize()
       
    DataEntry *entry = GetDataEntry(FourthDimensionLocation.GetGroup(),
                                    FourthDimensionLocation.GetElement() );
-   if( !entry )   
+   if( !entry )
    {
       gdcmWarningMacro( " FourthDimensionLocation not found at : " <<
                     std::hex << FourthDimensionLocation.GetGroup()
@@ -570,7 +566,7 @@ int File::GetTSize()
    {
       return (int)entry->GetValue(0);
    }      
-}  
+}
 
 
 
@@ -583,19 +579,18 @@ int File::GetTSize()
 float File::GetXSpacing()
 {
    float xspacing = 1.0;
-   float yspacing = 1.0; 
+   float yspacing = 1.0;
    float zspacing = 1.0;
-       
+
    uint32_t nbValue;
    DataEntry *entry;
    bool ok = false; 
-    
   if ( GetSpacing(xspacing,yspacing,zspacing) )
   {
     return xspacing;
   }
- // else fallback  
-    
+ // else fallback
+
 /*
 From:David Clunie - view profile
 Date:Wed, May 24 2006 1:12 pm
@@ -690,7 +685,7 @@ and
       if( nbValue !=2 )
          gdcmWarningMacro("ImagerPixelSpacing (0x0018,0x1164) "
          << "has a wrong number of values :" << nbValue);
-     
+
       if( nbValue >= 3 )
          xspacing = (float)entry->GetValue(2);
       else if( nbValue >= 2 )
@@ -714,7 +709,7 @@ and
       if( nbValue !=2 )
          gdcmWarningMacro("PixelSpacing (0x0018,0x0030) "
           << "has a wrong number of values :" << nbValue);      
-      
+  
       if( nbValue >= 3 )
          xspacing = (float)entry->GetValue(2);
       else if( nbValue >= 2 )
@@ -745,14 +740,12 @@ float File::GetYSpacing()
    uint32_t nbValue;
    DataEntry *entry;
    bool ok = false;
-   
   if ( GetSpacing(xspacing,yspacing,zspacing) )
   {
     return yspacing;
   }
- // else fallback 
- 
-     
+ // else fallback
+
    std::string SOPClassUID = GetEntryString(0x0008,0x0016);
 
    /// \todo check the various SOP Class
@@ -1367,13 +1360,13 @@ std::string File::GetPixelType()
       // (in order no to be messed up by old RGB images)
       bitsAlloc = "8";
    }
-   
+
    int i= atoi(bitsAlloc.c_str());  // fix a bug in some headers
    if ( i > 8 &&  i < 16 )
    {
       bitsAlloc = "16";
    }
-   
+
    std::string sign;
    if( IsSignedPixelData() )
    {
@@ -1633,13 +1626,12 @@ int File::GetLUTNbits()
           }
         return true;
         }
-   
      return false;
    }
 
 /**
  *\brief gets the info from 0028,1052 : Rescale Intercept
- * @return Rescale Intercept. defaulted to 0.0 is not found or empty
+ * @return Rescale Intercept. defaulted to 0.0 if not found or empty
  */
 double File::GetRescaleIntercept()
 {
@@ -1656,7 +1648,7 @@ double File::GetRescaleIntercept()
 
 /**
  *\brief   gets the info from 0028,1053 : Rescale Slope
- * @return Rescale Slope. defaulted to 1.0 is not found or empty
+ * @return Rescale Slope. defaulted to 1.0 if not found or empty
  */
 double File::GetRescaleSlope()
 {
@@ -1839,7 +1831,7 @@ void File::AnonymizeNoLoad()
          gdcmWarningMacro( "You cannot 'Anonymize' a SeqEntry ");
          continue;
       }
-      
+
       valLgth = (*it).Value.size();
       if (valLgth == 0)
          continue;
@@ -2012,7 +2004,7 @@ bool File::Write(std::string fileName, FileType writetype)
          // no (GrPixel, NumPixel) element
          std::string s_lgPix = Util::Format("%d", i_lgPix+12);
          s_lgPix = Util::DicomString( s_lgPix.c_str() );
-         InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL");   
+         InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL");
       }
    }
    Document::WriteContent(fp, writetype);
@@ -2251,7 +2243,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElem)
           << "   but instead we encountered tag ("
           << DictEntry::TranslateToKey(itemTagGroup,itemTagElem) << ")"
           << "  at address: " << "  0x(" << std::hex 
-          << (unsigned int)positionOnEntry  << std::dec << ")" 
+          << (unsigned int)positionOnEntry  << std::dec << ")"
           ) ;
       Fp->seekg(positionOnEntry, std::ios::beg);
 
@@ -2288,7 +2280,7 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElem)
    }
                                                                                 
    //// Then read the associated Item Length
-   
+
    // long currentPosition = Fp->tellg(); // save time // JPRx
    uint32_t itemLength  = ReadInt32();
    gdcmDebugMacro( "Basic Item Length is: " << itemLength 
diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index b0c6dccf..ab5f7c32 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 16:48:59 $
-  Version:   $Revision: 1.132 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.133 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMFILE_H
-#define GDCMFILE_H
+#ifndef _GDCMFILE_H_
+#define _GDCMFILE_H_
 
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
@@ -120,7 +120,7 @@ public:
    int GetYSize();
    int GetZSize();
    int GetTSize(); // unnormalized in DICOM V3
-   
+
    bool GetSpacing(float &xspacing, float &yspacing, float &zspacing);
    float GetXSpacing();
    float GetYSpacing();
@@ -129,7 +129,7 @@ public:
    float GetXOrigin();
    float GetYOrigin();
    float GetZOrigin();
-   
+
    float GetXCosineOnX();
    float GetXCosineOnY();  
    float GetXCosineOnZ();
diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index 1e3165b2..2e215d55 100644
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2007/08/21 12:51:09 $
-  Version:   $Revision: 1.51 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMFILEHELPER_H
-#define GDCMFILEHELPER_H
+#ifndef _GDCMFILEHELPER_H_
+#define _GDCMFILEHELPER_H_
 
 #include "gdcmDebug.h"
 #include "gdcmRefCounter.h"
diff --git a/src/gdcmGlobal.h b/src/gdcmGlobal.h
index 8b1ca815..fbe1e458 100644
--- a/src/gdcmGlobal.h
+++ b/src/gdcmGlobal.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:10 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMGLOBAL_H
-#define GDCMGLOBAL_H
+#ifndef _GDCMGLOBAL_H_
+#define _GDCMGLOBAL_H_
 
 #include "gdcmCommon.h"
 
diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index f7f1f1df..02b7a071 100644
--- a/src/gdcmJPEGFragment.cxx
+++ b/src/gdcmJPEGFragment.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:10 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -67,11 +67,13 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
    }
    else if ( nBits <= 12 )
    {
+       assert( nBits >= 8 );
       // JPEG Lossy : call to IJG 6b - 12 bits
       ReadJPEGFile12 ( fp, buffer, statesuspension);
    }
    else if ( nBits <= 16 )
    {
+       assert( nBits >= 12 );
       // JPEG Lossy : call to IJG 6b - 16 bits
       ReadJPEGFile16 ( fp, buffer, statesuspension);
       //gdcmAssertMacro( IsJPEGLossless );
diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index ea16b361..b3cb8c25 100644
--- a/src/gdcmJPEGFragment.h
+++ b/src/gdcmJPEGFragment.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:10 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMJPEGFRAGMENT_H
-#define GDCMJPEGFRAGMENT_H
+#ifndef _GDCMJPEGFRAGMENT_H_
+#define _GDCMJPEGFRAGMENT_H_
 
 #include "gdcmBase.h"
 
@@ -39,7 +39,7 @@ namespace GDCM_NAME_SPACE
  *        a given Document as they are JPEG fragments and they are
  *        collected in a \ref JPEGFragmentsInfo )
  */
-   class GDCM_EXPORT JPEGFragment : public Base
+class GDCM_EXPORT JPEGFragment : public Base
 {
 public:
    JPEGFragment();
diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index ad796939..c4892ac5 100644
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:10 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMJPEGFRAGMENTSINFO_H
-#define GDCMJPEGFRAGMENTSINFO_H
+#ifndef _GDCMJPEGFRAGMENTSINFO_H_
+#define _GDCMJPEGFRAGMENTSINFO_H_
 
 #include "gdcmJPEGFragment.h"
 
diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 0f3dd173..3e65fed2 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/07/13 08:17:21 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -107,7 +107,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
   opj_dinfo_t* dinfo;  /* handle to a decompressor */
   opj_cio_t *cio;
   unsigned char *src = (unsigned char*)inputdata; 
-  int file_length = inputlength;
+  int file_length = static_cast< int >( inputlength );
 
   /* configure the event callbacks (not required) */
   memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
@@ -372,7 +372,8 @@ bool gdcm_write_JPEG2000_file (std::ostream *fp, char *inputdata, size_t inputle
   /* decode the source image */
   /* ----------------------- */
 
-  image = rawtoimage((char*)inputdata, &parameters, inputlength, 
+  image = rawtoimage((char*)inputdata, &parameters, 
+    static_cast<int>( inputlength ), 
     image_width, image_height,
     sample_pixel, bitsallocated, sign, quality);
   if (!image) {
diff --git a/src/gdcmMacro.h b/src/gdcmMacro.h
index 561d99fd..2ff5cfba 100644
--- a/src/gdcmMacro.h
+++ b/src/gdcmMacro.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmMacro.h,v $
   Language:  C++
-  Date:      $Date: 2006/05/23 14:16:08 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMMACRO_H
-#define GDCMMACRO_H
+#ifndef _GDCMMACRO_H_
+#define _GDCMMACRO_H_
 
 //-----------------------------------------------------------------------------
 #define gdcmTypeMacro(type)               \
diff --git a/src/gdcmMpeg.cxx b/src/gdcmMpeg.cxx
index 577775b0..25493fab 100644
--- a/src/gdcmMpeg.cxx
+++ b/src/gdcmMpeg.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmMpeg.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/08/21 12:51:09 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -185,6 +185,9 @@ static int Headers()
 
   return ret;
 }
+
+
+
 static int Decode_Bitstream()
 {
   int ret;
diff --git a/src/gdcmOrientation.h b/src/gdcmOrientation.h
index e5382386..c36b9196 100644
--- a/src/gdcmOrientation.h
+++ b/src/gdcmOrientation.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmOrientation.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMORIENTATION_H
-#define GDCMORIENTATION_H
+#ifndef _GDCMORIENTATION_H_
+#define _GDCMORIENTATION_H_
 
 #include "gdcmRefCounter.h"
 #include <map>
diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 5d363b9d..36b0bb73 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMPIXELREADCONVERT_H
-#define GDCMPIXELREADCONVERT_H
+#ifndef _GDCMPIXELREADCONVERT_H_
+#define _GDCMPIXELREADCONVERT_H_
 
 #include "gdcmBase.h"
 #include "gdcmFileHelper.h"
diff --git a/src/gdcmPixelWriteConvert.cxx b/src/gdcmPixelWriteConvert.cxx
index fe6b870e..ffa08cc3 100644
--- a/src/gdcmPixelWriteConvert.cxx
+++ b/src/gdcmPixelWriteConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelWriteConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/08/21 12:51:10 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -196,7 +196,7 @@ void UpdateBasicOffsetTable(std::ostream *fp, JpegVector const &v, size_t pos)
     const JpegPair &jp = *i;
     if(i == v.begin() ){ assert( jp.first - first.first == 0); }
     uint32_t offset = (uint32_t)(jp.first - first.first);
-    gdcm::binary_write(*fp, offset);
+    GDCM_NAME_SPACE::binary_write(*fp, offset);
     //std::cerr << "Updating Table:" << jp.first - first.first << std::endl;
     }
 }
@@ -231,7 +231,7 @@ void CloseJpeg(std::ostream *fp, JpegVector &v)
 
 // I need to pass the File*. I do not understand how PixelWriteConvert is supposed
 // to access this information otherwise
-// size can now be computer from File attributes (what an API...)
+// size can now be computed from File attributes (what an API...)
 void PixelWriteConvert::SetCompressJPEG2000UserData(uint8_t *data, size_t size, File *image)
 {
   Compressed = true;
diff --git a/src/gdcmPixelWriteConvert.h b/src/gdcmPixelWriteConvert.h
index c71ff5c9..8764adf0 100644
--- a/src/gdcmPixelWriteConvert.h
+++ b/src/gdcmPixelWriteConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelWriteConvert.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/13 08:17:21 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMPIXELWRITECONVERT_H
-#define GDCMPIXELWRITECONVERT_H
+#ifndef _GDCMPIXELWRITECONVERT_H_
+#define _GDCMPIXELWRITECONVERT_H_
 
 #include "gdcmCommon.h"
 #include "gdcmBase.h"
@@ -72,7 +72,7 @@ private:
    /// Size of User image.
    size_t   UserDataSize;
 
-   /// Whether we want to write compressed
+   /// Whether we want to write compressed or not
    bool Compressed;
 };
 } // end namespace gdcm
diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h
index 0a09a007..e6cc6882 100644
--- a/src/gdcmRLEFrame.h
+++ b/src/gdcmRLEFrame.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFrame.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMRLEFRAME_H
-#define GDCMRLEFRAME_H
+#ifndef _GDCMRLEFRAME_H_
+#define _GDCMRLEFRAME_H_
 
 #include "gdcmBase.h"
 
diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index 2c66578c..dfabdf4b 100644
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,8 +17,8 @@
 =========================================================================*/
 
 
-#ifndef GDCMRLEFRAMESINFO_H
-#define GDCMRLEFRAMESINFO_H
+#ifndef _GDCMRLEFRAMESINFO_H_
+#define _GDCMRLEFRAMESINFO_H_
 
 #include "gdcmRLEFrame.h"
 
diff --git a/src/gdcmRefCounter.h b/src/gdcmRefCounter.h
index d528b7b8..25ecce97 100644
--- a/src/gdcmRefCounter.h
+++ b/src/gdcmRefCounter.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRefCounter.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMREFCOUNTER_H
-#define GDCMREFCOUNTER_H
+#ifndef _GDCMREFCOUNTER_H_
+#define _GDCMREFCOUNTER_H_
 
 #include "gdcmBase.h"
 //#include "gdcmDebug.h"
diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 4231f320..ba147753 100644
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#ifndef GDCMSQITEM_H
-#define GDCMSQITEM_H
+#ifndef _GDCMSQITEM_H_
+#define _GDCMSQITEM_H_
 
 #include "gdcmDocEntrySet.h"
 #include "gdcmElementSet.h"
diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h
index 488b3758..a0c167eb 100644
--- a/src/gdcmSeqEntry.h
+++ b/src/gdcmSeqEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSeqEntry.h,v $
   Language:  C++
-  Date:      $Date: 2007/07/26 08:36:49 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMSQDOCENTRY_H
-#define GDCMSQDOCENTRY_H
+#ifndef _GDCMSQDOCENTRY_H_
+#define _GDCMSQDOCENTRY_H_
 
 #include "gdcmDocEntry.h"
 
diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 1345de5b..b3d4b619 100644
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2007/06/08 12:49:37 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMSERIEHELPER_H
-#define GDCMSERIEHELPER_H
+#ifndef _GDCMSERIEHELPER_H_
+#define _GDCMSERIEHELPER_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmTagKey.h" 
diff --git a/src/gdcmSystem.h b/src/gdcmSystem.h
index 5e392027..ce032185 100644
--- a/src/gdcmSystem.h
+++ b/src/gdcmSystem.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSystem.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/19 12:01:51 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMSYSTEM_H
-#define GDCMSYSTEM_H
+#ifndef _GDCMSYSTEM_H_
+#define _GDCMSYSTEM_H_
 
 #include "gdcmConfigure.h"
 
diff --git a/src/gdcmTS.h b/src/gdcmTS.h
index 87c13913..deb30770 100644
--- a/src/gdcmTS.h
+++ b/src/gdcmTS.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMTS_H
-#define GDCMTS_H
+#ifndef _GDCMTS_H_
+#define _GDCMTS_H_
 
 #include "gdcmRefCounter.h"
 
diff --git a/src/gdcmTagKey.h b/src/gdcmTagKey.h
index 168b03dd..e861bcd5 100644
--- a/src/gdcmTagKey.h
+++ b/src/gdcmTagKey.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTagKey.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMTAGKEY_H
-#define GDCMTAGKEY_H
+#ifndef _GDCMTAGKEY_H_
+#define _GDCMTAGKEY_H_
 
 #include "gdcmCommon.h"
 
diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index e1f823e8..5a53b688 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:11 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.69 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMUTIL_H
-#define GDCMUTIL_H
+#ifndef _GDCMUTIL_H_
+#define _GDCMUTIL_H_
 
 #include "gdcmCommon.h"
 #include <vector>
@@ -149,7 +149,7 @@ private:
   ghost@aladdin.com
 */
 
-/* $Id: gdcmUtil.h,v 1.68 2007/05/23 14:18:11 jpr Exp $ */
+/* $Id: gdcmUtil.h,v 1.69 2007/08/22 16:14:05 jpr Exp $ */
 /*
   Independent implementation of MD5 (RFC 1321).
   This code implements the MD5 Algorithm defined in RFC 1321, whose
diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index b187b30f..e33d5e02 100644
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:12 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMVR_H
-#define GDCMVR_H
+#ifndef _GDCMVR_H_
+#define _GDCMVR_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
diff --git a/src/gdcmVRKey.h b/src/gdcmVRKey.h
index 31221e29..2ef89e2a 100644
--- a/src/gdcmVRKey.h
+++ b/src/gdcmVRKey.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVRKey.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:12 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMVRKEY_H
-#define GDCMVRKEY_H
+#ifndef _GDCMVRKEY_H_
+#define _GDCMVRKEY_H_
 
 #include "gdcmCommon.h"
 
diff --git a/src/gdcmValidator.h b/src/gdcmValidator.h
index e63b1e93..9366f62a 100644
--- a/src/gdcmValidator.h
+++ b/src/gdcmValidator.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValidator.h,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:12 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2007/08/22 16:14:05 $
+  Version:   $Revision: 1.7 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,8 +16,8 @@
  
 =========================================================================*/
 
-#ifndef GDCMVALIDATOR_H
-#define GDCMVALIDATOR_H
+#ifndef _GDCMVALIDATOR_H_
+#define _GDCMVALIDATOR_H_
 
 #include "gdcmRefCounter.h"
 
diff --git a/src/gdcmopenjpeg/libopenjpeg/bio.c b/src/gdcmopenjpeg/libopenjpeg/bio.c
index 3dfd7cf7..221c8bb5 100644
--- a/src/gdcmopenjpeg/libopenjpeg/bio.c
+++ b/src/gdcmopenjpeg/libopenjpeg/bio.c
@@ -125,7 +125,7 @@ void bio_destroy(opj_bio_t *bio) {
 }
 
 int bio_numbytes(opj_bio_t *bio) {
-  return (bio->bp - bio->start);
+return (int)(bio->bp - bio->start);
 }
 
 void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) {
-- 
2.45.1