X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragment.cxx;h=9b5733b5fc65b3b3f0affddaf5ea3459fe67c205;hb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;hp=621134002588133871f51e8039581f1426c29c12;hpb=a19112da3ae4ddd5f5753b27390422af5cd05279;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index 62113400..9b5733b5 100644
--- a/src/gdcmJPEGFragment.cxx
+++ b/src/gdcmJPEGFragment.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/20 14:31:44 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,10 +17,34 @@
 =========================================================================*/
                                                                                 
 #include "gdcmJPEGFragment.h"
-                                                                                
+#include "gdcmDebug.h"
+
 namespace gdcm
 {
 
+// For JPEG 2000, body in file gdcmJpeg2000.cxx
+bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* image_buffer);
+
+// For JPEG 8 Bits, body in file gdcmJpeg8.cxx
+bool gdcm_read_JPEG_file8 (std::ifstream *fp, void *image_buffer);
+bool gdcm_read_JPEG_memory8    (const JOCTET *buffer, const size_t buflen, 
+                                void *image_buffer,
+                                size_t *howManyRead, size_t *howManyWritten);
+//
+// For JPEG 12 Bits, body in file gdcmJpeg12.cxx
+bool gdcm_read_JPEG_file12 (std::ifstream *fp, void *image_buffer);
+bool gdcm_read_JPEG_memory12   (const JOCTET *buffer, const size_t buflen, 
+                                void *image_buffer,
+                                size_t *howManyRead, size_t *howManyWritten);
+
+// For JPEG 16 Bits, body in file gdcmJpeg16.cxx
+// Beware this is misleading there is no 16bits DCT algorithm, only
+// jpeg lossless compression exist in 16bits.
+bool gdcm_read_JPEG_file16 (std::ifstream *fp, void *image_buffer);
+bool gdcm_read_JPEG_memory16   (const JOCTET *buffer, const size_t buflen, 
+                                void* image_buffer,
+                                size_t *howManyRead, size_t *howManyWritten);
+
 /**
  * \brief Default constructor.
  */
@@ -32,10 +56,10 @@ JPEGFragment::JPEGFragment()
 
 /**
  * \brief        Print self.
- * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
+ * @param indent Indentation string to be prepended during printing.
  */
-void JPEGFragment::Print( std::string indent, std::ostream &os )
+void JPEGFragment::Print( std::ostream &os, std::string indent )
 {
    os << indent
       << "JPEG fragment: offset : " <<  Offset
@@ -43,5 +67,142 @@ void JPEGFragment::Print( std::string indent, std::ostream &os )
       << std::endl;
 }
 
+/**
+ * \brief Decompress 8bits JPEG Fragment
+ * @param fp ifstream to write to
+ * @param buffer     output (data decompress)
+ * @param nBits      8/12 or 16 bits jpeg
+ */
+void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits)
+{
+   // First thing need to reset file to proper position:
+   fp->seekg( Offset, std::ios::beg);
+
+   if ( nBits == 8 )
+   {
+      // JPEG Lossy : call to IJG 6b
+      if ( ! gdcm_read_JPEG_file8( fp, buffer) )
+      {
+         //return false;
+      }
+   }
+   else if ( nBits <= 12 )
+   {
+      // Reading Fragment pixels
+      if ( ! gdcm_read_JPEG_file12 ( fp, buffer) )
+      {
+         //return false;
+      }
+   }
+   else if ( nBits <= 16 )
+   {
+      // Reading Fragment pixels
+      if ( ! gdcm_read_JPEG_file16 ( fp, buffer) )
+      {
+         //return false;
+      }
+      //gdcmAssertMacro( IsJPEGLossless );
+   }
+   else
+   {
+      // other JPEG lossy not supported
+      gdcmErrorMacro( "Unknown jpeg lossy compression ");
+      //return false;
+   }
+
+}
+
+void JPEGFragment::DecompressJPEGSingleFrameFragmentsFromFile(JOCTET *buffer, size_t totalLength, uint8_t* raw, int nBits)
+{
+   size_t howManyRead = 0;
+   size_t howManyWritten = 0;
+   
+   if ( nBits == 8)
+   {
+      if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, raw,
+                                     &howManyRead, &howManyWritten ) ) 
+      {
+         gdcmErrorMacro( "Failed to read jpeg8 ");
+         delete [] buffer;
+         //return false;
+      }
+   }
+   else if ( nBits <= 12)
+   {
+      if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, raw,
+                                      &howManyRead, &howManyWritten ) ) 
+      {
+         gdcmErrorMacro( "Failed to read jpeg12 ");
+            delete [] buffer;
+            //return false;
+      }
+   }
+   else if ( nBits <= 16)
+   {
+      
+      if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, raw,
+                                      &howManyRead, &howManyWritten ) ) 
+      {
+         gdcmErrorMacro( "Failed to read jpeg16 ");
+         delete [] buffer;
+         //return false;
+      }
+   }
+   else
+   {
+      // other JPEG lossy not supported
+      gdcmErrorMacro( "Unsupported jpeg lossy compression ");
+      delete [] buffer;
+      //return false;
+   }      
+
+}
+
+void JPEGFragment::DecompressJPEGFragmentedFramesFromFile(JOCTET *buffer, uint8_t* raw, int nBits, size_t &howManyRead, size_t &howManyWritten, size_t totalLength)
+{
+   if ( nBits == 8 )
+   {
+     if ( ! gdcm_read_JPEG_memory8( buffer+howManyRead, totalLength-howManyRead,
+                                  raw+howManyWritten,
+                                  &howManyRead, &howManyWritten ) ) 
+       {
+         gdcmErrorMacro( "Failed to read jpeg8");
+         //delete [] buffer;
+         //return false;
+       }
+   }
+   else if ( nBits <= 12 )
+   {
+   
+     if ( ! gdcm_read_JPEG_memory12( buffer+howManyRead, totalLength-howManyRead,
+                                   raw+howManyWritten,
+                                   &howManyRead, &howManyWritten ) ) 
+       {
+         gdcmErrorMacro( "Failed to read jpeg12");
+         //delete [] buffer;
+         //return false;
+      }
+   }
+   else if ( nBits <= 16 )
+   {
+   
+     if ( ! gdcm_read_JPEG_memory16( buffer+howManyRead, totalLength-howManyRead,
+                                   raw+howManyWritten,
+                                   &howManyRead, &howManyWritten ) ) 
+       {
+         gdcmErrorMacro( "Failed to read jpeg16 ");
+         //delete [] buffer;
+         //return false;
+       }
+   }
+   else
+   {
+      // other JPEG lossy not supported
+      gdcmErrorMacro( "Unsupported jpeg lossy compression ");
+      //delete [] buffer;
+      //return false;
+   }
+}
+
 } // end namespace gdcm