BUG: Disable MPEG and JPEG2000 until build process is working EVERYWHERE... so tired

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 99090ee85d8644295e9e922c01587309157bd983..bd4a11bac59e38e562cbea2158df1807b6bb82ba 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,8 +12,8 @@ IF (WIN32)
 ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
-  gdcmmpeg2
-  gdcmjasper
+  #  gdcmmpeg2
+  #  gdcmjasper
   )
 
 # "jpeglib.h" is defined here:
@@ -58,8 +58,8 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
-   gdcmJpeg2000.cxx
-   gdcmMpeg.cxx
+   #   gdcmJpeg2000.cxx
+   #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -79,8 +79,8 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  gdcmmpeg2
-  gdcmjasper
+  #  gdcmmpeg2
+  #  gdcmjasper
 )
 IF(WIN32)
   IF(NOT BORLAND)

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 38955fe7b2438ef2f2df9635ff42847c973e0879..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/05/22 18:38:52 $
-  Version:   $Revision: 1.57 $
+  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
@@ -31,8 +31,8 @@
 namespace gdcm
 {
 
-bool ReadMPEGFile (std::ifstream *fp, void *image_buffer);
-bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* raw, size_t inputlength);
+//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))
 
@@ -258,7 +258,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    {
       //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
       //return false;
-      ReadMPEGFile(fp, Raw); // fp has already been seek to start of mpeg
+//      ReadMPEGFile(fp, Raw); // fp has already been seek to start of mpeg
       return true;
    }
    else
@@ -399,7 +399,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
    {
 //      gdcmWarningMacro( "Sorry, JPEG2000 not yet taken into account" );
       fp->seekg( JPEGInfo->GetFirstFragment()->GetOffset(), std::ios::beg);
-    if ( ! gdcm_read_JPEG2000_file( fp,Raw, JPEGInfo->GetFirstFragment()->GetLength() ) )
+//    if ( ! gdcm_read_JPEG2000_file( fp,Raw, JPEGInfo->GetFirstFragment()->GetLength() ) )
           return false;
    }