From: jpr <jpr>
Date: Wed, 26 Oct 2005 06:57:02 +0000 (+0000)
Subject: None of the ACR-NEMA file has a Transfer Syntax field.
X-Git-Tag: OpenJPEG.Version1.2~159
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b49637c801a8f76fb1f9ffe37e7eb420e330441c;p=gdcm.git

None of the ACR-NEMA file has a Transfer Syntax field.
Our purpose was to read ACR-NEMA, as well (not only DICOM V3 images)
When a file !IsDicomV3(), the pixels are considered to be a 'Raw State'
(uncompressed);
IsRaw = true, and everything goes on *normally*.

--> comment out the abort, on purpose.
---

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 071e72e3..91a8cf95 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/25 18:14:49 $
-  Version:   $Revision: 1.88 $
+  Date:      $Date: 2005/10/26 06:57:02 $
+  Version:   $Revision: 1.89 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -115,13 +115,19 @@ void PixelReadConvert::GrabInformationsFromFile( File *file )
    PixelSign       = file->IsSignedPixelData();
    SwapCode        = file->GetSwapCode();
    std::string ts  = file->GetTransferSyntax();
-   if ( ts == GDCM_UNKNOWN )
-     {
-     gdcmErrorMacro( "Could someone tell me how in the world could this happen !" );
-     abort(); // DO NOT REMOVE.  WE SHOULD NEVER READ SUCH IMAGE EVER (only gdcm can write such broekn dicom file)
-     }
+
+   
+//   if ( ts == GDCM_UNKNOWN )
+//     {
+//     gdcmErrorMacro( "Could someone tell me how in the world could this happen !" );
+// -->
+//--> on ALL acr-nema images ! JPRx
+//-->
+//     abort(); // DO NOT REMOVE.  WE SHOULD NEVER READ SUCH IMAGE EVER (only gdcm can write such broekn dicom file)
+//     }
+
    IsRaw =
-        ( ! file->IsDicomV3() )
+        ( ! file->IsDicomV3() )  // Should be ACR-NEMA file
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRBigEndianPrivateGE
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian