[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 768c2fe2cd3cf777f58f7e58fc1cfd6182
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2020-06-26 07:52:46
|
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 768c2fe2cd3cf777f58f7e58fc1cfd61825debf8 (commit)
via cf550816def6a66d7f2c92b1b0e0ec7edd737954 (commit)
via e9cdbc710f1da17b0a8ee85d488b4ebfabc1e633 (commit)
from a6d1de6d739c04f4208b938578aa34af05c89982 (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/768c2fe2cd3cf777f58f7e58fc1cfd61825debf8/
commit 768c2fe2cd3cf777f58f7e58fc1cfd61825debf8
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Jun 26 09:52:12 2020 +0200
Remove a possible warning when compiling GDCM in c++14 mode
See:
https://stackoverflow.com/a/26949099/136285
diff --git a/Source/MediaStorageAndFileFormat/gdcmPixelFormat.h b/Source/MediaStorageAndFileFormat/gdcmPixelFormat.h
index ebaf4213e..295ed7afc 100644
--- a/Source/MediaStorageAndFileFormat/gdcmPixelFormat.h
+++ b/Source/MediaStorageAndFileFormat/gdcmPixelFormat.h
@@ -67,8 +67,10 @@ public:
} ScalarType;
// default cstor:
+ PixelFormat () : PixelFormat(1, 8, 8, 7, 0) {}
+
explicit PixelFormat (
- unsigned short samplesperpixel = 1,
+ unsigned short samplesperpixel,
unsigned short bitsallocated = 8,
unsigned short bitsstored = 8,
unsigned short highbit = 7,
https://sourceforge.net/p/gdcm/gdcm/ci/cf550816def6a66d7f2c92b1b0e0ec7edd737954/
commit cf550816def6a66d7f2c92b1b0e0ec7edd737954
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Jun 26 09:51:26 2020 +0200
Update test to reproduce a warning in c++14 mode
diff --git a/Testing/Source/MediaStorageAndFileFormat/Cxx/TestPixelFormat.cxx b/Testing/Source/MediaStorageAndFileFormat/Cxx/TestPixelFormat.cxx
index ca944d6c1..3342d2e8c 100644
--- a/Testing/Source/MediaStorageAndFileFormat/Cxx/TestPixelFormat.cxx
+++ b/Testing/Source/MediaStorageAndFileFormat/Cxx/TestPixelFormat.cxx
@@ -13,6 +13,10 @@
=========================================================================*/
#include "gdcmPixelFormat.h"
+struct frame_info {
+ gdcm::PixelFormat pixeltype;
+};
+
int TestPixelFormat(int , char *[])
{
using gdcm::PixelFormat;
@@ -138,6 +142,7 @@ int TestPixelFormat(int , char *[])
pf4.SetPixelRepresentation(1);
if( pf4.GetScalarType() != gdcm::PixelFormat::INT16 ) return 1;
+ frame_info fi = {};
return 0;
}
https://sourceforge.net/p/gdcm/gdcm/ci/e9cdbc710f1da17b0a8ee85d488b4ebfabc1e633/
commit e9cdbc710f1da17b0a8ee85d488b4ebfabc1e633
Author: Dženan ZukiÄ <dze...@ki...>
Date: Fri Jun 26 09:50:26 2020 +0200
Missing dict entry for VENC for Siemens
Fix bug #508
diff --git a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
index 07d3db590..1bb1be803 100644
--- a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
+++ b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
@@ -8236,6 +8236,7 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0051,0x0011,"SIEMENS MR HEADER",VR::LO,VM::VM1,"PAT Mode (Ima PAT Mode)",false },
{0x0051,0x0012,"SIEMENS MR HEADER",VR::SH,VM::VM1,"?Table Position?",false },
{0x0051,0x0013,"SIEMENS MR HEADER",VR::SH,VM::VM1,"Positive PCS Directions",false },
+ {0x0051,0x0014,"SIEMENS MR HEADER",VR::SH,VM::VM1,"?v150_through?",false },
{0x0051,0x0015,"SIEMENS MR HEADER",VR::SH,VM::VM1,"?Data Filter?",false },
{0x0051,0x0016,"SIEMENS MR HEADER",VR::LO,VM::VM1,"?Image Type?",false },
{0x0051,0x0017,"SIEMENS MR HEADER",VR::SH,VM::VM1,"?Slice Thickness?",false },
-----------------------------------------------------------------------
Summary of changes:
Source/DataDictionary/gdcmPrivateDefaultDicts.cxx | 1 +
Source/MediaStorageAndFileFormat/gdcmPixelFormat.h | 4 +++-
Testing/Source/MediaStorageAndFileFormat/Cxx/TestPixelFormat.cxx | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
hooks/post-receive
--
Grassroots DICOM
|