From: jpr <jpr>
Date: Tue, 26 Apr 2005 16:25:49 +0000 (+0000)
Subject: Prepare MPEG Dicom encapsulated processing (within a loooong future)
X-Git-Tag: Version1.2.bp~748
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6eaa4e985dac7988014bf283d38064234bf1f9ed;p=gdcm.git

Prepare MPEG Dicom encapsulated processing (within a loooong future)
---

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 2970f1f0..45bb58e7 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/03/31 09:46:51 $
-  Version:   $Revision: 1.54 $
+  Date:      $Date: 2005/04/26 16:25:49 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -115,6 +115,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file )
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian;
 
+   IsMPEG          = Global::GetTS()->IsMPEG(ts);
    IsJPEG2000      = Global::GetTS()->IsJPEG2000(ts);
    IsJPEGLS        = Global::GetTS()->IsJPEGLS(ts);
    IsJPEGLossy     = Global::GetTS()->IsJPEGLossy(ts);
@@ -250,6 +251,11 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
          return false;
       }
    }
+   else if ( IsMPEG )
+   {
+      gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
+      return false;
+   }
    else
    {
       // Default case concerns JPEG family