X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragment.h;h=fa99e09d4a3c42314ffef2ccbd76bf893fdca411;hb=f7276083b636d98a16f347fde5916a3fca6855db;hp=b2862aa6ea223a3410d0283c022a679bd40dea8c;hpb=a4cff04fcd2023f798a9f1ef6bc9307269abd185;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index b2862aa6..fa99e09d 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/26 11:42:02 $
-  Version:   $Revision: 1.13 $
+  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,19 +44,19 @@ 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, 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);
+   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 );
+   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;};
+   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;