ENH: First pass at simplifying the JPEG stuff.

[gdcm.git] / src / gdcmJPEGFragment.cxx

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index 0af4944ddecbbc1fe21fd47b4fdf4facb2065f72..03cc0bc03f5e7979f62d50a60b90196d3fa5f203 100644 (file)
--- a/src/gdcmJPEGFragment.cxx
+++ b/src/gdcmJPEGFragment.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/16 04:50:42 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/17 01:14:32 $
+  Version:   $Revision: 1.3 $
                                                                                 
   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,8 +56,8 @@ 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::ostream &os, std::string indent )
 {
@@ -43,5 +67,139 @@ void JPEGFragment::Print( std::ostream &os, std::string indent )
       << std::endl;
 }
 
+/**
+ * \brief Decompress 8bits JPEG Fragment
+ * @param buffer     output (data decompress)
+ * @param nBits      8/12 or 16 bits jpeg
+ */
+void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits)
+{
+      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