X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragmentsInfo.h;h=c4892ac529acdca041ea1fa1c1827296985be827;hb=8e7d7cb974953d9bc78b905451de7ca72887dc58;hp=b416f1612969da589741007d1d760cd3781060df;hpb=d00078b5e19310b379c8339fa8fe38362e8ca392;p=gdcm.git

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index b416f161..c4892ac5 100644
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:17:00 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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,43 +17,53 @@
 =========================================================================*/
 
 
-#ifndef GDCMJPEGFRAGMENTSINFO_H
-#define GDCMJPEGFRAGMENTSINFO_H
+#ifndef _GDCMJPEGFRAGMENTSINFO_H_
+#define _GDCMJPEGFRAGMENTSINFO_H_
 
 #include "gdcmJPEGFragment.h"
 
 #include <list>
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE
 {
-
 /**
  * \brief Utility class for gathering the informations of the collection
  *        of JPEG fragment[s] (see \ref JPEGFragment)  when handling
  *        "Encapsulated JPEG Compressed Images". 
- *        The informations on each frame are obtained during the parsing
- *        of a Document (refer to
- *         \ref Document::ComputeJPEGFragmentInfo() ).
+ *        The informations on each frame are obtained during the pixel parsing
+ *        of a gdcm::File (refer to \ref File::ComputeJPEGFragmentInfo() ).
  *        They shall be used when (if necessary) decoding the fragments.
  *
  *        This class is simply a stl list<> of \ref JPEGFragment.
  */
 class GDCM_EXPORT JPEGFragmentsInfo
 {
-public:
-   ~JPEGFragmentsInfo();
-   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
-   size_t GetFragmentsLength();
-   void ReadAllFragments(std::ifstream *fp, JOCTET *buffer );
+friend class File;
+friend class PixelReadConvert;
 
 private:
-   typedef std::list< JPEGFragment* > JPEGFragmentsList;
-   JPEGFragmentsList Fragments;
+   JPEGFragmentsInfo();
+   ~JPEGFragmentsInfo();
+   void Print( std::ostream &os = std::cout, std::string const &indent = "" );
 
-friend class Document;
-friend class FileHelper;
-friend class PixelReadConvert;
+   void DecompressFromFile(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