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

diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h
index 987da56d..e4b271bc 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: 2007/09/17 12:16:01 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,20 +17,19 @@
 =========================================================================*/
 
 
-#ifndef GDCMJPEGFRAGMENT_H
-#define GDCMJPEGFRAGMENT_H
+#ifndef _GDCMJPEGFRAGMENT_H_
+#define _GDCMJPEGFRAGMENT_H_
 
-#include "gdcmCommon.h"
+#include "gdcmBase.h"
 
 #include <iostream>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
-#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
@@ -38,32 +37,32 @@ namespace gdcm
  *
  *        Each instance of this class (they can be as many instances for
  *        a given Document as they are JPEG fragments and they are
- *        collected in a \ref JPEGFragmentsInfo )
+ *        collected in a JPEGFragmentsInfo )
  */
-class GDCM_EXPORT JPEGFragment
+class GDCM_EXPORT JPEGFragment : public Base
 {
 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 );
+   void Print( std::ostream &os = std::cout, std::string const &indent = "" );
+   void DecompressJPEGFramesFromFile(std::ifstream *fp, 
+                                     uint8_t *buffer, int nBits, 
+                                     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