Gert Wollny · Gert Wollny · Gert Wollny · 614f18d7 · 614f18d7 · 614f18d7
--- a/CMake/FindMONO.cmake
+++ b/CMake/FindMONO.cmake
@@ -69,7 +69,8 @@ mark_as_advanced(
  MCS_EXECUTABLE
  GMCS_EXECUTABLE
  SMCS_EXECUTABLE
+  DMCS_EXECUTABLE
+  GACUTIL_EXECUTABLE
  ILASM_EXECUTABLE
  SN_EXECUTABLE
-  GACUTIL_EXECUTABLE
 )
--- a/CMake/UseJavaTest.cmake
+++ b/CMake/UseJavaTest.cmake
@@ -76,8 +76,8 @@ macro(ADD_JAVA_TEST TESTNAME FILENAME)
  message(\"ld_library_path: ${ld_library_path}\")
  message(\"loc: ${loc}\")
  message(\"loc2: ${loc2}\")
-  message(\"JavaProp_PATH_SEPARATOR: ${JavaProp_PATH_SEPARATOR}\")
-  message(\"classpath: ${classpath}\")
+  message(\"JavaProp_PATH_SEPARATOR: \"${JavaProp_PATH_SEPARATOR}\"\")
+  message(\"classpath: \"${classpath}\"\")
  message(\"java runtime: ${Java_JAVA_EXECUTABLE}\")
  #message( \"wo_semicolumn: ${wo_semicolumn}\" )
  execute_process(

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 #----------------------------------------------------------------------------

 project(GDCM
-  VERSION 3.0.1
+  VERSION 3.0.2
  LANGUAGES CXX C
 )
 ## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0

--- a/Examples/Cxx/DumpGEMSMovieGroup.cxx
+++ b/Examples/Cxx/DumpGEMSMovieGroup.cxx
@@ -278,7 +278,7 @@ bool print36( gdcm::DataSet const & ds10, gdcm::SequenceOfItems *sqi_dict, std::
  gdcm::SmartPointer<gdcm::SequenceOfItems> sqi_values36 = seq_values36.GetValueAsSQ();

  size_t ni3 = sqi_values36->GetNumberOfItems();
-  assert( ni3 == 1 );
+  assert( ni3 >= 1 );
  for( size_t i3 = 1; i3 <= ni3; ++i3 )
    {
    gdcm::Item &item_36 = sqi_values36->GetItem(i3);

--- a/Source/Common/CMakeLists.txt
+++ b/Source/Common/CMakeLists.txt
@@ -209,9 +209,6 @@ if(GDCM_USE_SYSTEM_OPENSSL)
  target_link_libraries(gdcmCommon LINK_PRIVATE ${OPENSSL_LIBRARIES})
 endif()
 set_target_properties(gdcmCommon PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set_target_properties(gdcmCommon PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "")
-endif()

 # libs
 install_library(gdcmCommon)

--- a/Source/Common/gdcmTesting.cxx
+++ b/Source/Common/gdcmTesting.cxx
@@ -445,6 +445,7 @@ static const LossyFile gdcmLossyFilenames[] = {
 { 0,"EmptyIcon_Bug417.dcm" },
 { 0,"EnhancedWithIPPPerFrameIOPShared.dcm" },
 { 0,"FUJI-ffff-MONO1-J2K.dcm" },
+{ 0,"JPEGLosslessSeNonZero.dcm" },
 { 0, nullptr }
 };


--- a/Source/DataDictionary/CMakeLists.txt
+++ b/Source/DataDictionary/CMakeLists.txt
@@ -98,9 +98,6 @@ set(DICT_SRCS
 add_library(gdcmDICT ${DICT_SRCS})
 target_link_libraries(gdcmDICT LINK_PRIVATE gdcmDSED gdcmIOD)
 set_target_properties(gdcmDICT PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set_target_properties(gdcmDICT PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "")
-endif()

 # libs
 install_library(gdcmDICT)

--- a/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
+++ b/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
@@ -90,10 +90,6 @@ target_link_libraries(gdcmDSED LINK_PUBLIC gdcmCommon)
 # zlib stuff are actually included (template) so we need to link them here.
 target_link_libraries(gdcmDSED LINK_PRIVATE ${GDCM_ZLIB_LIBRARIES})
 set_target_properties(gdcmDSED PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set(_ill "gdcmCommon")
-  #set_target_properties(gdcmDSED PROPERTIES INTERFACE_LINK_LIBRARIES "${_ill}" LINK_INTERFACE_LIBRARIES "${_ill}")
-endif()

 # libs
 install_library(gdcmDSED)

--- a/Source/InformationObjectDefinition/CMakeLists.txt
+++ b/Source/InformationObjectDefinition/CMakeLists.txt
@@ -49,10 +49,6 @@ add_library(gdcmIOD ${IOD_SRCS})
 target_link_libraries(gdcmIOD LINK_PUBLIC gdcmDSED gdcmCommon)
 target_link_libraries(gdcmIOD LINK_PRIVATE ${GDCM_EXPAT_LIBRARIES})
 set_target_properties(gdcmIOD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set(_ill "gdcmDSED;gdcmCommon")
-  #set_target_properties(gdcmIOD PROPERTIES INTERFACE_LINK_LIBRARIES "${_ill}" LINK_INTERFACE_LIBRARIES "${_ill}")
-endif()

 # libs
 install_library(gdcmIOD)

--- a/Source/MediaStorageAndFileFormat/CMakeLists.txt
+++ b/Source/MediaStorageAndFileFormat/CMakeLists.txt
@@ -219,10 +219,6 @@ endif()
 # handling of static lib within shared is a mess:
 #target_link_libraries(gdcmMSFF gdcmrle)
 set_target_properties(gdcmMSFF PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set(_ill "gdcmDSED;gdcmDICT;gdcmIOD")
-  #set_target_properties(gdcmMSFF PROPERTIES INTERFACE_LINK_LIBRARIES "${_ill}" LINK_INTERFACE_LIBRARIES "${_ill}")
-endif()

 # libs
 install_library(gdcmMSFF)

--- a/Source/MediaStorageAndFileFormat/gdcmImageHelper.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmImageHelper.cxx
@@ -207,9 +207,10 @@ static bool ComputeZSpacingFromIPP(const DataSet &ds, double &zspacing)
  dc.Cross( normal );

  // For each item
-  std::vector<double> distances;
  SequenceOfItems::SizeType nitems = sqi->GetNumberOfItems();
+  if( nitems > 1 ) {
  std::vector<double> dircos_subds2; dircos_subds2.resize(6);
+  std::vector<double> distances;
  for(SequenceOfItems::SizeType i0 = 1; i0 <= nitems; ++i0)
    {
    const Item &item = sqi->GetItem(i0);
@@ -280,6 +281,31 @@ static bool ComputeZSpacingFromIPP(const DataSet &ds, double &zspacing)
      prev = distances[i];
      }
    }
+  } else {
+    // single slice
+    const Tag tfgs0(0x5200,0x9229);
+    if( !ds.FindDataElement( tfgs0 ) ) return false;
+    SmartPointer<SequenceOfItems> sqi = ds.GetDataElement( tfgs0 ).GetValueAsSQ();
+    if( !(sqi && sqi->GetNumberOfItems() > 0) ) return false;
+    // Get first item:
+    const Item &item = sqi->GetItem(1);
+    const DataSet & subds = item.GetNestedDataSet();
+    // <entry group="0028" element="9110" vr="SQ" vm="1" name="Pixel Measures Sequence"/>
+    const Tag tpms(0x0028,0x9110);
+    if( !subds.FindDataElement(tpms) ) return false;
+    //const SequenceOfItems * sqi2 = subds.GetDataElement( tpms ).GetSequenceOfItems();
+    SmartPointer<SequenceOfItems> sqi2 = subds.GetDataElement( tpms ).GetValueAsSQ();
+    assert( sqi2 );
+    const Item &item2 = sqi2->GetItem(1);
+    const DataSet & subds2 = item2.GetNestedDataSet();
+    // <entry group="0028" element="0030" vr="DS" vm="2" name="Pixel Spacing"/>
+    const Tag tps(0x0018,0x0088);
+    if( !subds2.FindDataElement(tps) ) return false;
+    const DataElement &de = subds2.GetDataElement( tps );
+    Attribute<0x0018,0x0088> at;
+    at.SetFromDataElement( de );
+    zspacing = at.GetValue();
+  }
  return true;
 }

@@ -424,8 +450,10 @@ std::vector<double> ImageHelper::GetOriginValue(File const & f)
   || ms == MediaStorage::EnhancedMRImageStorage
   || ms == MediaStorage::EnhancedPETImageStorage
   || ms == MediaStorage::OphthalmicTomographyImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
   || ms == MediaStorage::SegmentationStorage
@@ -554,8 +582,10 @@ std::vector<double> ImageHelper::GetDirectionCosinesValue(File const & f)
  if( ms == MediaStorage::EnhancedCTImageStorage
   || ms == MediaStorage::EnhancedMRImageStorage
   || ms == MediaStorage::EnhancedPETImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
   || ms == MediaStorage::SegmentationStorage
@@ -851,10 +881,12 @@ void ImageHelper::SetDimensionsValue(File& f, const Pixmap & img)
    ds.Replace( columns.GetAsDataElement() );
    Attribute<0x0028,0x0008> numframes = { 0 };
    numframes.SetValue( dims[2] );
-    if( img.GetNumberOfDimensions() == 3 && dims[2] > 1 )
+    if( img.GetNumberOfDimensions() == 3 && dims[2] >= 1 )
    {
      if( ms.MediaStorage::GetModalityDimension() > 2 )
        ds.Replace( numframes.GetAsDataElement() );
+      else if( ms.MediaStorage::GetModalityDimension() == 2 && dims[2] == 1 )
+        ds.Remove( numframes.GetTag() );
      else
      {
        gdcmErrorMacro( "MediaStorage does not allow 3rd dimension. But value is: " << dims[2] );
@@ -885,8 +917,10 @@ void ImageHelper::SetDimensionsValue(File& f, const Pixmap & img)
  if( ms == MediaStorage::EnhancedCTImageStorage
   || ms == MediaStorage::EnhancedMRImageStorage
   || ms == MediaStorage::EnhancedPETImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
   || ms == MediaStorage::SegmentationStorage
@@ -989,8 +1023,10 @@ std::vector<double> ImageHelper::GetRescaleInterceptSlopeValue(File const & f)
 || ms == MediaStorage::ComputedRadiographyImageStorage
 || ms == MediaStorage::PETImageStorage
 || ms == MediaStorage::SecondaryCaptureImageStorage
- || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+ || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
 || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+ || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+ || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
 || ForceRescaleInterceptSlope
  )
  {
@@ -1226,8 +1262,10 @@ Warning - Dicom dataset contains attributes not present in standard DICOM IOD -
  case MediaStorage::UltrasoundMultiFrameImageStorageRetired:
  // SC:
  case MediaStorage::SecondaryCaptureImageStorage:
+  case MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage:
  case MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage:
  case MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage:
+  case MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage:
  case MediaStorage::HardcopyGrayscaleImageStorage:
    t = Tag(0xffff,0xffff);
    break;
@@ -1265,8 +1303,10 @@ std::vector<double> ImageHelper::GetSpacingValue(File const & f)
    || ms == MediaStorage::EnhancedMRImageStorage
    || ms == MediaStorage::EnhancedPETImageStorage
    || ms == MediaStorage::OphthalmicTomographyImageStorage
-    || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+    || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
    || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+    || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+    || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
    || ms == MediaStorage::XRay3DAngiographicImageStorage
    || ms == MediaStorage::XRay3DCraniofacialImageStorage
    || ms == MediaStorage::SegmentationStorage
@@ -1567,8 +1607,10 @@ void ImageHelper::SetSpacingValue(DataSet & ds, const std::vector<double> & spac
  if( ms == MediaStorage::EnhancedCTImageStorage
   || ms == MediaStorage::EnhancedMRImageStorage
   || ms == MediaStorage::EnhancedPETImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
   || ms == MediaStorage::SegmentationStorage
@@ -1840,8 +1882,10 @@ void ImageHelper::SetOriginValue(DataSet & ds, const Image & image)
   && ms != MediaStorage::PETImageStorage
   //&& ms != MediaStorage::ComputedRadiographyImageStorage
   && ms != MediaStorage::SegmentationStorage
-   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   && ms != MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   && ms != MediaStorage::XRay3DAngiographicImageStorage
   && ms != MediaStorage::XRay3DCraniofacialImageStorage
   && ms != MediaStorage::EnhancedMRImageStorage
@@ -1865,8 +1909,10 @@ void ImageHelper::SetOriginValue(DataSet & ds, const Image & image)
   || ms == MediaStorage::EnhancedPETImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::SegmentationStorage
   || ms == MediaStorage::IVOCTForPresentation
   || ms == MediaStorage::IVOCTForProcessing
@@ -1939,8 +1985,10 @@ void ImageHelper::SetOriginValue(DataSet & ds, const Image & image)
 
    // C.7.6.6.1.2 Frame Increment Pointer
    // (0028,0009) AT (0018,2005)                                        # 4,1-n Frame Increment Pointer
-    if( ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
-        || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage )
+    if( ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
+        || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+        || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+        || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage )
    {
      if( dimz > 1 ) {
      Attribute<0x0028,0x0009> fip;
@@ -1981,8 +2029,10 @@ void ImageHelper::SetDirectionCosinesValue(DataSet & ds, const std::vector<doubl
   && ms != MediaStorage::RTDoseStorage
   && ms != MediaStorage::PETImageStorage
   //&& ms != MediaStorage::ComputedRadiographyImageStorage
-   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   && ms != MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   && ms != MediaStorage::SegmentationStorage
   && ms != MediaStorage::XRay3DAngiographicImageStorage
   && ms != MediaStorage::XRay3DCraniofacialImageStorage
@@ -2024,8 +2074,10 @@ void ImageHelper::SetDirectionCosinesValue(DataSet & ds, const std::vector<doubl
  if( ms == MediaStorage::EnhancedCTImageStorage
   || ms == MediaStorage::EnhancedMRImageStorage
   || ms == MediaStorage::EnhancedPETImageStorage
-   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   || ms == MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   || ms == MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   || ms == MediaStorage::XRay3DAngiographicImageStorage
   || ms == MediaStorage::XRay3DCraniofacialImageStorage
   || ms == MediaStorage::SegmentationStorage
@@ -2115,8 +2167,10 @@ void ImageHelper::SetRescaleInterceptSlopeValue(File & f, const Image & img)
   && ms != MediaStorage::PETImageStorage
   && ms != MediaStorage::RTDoseStorage
   && ms != MediaStorage::SecondaryCaptureImageStorage
-   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeSingleBitSecondaryCaptureImageStorage
   && ms != MediaStorage::MultiframeGrayscaleByteSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeGrayscaleWordSecondaryCaptureImageStorage
+   && ms != MediaStorage::MultiframeTrueColorSecondaryCaptureImageStorage
   && ms != MediaStorage::EnhancedMRImageStorage
   && ms != MediaStorage::EnhancedCTImageStorage
   && ms != MediaStorage::EnhancedPETImageStorage

--- a/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmRescaler.cxx
@@ -311,6 +311,12 @@ bool Rescaler::InverseRescale(char *out, const char *in8, size_t n)
  // else integral type
  switch(PF)
    {
+  case PixelFormat::UINT8:
+    InverseRescaleFunctionIntoBestFit<uint8_t>(out,(uint8_t*)in,n);
+    break;
+  case PixelFormat::INT8:
+    InverseRescaleFunctionIntoBestFit<int8_t>(out,(int8_t*)in,n);
+    break;
  case PixelFormat::UINT16:
    InverseRescaleFunctionIntoBestFit<uint16_t>(out,(const uint16_t*)in,n);
    break;

--- a/Source/MessageExchangeDefinition/CMakeLists.txt
+++ b/Source/MessageExchangeDefinition/CMakeLists.txt
@@ -102,9 +102,6 @@ if(WIN32)
  target_link_libraries(gdcmMEXD LINK_PRIVATE ws2_32)
 endif()
 set_target_properties(gdcmMEXD PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
-if(BUILD_SHARED_LIBS)
-  #set_target_properties(gdcmMEXD PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "")
-endif()

 # libs
 install_library(gdcmMEXD)

--- a/Testing/Source/Common/Cxx/TestMD5.cxx
+++ b/Testing/Source/Common/Cxx/TestMD5.cxx
@@ -242,6 +242,7 @@ static const char * const gdcmMD5SumFiles[][2] = {
 { "fd6ba97f247f5b8ef70f407f5c1b5f11" , "EmptyIcon_Bug417.dcm" },
 { "271d71dde59c0cad76baab36c909a43a" , "EnhancedWithIPPPerFrameIOPShared.dcm" },
 { "2fd5ad3e9265861be43b6a341314cc52" , "FUJI-ffff-MONO1-J2K.dcm" },
+{ "69648b9be35a621e9e5b447df656ab18" , "JPEGLosslessSeNonZero.dcm" },

 { nullptr, nullptr}
 };

--- a/Testing/Source/Common/Cxx/TestSHA1.cxx
+++ b/Testing/Source/Common/Cxx/TestSHA1.cxx
@@ -239,6 +239,7 @@ static const char * const gdcmSHA1SumFiles[][2] = {
 { "f52cac75e6371a8a9b70b2146811b52593cef774" , "EmptyIcon_Bug417.dcm" },
 { "fbca7c76d8c290d6a07aff378526463185b391d0" , "EnhancedWithIPPPerFrameIOPShared.dcm" },
 { "566387063a28df033d891ac48a42dbb3f6b6a65f" , "FUJI-ffff-MONO1-J2K.dcm" },
+{ "cb4be6eb5b38940067a1b74ca0360bbb8c66c449" , "JPEGLosslessSeNonZero.dcm" },

 { NULL, NULL}
 };

--- a/Testing/Source/Data/gdcmMD5DataImages.cxx
+++ b/Testing/Source/Data/gdcmMD5DataImages.cxx
@@ -705,6 +705,8 @@ static const char * const gdcmMD5DataImages[][2] = {
 { "2b64303085d747956bfdda2ee8cc33bc" , "EnhancedWithIPPPerFrameIOPShared.dcm" },
 { "4ca2f3a88d21d941f6485a8d91f96e29" , "FUJI-ffff-MONO1-J2K.dcm" },

+{ "b9697e3615a841e4c04f45ede6923278" , "JPEGLosslessSeNonZero.dcm" },
+

 /* Stopping condition */
 { nullptr ,nullptr }

--- a/Testing/Source/Data/gdcmMediaStorageDataFiles.cxx
+++ b/Testing/Source/Data/gdcmMediaStorageDataFiles.cxx
@@ -253,6 +253,7 @@ static const char * const gdcmMediaStorageDataFiles[][2] = {
 { "EmptyIcon_Bug417.dcm" , "1.2.840.10008.5.1.4.1.1.2" },
 { "EnhancedWithIPPPerFrameIOPShared.dcm" , "1.2.840.10008.5.1.4.1.1.13.1.2" },
 { "FUJI-ffff-MONO1-J2K.dcm" , "1.2.840.10008.5.1.4.1.1.1" },
+{ "JPEGLosslessSeNonZero.dcm" , "1.2.840.10008.5.1.4.1.1.7" },

 /* Stopping condition */
 { nullptr ,nullptr }

--- a/Testing/Source/Data/gdcmSelectedPrivateGroupOffsetDataFiles.cxx
+++ b/Testing/Source/Data/gdcmSelectedPrivateGroupOffsetDataFiles.cxx
@@ -234,6 +234,7 @@ static const StreamOffset gdcmSelectedPrivateGroupOffsetDataFiles[] = {
 { "EmptyIcon_Bug417.dcm",1000},
 { "EnhancedWithIPPPerFrameIOPShared.dcm",772},
 { "FUJI-ffff-MONO1-J2K.dcm",982},
+{ "JPEGLosslessSeNonZero.dcm",530},
 { "dicomdir_With_embedded_icons",7125212 },
 { "dicomdir_Pms_WithVisit_WithPrivate_WithStudyComponents",37218 },
 { "dicomdir_Acusson_WithPrivate_WithSR",3826 },

--- a/Testing/Source/Data/gdcmSelectedTagsOffsetDataFiles.cxx
+++ b/Testing/Source/Data/gdcmSelectedTagsOffsetDataFiles.cxx
@@ -236,6 +236,7 @@ static const StreamOffset gdcmSelectedTagsOffsetDataFiles[] = {
 { "EmptyIcon_Bug417.dcm",4470},
 { "EnhancedWithIPPPerFrameIOPShared.dcm",23212},
 { "FUJI-ffff-MONO1-J2K.dcm",2040},
+{ "JPEGLosslessSeNonZero.dcm",748},
 { "dicomdir_Acusson_WithPrivate_WithSR",3826 },
 { "dicomdir_Pms_WithVisit_WithPrivate_WithStudyComponents",37218 },
 { "dicomdir_Pms_With_heavy_embedded_sequence",3003414 },

--- a/Testing/Source/Data/gdcmStreamOffsetDataFiles.cxx
+++ b/Testing/Source/Data/gdcmStreamOffsetDataFiles.cxx
@@ -241,6 +241,7 @@ static const StreamOffset gdcmStreamOffsetDataFiles[] = {
 { "EmptyIcon_Bug417.dcm",4482 },
 { "EnhancedWithIPPPerFrameIOPShared.dcm",23224 },
 { "FUJI-ffff-MONO1-J2K.dcm",2052 },
+{ "JPEGLosslessSeNonZero.dcm",760 },

 /* Stopping condition */
 { nullptr ,0 },