Fix warnings, add a GDCM_DATA_ROOT to CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cb746f9512461683a8a02d927ac608f34470e62..0ada9b14e5bdbc8fe418706252dd63295e9387c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,14 @@ SUBDIRS(
   Test\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# Adding GDCM_DATA_ROOT\r
+FIND_PATH(GDCM_DATA_ROOT gdcm-ACR-LibIDO.acr\r
+       ${GDCM_SOURCE_DIR}/../gdcmData \r
+       $ENV{GDCM_DATA}\r
+       $ENV{PUB_DICT_PATH}/../../gdcmData\r
+)\r
+\r
 #-----------------------------------------------------------------------------\r
 # Add the testing directories\r
 OPTION(GDCM_BUILD_TESTING "Test the project" ON)\r

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 0b27899a2762221658936f06381f75dcb1193395..9ff25734e48687a6d69b69fa276e7f8d1baaa658 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -15,17 +15,22 @@ ENDIF(NOT CMAKE_HAVE_STDINT_H)
 
 
 SET(TEST_SOURCES
-  PrintHeader.cxx
-  testWrite.cxx
-  testChangeEntete.cxx
+  PrintHeader.cxx #require test.acr
+  bug1.cxx        #require test.acr
+  dcm2acr.cxx     #require test.acr
   hashtest.cxx
-  bug1.cxx
-  pourFindTaggs.cxx
-  dcm2acr.cxx
-  PrintDicomDir.cxx
   makeDicomDir.cxx
   testDicomDir.cxx
+  testWrite.cxx
 )
+IF (GDCM_DATA_ROOT)
+       # add tests that require data
+       SET(TEST_SOURCES ${TEST_SOURCES}     
+         PrintDicomDir.cxx
+    pourFindTaggs.cxx
+    testChangeEntete.cxx
+  )
+ENDIF (GDCM_DATA_ROOT)
 
 # include stuff
 INCLUDE_DIRECTORIES(

diff --git a/Testing/TestChangeHeader.cxx b/Testing/TestChangeHeader.cxx
index d33fc1f2bdcc59ec41232c4207b8879bfcfce2c9..9dbbf7a3631f47cf62a589b5c9f551ade847bdf4 100644 (file)
--- a/Testing/TestChangeHeader.cxx
+++ b/Testing/TestChangeHeader.cxx
@@ -19,8 +19,9 @@ int testChangeEntete(int argc, char* argv[]) {
        int dataSize;
                
        if (argc < 3) {
-               printf ("usage :\n testChangeEntete nomFichierPourEntete nomFichierPourDonnées \n");
-               exit(0);        
+               std::cerr << "usage :" << std::endl << 
+      argv[0] << " nomFichierPourEntete nomFichierPourDonnées" << std::endl;
+               return 0;       
        }
 
        premier = argv[1];

diff --git a/Testing/TestHash.cxx b/Testing/TestHash.cxx
index f0af57bb6745d2b756724ff48b983752e96a4fe3..230550ee1fd465d52afecab8565894bceda0b2d0 100644 (file)
--- a/Testing/TestHash.cxx
+++ b/Testing/TestHash.cxx
@@ -32,7 +32,7 @@ int hashtest( int, char * [] ) {
        // Voir :
        //http://www.developer.com/net/cplus/article.php/10919_2119781_3
        //
-       // domage que ca ne marche pas ...
+       // dommage que ca ne marche pas ...
 
   return 0;
 }

diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 29304688997ce21e4917f22eefab871c5c952fc2..c8647471ceef57b6e3fc129fe8213291906c44ac 100644 (file)
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -151,7 +151,7 @@ float gdcmHeaderHelper::GetXSpacing() {
   * @return Y dimension of a pixel
   */
 float gdcmHeaderHelper::GetYSpacing() {
-   float xspacing, yspacing;
+   float yspacing;
    std::string StrSpacing = GetEntryByNumber(0x0028,0x0030);
   
    if (StrSpacing == GDCM_UNFOUND) {