[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 973cb0769c86126af7e5b6b3c75cc73322e4f047

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, release has been updated
       via  973cb0769c86126af7e5b6b3c75cc73322e4f047 (commit)
       via  41b5f307613a5768f441cc4b84949ee5f46b8608 (commit)
       via  33e758514633f2793b653344d83d9c3ff597575a (commit)
       via  37140257a286f109270bc415e207fc16d6d428c3 (commit)
       via  c3c3b0059450cb1d4f79fbb59e4854a07172ffac (commit)
       via  f86a5c3dfba3f48a33b62425f84f96353afb673f (commit)
      from  d4a741cc493eb847c5a0c3f8bbf1cf2a13c62ae8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/973cb0769c86126af7e5b6b3c75cc73322e4f047/

commit 973cb0769c86126af7e5b6b3c75cc73322e4f047
Merge: d4a741cc4 41b5f3076
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Jun 25 10:15:28 2020 +0200

    Merge branch 'release-2-8' into release

diff --cc Utilities/gdcmjpeg/CMakeLists.txt
index 347780027,1a9149190..d1649f3c6
--- a/Utilities/gdcmjpeg/CMakeLists.txt
+++ b/Utilities/gdcmjpeg/CMakeLists.txt
@@@ -122,16 -120,14 +122,12 @@@ foreach(sr
      "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
  endforeach()
  
 -if (WIN32)
 -  if (BUILD_SHARED_LIBS)
 -    set(JPEGDLL 1)
 -  else ()
 -    set(JPEGSTATIC 1)
 -  endif ()
 +if (BUILD_SHARED_LIBS)
 +  set(JPEGDLL 1)
 +else ()
 +  set(JPEGSTATIC 1)
  endif ()
  
- # By default support DICOMObjects bug, if this is a speed penalty for you
- # you should consider disabling it
- set(SUPPORT_DICOMOBJECTS_BUG ON)
- 
  # Generate three libraries: jpeg 8bits, 12bits and 16bits
  # using only one source directory
  

https://sourceforge.net/p/gdcm/gdcm/ci/41b5f307613a5768f441cc4b84949ee5f46b8608/

commit 41b5f307613a5768f441cc4b84949ee5f46b8608
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Jun 25 10:12:43 2020 +0200

    Do not pretend to support this file

diff --git a/Testing/Source/Data/CMakeLists.txt b/Testing/Source/Data/CMakeLists.txt
index 7db915ec1..f806204a7 100644
--- a/Testing/Source/Data/CMakeLists.txt
+++ b/Testing/Source/Data/CMakeLists.txt
@@ -50,6 +50,8 @@ set(BLACK_LIST_READER
   PET-cardio-Multiframe-Papyrus.dcm
 # No way to read this image:
   ELSCINT1_LOSSLESS_RICE.dcm
+# SignedShortLossless has never really been supported anyway:
+  SignedShortLosslessBug.dcm
 # Toshiba US Private Data Storage 1.2.392.200036.9116.7.8.1.1.1
   TOSHIBA_MDW_HEADER.dcm
 # TODO, nasty:

https://sourceforge.net/p/gdcm/gdcm/ci/33e758514633f2793b653344d83d9c3ff597575a/

commit 33e758514633f2793b653344d83d9c3ff597575a
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Jun 25 10:11:23 2020 +0200

    Remove reference to SUPPORT_DICOMOBJECTS_BUG

diff --git a/Utilities/gdcmjpeg/CMakeLists.txt b/Utilities/gdcmjpeg/CMakeLists.txt
index b39611d3f..1a9149190 100644
--- a/Utilities/gdcmjpeg/CMakeLists.txt
+++ b/Utilities/gdcmjpeg/CMakeLists.txt
@@ -128,10 +128,6 @@ if (WIN32)
   endif ()
 endif ()
 
-# By default support DICOMObjects bug, if this is a speed penalty for you
-# you should consider disabling it
-set(SUPPORT_DICOMOBJECTS_BUG ON)
-
 # Generate three libraries: jpeg 8bits, 12bits and 16bits
 # using only one source directory
 
diff --git a/Utilities/gdcmjpeg/jpegcmake.h.in b/Utilities/gdcmjpeg/jpegcmake.h.in
index d19bf6864..f3be43144 100644
--- a/Utilities/gdcmjpeg/jpegcmake.h.in
+++ b/Utilities/gdcmjpeg/jpegcmake.h.in
@@ -22,13 +22,6 @@
 #cmakedefine JPEGDLL
 #cmakedefine JPEGSTATIC
 
-/* For more info on this bug see:
- * [Broken JPEG from GE station] on comp.protocols.dicom
- * and official publication at:
- * http://www.medicalconnections.co.uk/html/lossless_bug.html
- */
-#cmakedefine SUPPORT_DICOMOBJECTS_BUG
-
 #define BITS_IN_JSAMPLE @CMAKE_BITS_IN_JSAMPLE@
 
 #if BITS_IN_JSAMPLE == 8

https://sourceforge.net/p/gdcm/gdcm/ci/37140257a286f109270bc415e207fc16d6d428c3/

commit 37140257a286f109270bc415e207fc16d6d428c3
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Jun 25 10:09:06 2020 +0200

    Revert commit 42b7fb1f32e90412cc9a46ada640a8b593cbbb14
    
    The detection was not working correctly. It turns out the patch also incomplete,
    see for reference `dcmdjpeg +w6` recent option.

diff --git a/Utilities/gdcmjpeg/jdpred.c b/Utilities/gdcmjpeg/jdpred.c
index e4a6f66a7..b9c260ea3 100644
--- a/Utilities/gdcmjpeg/jdpred.c
+++ b/Utilities/gdcmjpeg/jdpred.c
@@ -72,18 +72,6 @@
  * logically AND the result with 0xFFFF.
  */
 
-#define UNDIFFERENCE_2D_BUG(PREDICTOR) \
-  Rb = GETJSAMPLE(prev_row[0]); \
-  Ra = (diff_buf[0] + PREDICTOR2) & 0xFFFF; \
-  undiff_buf[0] = Ra; \
- \
-  for (xindex = 1; xindex < width; xindex++) { \
-    Rc = Rb; \
-    Rb = GETJSAMPLE(prev_row[xindex]); \
-    Ra = (diff_buf[xindex] + PREDICTOR) & 0xFFFF; \
-    undiff_buf[xindex] = Ra; \
-  }
-
 #define UNDIFFERENCE_2D(PREDICTOR) \
   unsigned int xindex; \
   int Ra, Rb, Rc; \
@@ -153,57 +141,14 @@ jpeg_undifference5(j_decompress_ptr cinfo, int comp_index,
   (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
-#ifdef SUPPORT_DICOMOBJECTS_BUG
-/* uninitialized */
-static int dicomobjectsbug = -1; /* 0 == nobug, 1 == bug */
-#endif
-
 METHODDEF(void)
 jpeg_undifference6(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-#ifdef SUPPORT_DICOMOBJECTS_BUG
-  unsigned int xindex;
-  int Ra, Rb, Rc;
-  int min, max, temp;
-  SHIFT_TEMPS
-  if( dicomobjectsbug == -1 )
-    {
-    dicomobjectsbug = 0; /* no bug by default */
-
-    Rb = GETJSAMPLE(prev_row[0]);
-    Ra = (diff_buf[0] + PREDICTOR2) & 0xFFFF;
-    undiff_buf[0] = Ra;
-    temp = min = max = undiff_buf[0];
-
-    for (xindex = 1; xindex < width; xindex++) {
-      Rc = Rb;
-      Rb = GETJSAMPLE(prev_row[xindex]);
-      Ra = (diff_buf[xindex] + PREDICTOR6) & 0xFFFF;
-      temp = Ra;
-      min = temp < min ? temp : min;
-      max = temp > max ? temp : max;
-    }
-    if( (max - min) > 50000) /* magic number */
-      {
-      dicomobjectsbug = 1;
-      WARNMS(cinfo, JWRN_SIGNED_ARITH);
-      }
-    }
-  if(dicomobjectsbug)
-    {
-    UNDIFFERENCE_2D_BUG(PREDICTOR6_BUG);
-    }
-  else
-    {
-    UNDIFFERENCE_2D_BUG(PREDICTOR6);
-    }
-#else
   SHIFT_TEMPS
   UNDIFFERENCE_2D(PREDICTOR6);
-#endif
-  (void)comp_index;(void)cinfo;
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
diff --git a/Utilities/gdcmjpeg/jlossls.h b/Utilities/gdcmjpeg/jlossls.h
index 9b391bda1..2feccd6d7 100644
--- a/Utilities/gdcmjpeg/jlossls.h
+++ b/Utilities/gdcmjpeg/jlossls.h
@@ -23,7 +23,6 @@
 #define PREDICTOR4  (int) ((INT32) Ra + (INT32) Rb - (INT32) Rc)
 #define PREDICTOR5  (int) ((INT32) Ra + RIGHT_SHIFT((INT32) Rb - (INT32) Rc, 1))
 #define PREDICTOR6  (int) ((INT32) Rb + RIGHT_SHIFT((INT32) Ra - (INT32) Rc, 1))
-#define PREDICTOR6_BUG  (int) ((INT16) Rb + RIGHT_SHIFT((INT16) Ra - (INT16) Rc, 1))
 #define PREDICTOR7  (int) RIGHT_SHIFT((INT32) Ra + (INT32) Rb, 1)
 
 

https://sourceforge.net/p/gdcm/gdcm/ci/c3c3b0059450cb1d4f79fbb59e4854a07172ffac/

commit c3c3b0059450cb1d4f79fbb59e4854a07172ffac
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Mar 26 16:03:15 2020 +0100

    Revert "Revert "Set to 1""
    
    This reverts commit f86a5c3dfba3f48a33b62425f84f96353afb673f.

diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
index 3b7fe7e93..7c5628694 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
@@ -109,6 +109,7 @@ bool JPEGLSCodec::GetHeaderInfo(std::istream &is, TransferSyntax &ts)
   else if( metadata.components == 3 )
     {
     PI = PhotometricInterpretation::RGB;
+    PlanarConfiguration = 1;
     this->PF.SetSamplesPerPixel( 3 );
     }
   else assert(0);

https://sourceforge.net/p/gdcm/gdcm/ci/f86a5c3dfba3f48a33b62425f84f96353afb673f/

commit f86a5c3dfba3f48a33b62425f84f96353afb673f
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Mar 26 16:02:39 2020 +0100

    Revert "Set to 1"
    
    This reverts commit d3040d5f750cfbb8421b0986fa9084ed72e34b20.

diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
index 7c5628694..3b7fe7e93 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEGLSCodec.cxx
@@ -109,7 +109,6 @@ bool JPEGLSCodec::GetHeaderInfo(std::istream &is, TransferSyntax &ts)
   else if( metadata.components == 3 )
     {
     PI = PhotometricInterpretation::RGB;
-    PlanarConfiguration = 1;
     this->PF.SetSamplesPerPixel( 3 );
     }
   else assert(0);

-----------------------------------------------------------------------

Summary of changes:
 Testing/Source/Data/CMakeLists.txt |  2 ++
 Utilities/gdcmjpeg/CMakeLists.txt  |  4 ---
 Utilities/gdcmjpeg/jdpred.c        | 57 +-------------------------------------
 Utilities/gdcmjpeg/jlossls.h       |  1 -
 Utilities/gdcmjpeg/jpegcmake.h.in  |  7 -----
 5 files changed, 3 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM