[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. ad781fd82829b0173ad556dbce59f92f6c
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2022-09-13 12:42:07
|
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 ad781fd82829b0173ad556dbce59f92f6cbbd54f (commit)
from 48d344155507924861dfd09ace35145c9539e475 (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/ad781fd82829b0173ad556dbce59f92f6cbbd54f/
commit ad781fd82829b0173ad556dbce59f92f6cbbd54f
Author: Mathieu Malaterre <mat...@gm...>
Date: Tue Sep 13 14:41:52 2022 +0200
Handle another invalid case
diff --git a/Source/MediaStorageAndFileFormat/gdcmCleaner.cxx b/Source/MediaStorageAndFileFormat/gdcmCleaner.cxx
index f58691cdc..03912d1dd 100644
--- a/Source/MediaStorageAndFileFormat/gdcmCleaner.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmCleaner.cxx
@@ -761,11 +761,18 @@ static bool CleanCSA(DataSet &ds, const DataElement &de) {
if (bv->GetLength() >= 10 && memcmp(bv->GetPointer(), psd_ocm, 10) == 0) {
return true;
}
+ // ANGIOHEAD case. This is a DICOM Explicit with a odd ending:
static const char end[] = "END! ";
if (bv->GetLength() >= 10 &&
memcmp(bv->GetPointer() + bv->GetLength() - 10, end, 10) == 0) {
return true;
}
+ // byte-swapped ANGIOHEAD
+ static const char ned[] = "NE!D ";
+ if (bv->GetLength() >= 10 &&
+ memcmp(bv->GetPointer() + bv->GetLength() - 10, ned, 10) == 0) {
+ return true;
+ }
const bool zero = isAllZero(bv->GetPointer(), bv->GetLength());
if (zero) return true;
diff --git a/Utilities/gdcmext/csa.c b/Utilities/gdcmext/csa.c
index 65df50f20..da9757d95 100644
--- a/Utilities/gdcmext/csa.c
+++ b/Utilities/gdcmext/csa.c
@@ -146,7 +146,7 @@ static bool read_magic(struct app *self) {
magic = NOMAGIC;
} else if (n == 0x7364703c && unused == 0x6f633c3e) // aka '<pds><co'
{
- // 'PET_REPLAY_PARAM'
+ // 'PET_REPLAY_PARAM'
return false;
} else if (n == 0x31305356 && unused == 0x2010403) { // aka 'VS01' ...
// technically could be reserved; should not happen in the wild
-----------------------------------------------------------------------
Summary of changes:
Source/MediaStorageAndFileFormat/gdcmCleaner.cxx | 7 +++++++
Utilities/gdcmext/csa.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
Grassroots DICOM
|