Fix mistypings

[gdcm.git] / src / gdcmJPEGFragmentsInfo.h

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index 72b7b6e34ff01f3fc9fb6b3afa9c366632c90b49..f52d6be8f94e3059df64086eaefbc2ee576b3f39 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: 2005/01/24 14:52:50 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/09/17 12:16:01 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,50 +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
+ *        of JPEG fragment[s] (see 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 File::ComputeJPEGFragmentInfo() ).
  *        They shall be used when (if necessary) decoding the fragments.
  *
- *        This class is simply a stl list<> of \ref JPEGFragment.
+ *        This class is simply a stl list<> of JPEGFragment.
  */
 class GDCM_EXPORT JPEGFragmentsInfo
 {
-public:
+friend class File;
+friend class PixelReadConvert;
+
+private:
    JPEGFragmentsInfo();
    ~JPEGFragmentsInfo();
-   void Print( std::ostream &os = std::cout, std::string const & indent = "" );
-   size_t GetFragmentsLength();
-   void ReadAllFragments(std::ifstream *fp, JOCTET *buffer );
+   void Print( std::ostream &os = std::cout, std::string const &indent = "" );
 
-   void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length);
-private:
-   typedef std::list< JPEGFragment* > JPEGFragmentsList;
+   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;
-
-friend class Document;
-friend class FileHelper;
-friend class PixelReadConvert;
+   char *pimage;
+   JPEGFragmentsList Fragments;
+   JPEGFragmentsList::iterator ItFragments;
 };
 } // end namespace gdcm