From: jpr <jpr>
Date: Fri, 3 Oct 2003 16:22:24 +0000 (+0000)
Subject: One more JPEG LossLess type "JPEG Baseline (Process 14)" is now decoded.
X-Git-Tag: Version0.3.1~132
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=13fd600696872f088e41161308fe4e37df1a57bd;p=gdcm.git

One more JPEG LossLess type "JPEG Baseline (Process 14)" is now decoded.
---

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 88dcdf6a..522e3f54 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -160,7 +160,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
                 
   // ------------------------------- JPEG LossLess : call to Jpeg Libido
    
-   if (IsJPEGLossless() && GetZSize() == 1) {
+   if (IsJPEGLossless() /*&& GetZSize() == 1*/) {
    
       int ln; //  Position on begining of Jpeg Pixels
       fseek(fp,4,SEEK_CUR);  // skipping (fffe,e000) : Basic Offset Table Item
diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index c035d69f..e59c6657 100644
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.93 2003/10/03 07:46:06 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.94 2003/10/03 16:22:24 jpr Exp $
 
 #include "gdcmHeader.h"
 
@@ -491,6 +491,8 @@ bool gdcmHeader::IsJPEGLossless(void) {
    const char * Transfert = Element->GetValue().c_str();
    if ( memcmp(Transfert+strlen(Transfert)-2 ,"70",2)==0) return true;
    if ( memcmp(Transfert+strlen(Transfert)-2 ,"55",2)==0) return true;
+   if (Element->GetValue() == "1.2.840.10008.1.2.4.57") return true;
+
    return false;
 }