* Fix JPR compilation errors on MSVC.Net 2003

   -- BeNours

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index e230f450fda6d2aa0d32649abf3b83b9eb968891..bb21af1be49a10ff9c3c23ef2ac41494eb30f819 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -220,13 +220,6 @@ typedef unsigned long long uint64_t;
 %constant const char *NOTLOADED = "gdcm::NotLoaded";
 %constant const char *UNREAD    = "gdcm::UnRead";
 
-/*
-%constant unsigned int LD_ALL         = 0x00000000;
-%constant unsigned int LD_NOSEQ       = 0x00000001;
-%constant unsigned int LD_NOSHADOW    = 0x00000002;
-%constant unsigned int LD_NOSHADOWSEQ = 0x00000004;
-*/
-
 ////////////////////////////////////////////////////////////////////////////
 // Warning: Order matters !
 %include "gdcmCommon.h"

diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx
index 3f981b124616bf6dc59f9be90026d84e02c44c0a..e9ae51c02eb61997cf5d8d09dd934e40c7b5385f 100644 (file)
--- a/vtk/vtkgdcmSerieViewer.cxx
+++ b/vtk/vtkgdcmSerieViewer.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmSerieViewer.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/31 08:37:53 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/08/31 09:01:59 $
+  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
@@ -53,8 +53,8 @@
 
 void userSuppliedMirrorFunction (uint8_t *im, gdcm::File *f);
 void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f);
-bool userSuppliedLessThanFunction(gdcm::File *f, gdcm::File *f);
-bool userSuppliedLessThanFunction2(gdcm::File *f, gdcm::File *f);
+bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2);
+bool userSuppliedLessThanFunction2(gdcm::File *f1, gdcm::File *f2);
 
 int orderNb;
 uint16_t *elemsToOrderOn;