ENH: Refactor some code

[gdcm.git] / Testing / CMakeLists.txt

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 43b987ad651a0d26366cad8b0d39843fffd662ab..89a40dc117ff163e39c65764fb29c590a4dbdac3 100644 (file)
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -18,11 +18,12 @@ IF (GDCM_DATA_ROOT)
     TestReadWriteReadCompare.cxx     # includes generated gdcmDataImages.h 
     PrintAllDocument.cxx             # includes generated gdcmDataImages.h
     TestAllReadCompareDicom.cxx      # includes generated gdcmDataImages.h
+    TestAllEntryVerify.cxx           # includes generated gdcmDataImages.h
     PrintDicomDir.cxx
     TestChangeHeader.cxx
-    TestDicomDir.cxx      #require DICOMDIR
-    BuildUpDicomDir.cxx
-    makeDicomDir.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+   # BuildUpDicomDir.cxx
+   # makeDicomDir.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -76,7 +77,7 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   FILE(GLOB GDCM_DATA_IMAGES_GLOB
     "${GDCM_DATA_ROOT}/*.acr"
     "${GDCM_DATA_ROOT}/*.dcm"
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     "${GDCM_DATA_ROOT}/*.ima"
     )
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
@@ -88,7 +89,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     "${GDCM_DATA_ROOT}/*.dcm"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA
-#    "${GDCM_DATA_ROOT}/*.nema"
+    "${GDCM_DATA_ROOT}/*.nema"
     )
   FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA
     "${GDCM_DATA_ROOT}/*.ima"
@@ -101,27 +102,34 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 
 # Black list of images known to break lots of readers (efilm, xmedcon ...):
 SET(BLACK_LIST
-  "gdcm-JPEG-LossLessThoravision.dcm" # serial killer
-  "cr172241.dcm"           #temporarily remove as it kills my gnome session
-                           # (but not kde)
-  "emptyImage.dcm"         #the png looks ugly...
-  "irmPhlipsNew1.dcm"      #png looks ugly
-  "mriThruVPRO.dcm"        #png looks ugly
-  "gdcm-MR-SIEMENS-16-1.acr"   #segfaults TestReadWriteReadCompare
-  #segfaults TestReadWriteReadCompare: this image looks corrupted:
-  # - it's pixel data is 132096 bytes long
-  # - it has a size of 256x256 with 16 bytes per pixel, i.e. a size
-  #   of 256*256*2 = 131072 bytes.
-  # Since there is a missmatch, when we have the following call stack:
-  #  gdcmFile::GetImageData()
-  #     PixelData = new uint8_t[ImageDataSize];
-  #     \--->::GetImageDataIntoVector(destination, ImageDataSize)
-  #       \---> ::ReadPixelData(destination)
-  #         \---> fread(destination, Header->GetPixelAreaLength(), 1, fp);
-  # we get a segfault because :
-  #   - destination is ImageDataSize i.e. 131072 bytes long
-  #   - Header->GetPixelAreaLength() = 132096 bytes long
-  "oldACR00001.ima"
+  # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
+  "gdcm-JPEG-LossLessThoravision.dcm"
+  #temporarily remove as it kills my gnome session (but not kde)
+  "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
+  #png looks ugly
+  "emptyImage.dcm"
+  #png looks ugly
+  "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm"
+  #png looks ugly
+  "mriThruVPRO.dcm"
+  #segfaults TestReadWriteReadCompare (same pb as below) 
+  "gdcm-MR-SIEMENS-16-1.acr"
+  # see comments in gdcmData ref file TestAllEntryVerifyReference.txt
+  "SIEMENS_GBS_III-16-ACR_NEMA_1.acr"
+  #segfaults TestReadWriteReadCompare (pixels not parsed properly):
+  "I9000001.dcm"
+  "PICKER-16-MONO2-Nested_icon.dcm"
+  "SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm"
+  # Fails on TestAllReadCompareDicom at the RE-reading stage with message:
+  #    Big trouble : Pixel Element (7fe0,10) NOT found
+  # The temporary file GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm
+  # stops after the first binEntry (binary entry) as can be seen with
+  #   " gdcmbin/bin/PrintHeader 
+  #         GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm "
+  # and effectively the pixels are missing (as well as all the entries
+  # after tag 0029|1010)
+  # Note: this file was previously known as E00001S03I0015.dcm
+  "SIEMENS_Sonata-12-MONO2-SQ.dcm"
   )
 
 #   gdcm-ACR-LibIDO seems to be cut