X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmJPEGFragment.h;h=b2862aa6ea223a3410d0283c022a679bd40dea8c;hb=ab3dc69a71af640fa49cbd917272d9ff7d1651b6;hp=8434bdf2f8097b520656c1aced0cad2bfada8a12;hpb=d5e16925a7d3c8dbd0e71b1989629ca0f619b119;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 8434bdf2..b2862aa6 100644
--- 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/17 01:14:33 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/01/26 11:42:02 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,6 +23,7 @@
 #include "gdcmCommon.h"
 
 #include <iostream>
+#include <fstream>
 
 namespace gdcm 
 {
@@ -44,17 +45,25 @@ 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 DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int & statesuspension);
    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);
 
+   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 File;
-friend class PixelReadConvert;
+   uint8_t *pImage;
 };
 } // end namespace gdcm