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 928049fc6e8a895c434ca1e9e79625511b7e6f53..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: 2005/01/20 16:17:00 $
-  Version:   $Revision: 1.11 $
+  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
@@ -45,18 +45,23 @@ class GDCM_EXPORT JPEGFragment
 public:
    JPEGFragment();
    void Print( std::ostream &os = std::cout, std::string indent = "" );
-   void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits);
-   void DecompressJPEGSingleFrameFragmentsFromFile(JOCTET *buffer, size_t totalLength, uint8_t* raw, int nBits);
-   void DecompressJPEGFragmentedFramesFromFile(JOCTET *buffer, uint8_t* raw, int nBits, size_t &howManyRead, size_t &howManyWritten, size_t totalLength);
+   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:
-   long    Offset;
-   long    Length;
+   uint32_t Offset;
+   uint32_t Length;
 
-friend class Document;
-friend class FileHelper;
-friend class PixelReadConvert;
-friend class JPEGFragmentsInfo;
+   uint8_t *pImage;
 };
 } // end namespace gdcm