ENH: Ok JPEG2000 is working...cannot believe that IsJPEG function was busted took...

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40e84c549050dcc5ccf15144a8a79780413b07a3..6d49beb27c8105338478d21572389c75f02e3d77 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
   #gdcmmpeg2
-  #gdcmjasper
+  gdcmjasper
   )
 
 # "jpeglib.h" is defined here:
@@ -58,7 +58,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
-   #   gdcmJpeg2000.cxx
+   gdcmJpeg2000.cxx
    #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg12
   gdcmjpeg16
   #  gdcmmpeg2
-  #  gdcmjasper
+  gdcmjasper
 )
 IF(WIN32)
   IF(NOT BORLAND)

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index a43e5b7afb2d6f5b037515082c6f8a4bae35e432..c0adb1046482f3d194bd8570c238bb52909468e9 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/17 12:44:09 $
-  Version:   $Revision: 1.238 $
+  Date:      $Date: 2005/05/29 21:56:36 $
+  Version:   $Revision: 1.239 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -117,7 +117,7 @@ File::File( std::string const &filename )
    {
       // Compute the RLE or JPEG info
       OpenFile();
-      std::string ts = GetTransferSyntax();
+      const std::string &ts = GetTransferSyntax();
       Fp->seekg( entry->GetOffset(), std::ios::beg );
       if ( Global::GetTS()->IsRLELossless(ts) ) 
          ComputeRLEInfo();

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 9827068454be20f67a7b98f9bf1ea3fd4163ef41..06dfb9deaeaa077da63f6947a475cc0cffcfac8d 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/25 12:54:18 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/05/29 21:56:36 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,7 @@ namespace gdcm
 {
 
 //bool ReadMPEGFile (std::ifstream *fp, void *image_buffer, size_t lenght);
-//bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* raw, size_t inputlength);
+bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* raw, size_t inputlength);
 //-----------------------------------------------------------------------------
 #define str2num(str, typeNum) *((typeNum *)(str))
 
@@ -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;
    }
 

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 02be5ba1f36e6c829ec3b8d15656f2dd9250804a..2595dc2ff98b49e7ee277ed055b1d7047bf20178 100644 (file)
--- 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/22 13:37:57 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/05/29 21:56:36 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -256,6 +256,7 @@ bool TS::IsJPEG(TSKey const &key)
    {
       if ( IsJPEGLossy( key )
         || IsJPEGLossless( key )
+        || IsJPEG2000( key )
          )
       {
          r = true;