ENH: Ok dashboard looks clean enough turning MPEG on

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ab9f5443c7441ba3dae61c63635f356491e38c8..d3980849d4a5f90fd8edd47ca5ef5ff9f786b422 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,8 @@ INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
 SUBDIRS(
   gdcmjpeg
-  #gdcmmpeg2
-  gdcmjpegls
+  gdcmmpeg2
+  #gdcmjpegls
   gdcmopenjpeg
   )
 
@@ -53,7 +53,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   #   gdcmMpeg.cxx
+   gdcmMpeg.cxx
    gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
@@ -75,7 +75,7 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  #  gdcmmpeg2
+  gdcmmpeg2
   gdcmopenjpeg
 )
 IF(WIN32)

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index b25edb1c95de0877e34f3be9183a8b1104f1a0d7..bb8d4e7f4fe83e06f6c5e95a2b0cd860c15360c8 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/11/03 08:37:57 $
-  Version:   $Revision: 1.96 $
+  Date:      $Date: 2005/11/08 16:35:54 $
+  Version:   $Revision: 1.97 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,7 +31,7 @@
 namespace gdcm
 {
 
-//bool ReadMPEGFile (std::ifstream *fp, void *image_buffer, size_t lenght); 
+bool ReadMPEGFile (std::ifstream *fp, char *inputdata, size_t lenght); 
 bool gdcm_read_JPEG2000_file (void* raw, 
                               char *inputdata, size_t inputlength);
 //-----------------------------------------------------------------------------
@@ -301,7 +301,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
       //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
       //return false;
       // fp has already been seek to start of mpeg
-      //ReadMPEGFile(fp, Raw, PixelDataLength); 
+      ReadMPEGFile(fp, (char*)Raw, PixelDataLength); 
       return true;
    }
    else