ENH: Adding mpeg2 and jpeg2000 lib + hookup

[gdcm.git] / src / gdcmPixelReadConvert.cxx

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 45bb58e7b69e35bd12a2240db1b91c68a1175d49..83a4b42569f41b1007ef1f5c41a7f2619b088855 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/04/26 16:25:49 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2005/05/22 20:33:09 $
+  Version:   $Revision: 1.58 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,6 +30,9 @@
 
 namespace gdcm
 {
+
+//bool ReadMPEGFile (std::ifstream *fp, void *image_buffer);
+//bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* raw, size_t inputlength);
 //-----------------------------------------------------------------------------
 #define str2num(str, typeNum) *((typeNum *)(str))
 
@@ -253,8 +256,10 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    }
    else if ( IsMPEG )
    {
-      gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
-      return false;
+      //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
+      //return false;
+//      ReadMPEGFile(fp, Raw); // fp has already been seek to start of mpeg
+      return true;
    }
    else
    {
@@ -392,9 +397,9 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
 {
    if ( IsJPEG2000 )
    {
-      gdcmWarningMacro( "Sorry, JPEG2000 not yet taken into account" );
+//      gdcmWarningMacro( "Sorry, JPEG2000 not yet taken into account" );
       fp->seekg( JPEGInfo->GetFirstFragment()->GetOffset(), std::ios::beg);
-//    if ( ! gdcm_read_JPEG2000_file( fp,Raw ) )
+//    if ( ! gdcm_read_JPEG2000_file( fp,Raw, JPEGInfo->GetFirstFragment()->GetLength() ) )
           return false;
    }