From a61fbd6eb8daabbe9a6df9ebc91300875dc1c560 Mon Sep 17 00:00:00 2001 From: jpr Date: Tue, 18 Oct 2005 10:43:31 +0000 Subject: [PATCH] Fix internal name for : 1.2.840.113619.5.2 : Implicit VR Big Endian DLX (G.E Private) as ImplicitVRBigEndianPrivateGE --- src/gdcmDocument.cxx | 11 +++++++---- src/gdcmPixelReadConvert.cxx | 6 +++--- src/gdcmTS.h | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 876a5095..693d425e 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/10/18 09:17:08 $ - Version: $Revision: 1.290 $ + Date: $Date: 2005/10/18 10:43:31 $ + Version: $Revision: 1.291 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2073,7 +2073,7 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) return; } - // Group 0002 is always 'Explicit ...' enven when Transfer Syntax says 'Implicit ..." + // Group 0002 is always 'Explicit ...' even when Transfer Syntax says 'Implicit ..." if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian ) { @@ -2081,7 +2081,10 @@ void Document::HandleOutOfGroup0002(uint16_t &group, uint16_t &elem) } // FIXME Strangely, this works with - //'Implicit VR Transfer Syntax (GE Private) + //'Implicit VR BigEndian Transfer Syntax (GE Private) + // + // --> Probabely normal, since we considered we never have to trust manufacturers. + // (we find very often 'Implicit VR' tag, even when Transfer Syntax tells us it's Explicit ... if ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian ) { gdcmWarningMacro("Transfer Syntax Name = [" diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 689ab46c..e79c3d4a 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/10/18 08:35:50 $ - Version: $Revision: 1.79 $ + Date: $Date: 2005/10/18 10:43:31 $ + Version: $Revision: 1.80 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -118,7 +118,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) IsRaw = ( ! file->IsDicomV3() ) || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian - || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndianDLXGE + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRBigEndianPrivateGE || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian; diff --git a/src/gdcmTS.h b/src/gdcmTS.h index 04666918..d89e4d5e 100644 --- a/src/gdcmTS.h +++ b/src/gdcmTS.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmTS.h,v $ Language: C++ - Date: $Date: 2005/04/22 13:37:57 $ - Version: $Revision: 1.20 $ + Date: $Date: 2005/10/18 10:43:32 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,7 +43,7 @@ class GDCM_EXPORT TS public: enum SpecialType { ImplicitVRLittleEndian = 0, - ImplicitVRLittleEndianDLXGE, + ImplicitVRBigEndianPrivateGE, ExplicitVRLittleEndian, DeflatedExplicitVRLittleEndian, ExplicitVRBigEndian, -- 2.45.1