ENH: Allow compilation with a not so famous compiler (gdcmDocument.cxx). Also put...

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 857f12de05ca1a44e4acbc750d1599e2752f1c29..e9adffe5c78d026fe4e5cb50f746a698a1b89d99 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/06 22:31:31 $
-  Version:   $Revision: 1.96 $
+  Date:      $Date: 2004/10/07 04:17:58 $
+  Version:   $Revision: 1.97 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2926,10 +2926,10 @@ void gdcmDocument::ComputeRLEInfo()
        // Store the collected info
        gdcmRLEFrame* newFrameInfo = new gdcmRLEFrame;
        newFrameInfo->NumberFragments = nbRleSegments;
-       for( unsigned int k = 1; k <= nbRleSegments; k++ )
+       for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
        {
-          newFrameInfo->Offset[k] = frameOffset + rleSegmentOffsetTable[k];
-          newFrameInfo->Length[k] = rleSegmentLength[k];
+          newFrameInfo->Offset[uk] = frameOffset + rleSegmentOffsetTable[uk];
+          newFrameInfo->Length[uk] = rleSegmentLength[uk];
        }
        RLEInfo.Frames.push_back( newFrameInfo );
    }

diff --git a/src/jpeg/CMakeLists.txt b/src/jpeg/CMakeLists.txt
index 8a7e5f379db92df29320af2b16fcadd10295ed9a..dfe598c2662eda8d2204559a2e8b558b74d83884 100644 (file)
--- a/src/jpeg/CMakeLists.txt
+++ b/src/jpeg/CMakeLists.txt
@@ -57,6 +57,13 @@ SET(JPEG_SOURCES
   ${decompression_SRCS}
   )
 
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJPEGDLL)
+  ELSE (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJPEGSTATIC)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
 
 # Attempt to generate two libraries: jpeg 8bits and 12 bits using only one
 # source directory