From 951d1f96c7bff6329f19fa28444fae5c941c352d Mon Sep 17 00:00:00 2001 From: regrain Date: Wed, 31 Aug 2005 09:01:58 +0000 Subject: [PATCH] * Fix JPR compilation errors on MSVC.Net 2003 -- BeNours --- gdcmPython/gdcm.i | 7 ------- vtk/vtkgdcmSerieViewer.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i index e230f450..bb21af1b 100644 --- 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 3f981b12..e9ae51c0 100644 --- 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; -- 2.45.1