X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragment.h;h=70f3312bc79f4a29da4be8739a4ee1a235016617;hb=6d8a46d1577717ed6a5c9500d463bcdb39d25761;hp=203cd2e663cbb8e014cbd319b4715f09bc1a5762;hpb=2bb60efea83f2bfa1823f27b2a5536a0e6cfd8c0;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 203cd2e6..70f3312b 100644
--- a/src/gdcmJPEGFragment.h
+++ b/src/gdcmJPEGFragment.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 10:21:54 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/02/06 14:43:27 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,13 +21,15 @@
 #define GDCMJPEGFRAGMENT_H
 
 #include "gdcmCommon.h"
+
 #include <iostream>
+#include <fstream>
 
 namespace gdcm 
 {
-
 /**
- * \brief Utility class for summerizing the informations of a JPEG
+ * \brief *very* internal class . Shouldn't appear here !
+ *         Utility class for summerizing the informations of a JPEG
  *        fragment of an "Encapsulated JPEG Compressed Image".
  *        This information is a mix of:
  *        - the fragment offset
@@ -39,14 +41,28 @@ namespace gdcm
  */
 class GDCM_EXPORT JPEGFragment
 {
-friend class Document;
-friend class File;
-friend class PixelReadConvert;
-   long    Offset;
-   long    Length;
 public:
    JPEGFragment();
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string indent = "" );
+   void DecompressJPEGFramesFromFile(std::ifstream *fp, 
+                                     uint8_t *buffer, int nBits, 
+                                     int &statesuspension);
+
+   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 );
+
+   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