X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmJPEGFragment.h;h=e6d74eb8d408fc8954c890a3a2a7da4fe438d8f5;hb=edbf0a74fea44d09f5263828d9091d3d321155b5;hp=987da56d4210d1aed3688e980606a312a4a54df2;hpb=70a3a0f95bf2240a6ef4b1d6523c0e6614437304;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 987da56d..e6d74eb8 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/24 14:52:50 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/01/31 04:00:04 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,8 +27,6 @@
 
 namespace gdcm 
 {
-#define JOCTET uint8_t
-
 /**
  * \brief Utility class for summerizing the informations of a JPEG
  *        fragment of an "Encapsulated JPEG Compressed Image".
@@ -46,24 +44,22 @@ public:
    JPEGFragment();
    void Print( std::ostream &os = std::cout, std::string indent = "" );
    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 );
 
-//private:
-   uint32_t    Offset;
-   uint32_t    Length;
+   bool ReadJPEGFile8 (std::ifstream* fp, void* image_buffer, int & statesuspension );
+   bool ReadJPEGFile12 (std::ifstream* fp, void* image_buffer, int & statesuspension );
+   bool ReadJPEGFile16 (std::ifstream* fp, void* image_buffer, int & statesuspension );
 
-   uint8_t *pimage;
+   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;
 
-friend class Document;
-friend class FileHelper;
-friend class PixelReadConvert;
-friend class JPEGFragmentsInfo;
+   uint8_t *pImage;
 };
 } // end namespace gdcm