ENH: Huge commit to remove the previous implementation for jpeg/fragments/multiframes...

[gdcm.git] / src / gdcmJPEGFragment.h

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 7c515c145a3db30357899cdff357dbaafa2874e4..b3e0cc3ab4f920edd7a53e8ab71bd37cccd025b4 100644 (file)
--- a/src/gdcmJPEGFragment.h
+++ b/src/gdcmJPEGFragment.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/10 16:44:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/31 03:22:25 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,13 @@
 
 #include "gdcmCommon.h"
 
+#include <iostream>
+#include <fstream>
+
+namespace gdcm 
+{
+#define JOCTET uint8_t
+
 /**
  * \brief Utility class for summerizing the informations of a JPEG
  *        fragment of an "Encapsulated JPEG Compressed Image".
@@ -30,22 +37,33 @@
  *        - the fragment length 
  *
  *        Each instance of this class (they can be as many instances for
- *        a given gdcmDocument as they are JPEG fragments and they are
- *        collected in a \ref gdcmJPEGFragmentsInfo )
+ *        a given Document as they are JPEG fragments and they are
+ *        collected in a \ref JPEGFragmentsInfo )
  */
-class GDCM_EXPORT gdcmJPEGFragment
+class GDCM_EXPORT JPEGFragment
 {
-friend class gdcmDocument;
-friend class gdcmFile;
-friend class gdcmPixelConvert;
-   long    Offset;
-   long    Length;
-   gdcmJPEGFragment()
-   {
-      Offset = 0;
-      Length = 0;
-   }
+public:
+   JPEGFragment();
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
+   void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int & statesuspension);
+
+   bool gdcm_read_JPEG_file8 (std::ifstream* fp, void* image_buffer, int & statesuspension );
+   bool gdcm_read_JPEG_file12 (std::ifstream* fp, void* image_buffer, int & statesuspension );
+   bool gdcm_read_JPEG_file16 (std::ifstream* fp, void* image_buffer, int & statesuspension );
+
+   void SetLength(uint32_t length) { Length = length; };
+   uint32_t GetLength() { return Length;};
+   void SetOffset(uint32_t offset) { Offset = offset; };
+   uint32_t GetOffset() { return Offset;};
+   uint8_t *GetImage()  { return pImage;};
+
+private:
+   uint32_t Offset;
+   uint32_t Length;
+
+   uint8_t *pImage;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif