STYLE: Remove old comments

[gdcm.git] / src / gdcmJPEGFragment.h

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 7540e6dbb774493721715c09f602f859a45c15ee..fa99e09d4a3c42314ffef2ccbd76bf893fdca411 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/18 04:01:09 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/09/02 07:10:03 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,10 +27,9 @@
 
 namespace gdcm 
 {
-#define JOCTET uint8_t
-
 /**
- * \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
@@ -45,18 +44,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 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 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:
-   long    Offset;
-   long    Length;
+   uint32_t Offset;
+   uint32_t Length;
 
-friend class Document;
-friend class File;
-friend class PixelReadConvert;
-friend class JPEGFragmentsInfo;
+   uint8_t *pImage;
 };
 } // end namespace gdcm