From 6d3ea6b4acd35160aaa3a23f9e47ea287059fa68 Mon Sep 17 00:00:00 2001 From: malaterre Date: Wed, 17 Nov 2004 19:49:13 +0000 Subject: [PATCH] ENH: Adding support for GE Private Transfer Syntax where file is in little endian and pixel data is in Big endian. I believe this should also be propagated to gdcmTS class ... --- src/gdcmDocument.cxx | 9 ++++++--- src/gdcmDocument.h | 5 +++-- src/gdcmPixelConvert.cxx | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 854e6db2..62f5b9d2 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/11/17 10:20:07 $ - Version: $Revision: 1.133 $ + Date: $Date: 2004/11/17 19:49:13 $ + Version: $Revision: 1.134 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,6 +39,8 @@ namespace gdcm static const char *TransferSyntaxStrings[] = { // Implicit VR Little Endian "1.2.840.10008.1.2", + // Implicit VR Little Endian DLX G.E? + "1.2.840.113619.5.2", // Explicit VR Little Endian "1.2.840.10008.1.2.1", // Deflated Explicit VR Little Endian @@ -2609,6 +2611,7 @@ bool Document::CheckSwap() } + /** * \brief Restore the unproperly loaded values i.e. the group, the element * and the dictionary entry depending on them. @@ -3100,7 +3103,7 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT, * Document. * * The structure used by a Document (through \ref ElementSet), - * in order to old the parsed entries of a Dicom header, is a recursive + * in order to hold the parsed entries of a Dicom header, is a recursive * one. This is due to the fact that the sequences (when present) * can be nested. Additionaly, the sequence items (represented in * gdcm as \ref SQItem) add an extra complexity to the data diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index 68126078..1ad9350d 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2004/11/16 10:25:53 $ - Version: $Revision: 1.60 $ + Date: $Date: 2004/11/17 19:49:13 $ + Version: $Revision: 1.61 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,6 +43,7 @@ namespace gdcm enum TransferSyntaxType { ImplicitVRLittleEndian = 0, + ImplicitVRLittleEndianDLXGE, ExplicitVRLittleEndian, DeflatedExplicitVRLittleEndian, ExplicitVRBigEndian, diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx index 2721f2b4..9da6c400 100644 --- a/src/gdcmPixelConvert.cxx +++ b/src/gdcmPixelConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelConvert.cxx,v $ Language: C++ - Date: $Date: 2004/11/16 11:19:51 $ - Version: $Revision: 1.30 $ + Date: $Date: 2004/11/17 19:49:13 $ + Version: $Revision: 1.31 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -813,6 +813,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) IsDecompressed = ( ! header->IsDicomV3() ) || ts == ImplicitVRLittleEndian + || ts == ImplicitVRLittleEndianDLXGE || ts == ExplicitVRLittleEndian || ts == ExplicitVRBigEndian || ts == DeflatedExplicitVRLittleEndian; -- 2.45.1