COMP: Solve both problem of push_back missing in VS6 (already fixed) and no need...

[gdcm.git] / src / gdcmJPEGFragmentsInfo.h

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index 4f445b7d1f61f406ae365678e0f5cdc387d71718..20f17977a2c640b539f7ad18031ea114f7b19ab5 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/28 15:42:22 $
+  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,7 +27,6 @@
 
 namespace gdcm 
 {
-
 /**
  * \brief Utility class for gathering the informations of the collection
  *        of JPEG fragment[s] (see \ref JPEGFragment)  when handling
@@ -41,17 +40,32 @@ namespace gdcm
  */
 class GDCM_EXPORT JPEGFragmentsInfo
 {
-friend class Document;
-friend class File;
-friend class PixelReadConvert;
-private:
-   typedef std::list< JPEGFragment* > JPEGFragmentsList;
-   JPEGFragmentsList Fragments;
 public:
+   JPEGFragmentsInfo();
    ~JPEGFragmentsInfo();
-   void Print( std::string indent = "", std::ostream &os = std::cout );
+   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
+   size_t GetFragmentsLength();
+   void ReadAllFragments(std::ifstream *fp, JOCTET *buffer );
+
+   void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length);
+
+   void AddFragment(JPEGFragment *fragment);
+   JPEGFragment *GetFirstFragment();
+   JPEGFragment *GetNextFragment();
+   unsigned int GetFragmentCount();
+
+private:
+   typedef std::list<JPEGFragment *> JPEGFragmentsList;
+
+    //Some mathieu hack:
+   int StateSuspension;
+   void *SampBuffer;
+   char* pimage;
+   JPEGFragmentsList Fragments;
+   JPEGFragmentsList::iterator ItFragments;
 };
 } // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif
+