From: jpr <jpr>
Date: Fri, 22 Apr 2005 13:37:57 +0000 (+0000)
Subject: Prepare (future) MPEG integration
X-Git-Tag: Version1.2.bp~759
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f98b311871b6f42c92c20897bacca8cd0d731616;p=gdcm.git

Prepare (future) MPEG integration
---

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 6a329ff1..79226b20 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/15 18:12:35 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/04/22 13:37:57 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -112,6 +112,7 @@ private:
    bool IsJPEGLossy;
    bool IsJPEG;
    bool IsRLELossless;
+   bool IsMPEG;
 
    RLEFramesInfo *RLEInfo;
    JPEGFragmentsInfo *JPEGInfo;
diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 661e5597..02be5ba1 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/04/21 07:40:00 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2005/04/22 13:37:57 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -284,6 +284,25 @@ bool TS::IsJPEGLS(TSKey const &key)
    return r;
 }
 
+/**
+ * \brief   Determines if the Transfer Syntax corresponds to any form
+ *          of MPEG encoded Pixel data.
+ * @return  True when any form of MPEG found. False otherwise.
+ */
+bool TS::IsMPEG(TSKey const &key)
+{
+   bool r = false;
+   // First check this is an actual transfer syntax
+   if( IsTransferSyntax(key) )
+   {
+      if ( key == SpecialStrings[MPEG2MainProfile] ) 
+      {
+         r = true;
+      }
+   }
+   return r;
+}
+
 /**
  * \brief   GetSpecialTransferSyntax ??
  * @param  key TSKey const &key ??
diff --git a/src/gdcmTS.h b/src/gdcmTS.h
index 8a6ef740..04666918 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/21 07:40:00 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/04/22 13:37:57 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -78,6 +78,7 @@ public:
    bool IsJPEG2000(TSKey const &key);
    bool IsJPEG(TSKey const &key);
    bool IsJPEGLS(TSKey const &key);
+   bool IsMPEG(TSKey const &key);
 
    // This should be deprecated very soon
    SpecialType GetSpecialTransferSyntax(TSKey const &key);