X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragmentsInfo.cxx;h=3102c4f3851427c07649f1f489066af312d94b0a;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=7a1ad3972eb2b29e534b0973295d3fe620433f48;hpb=2d43f5c8ae2004242af2297ceb2926d81675548f;p=gdcm.git

diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx
index 7a1ad397..3102c4f3 100644
--- a/src/gdcmJPEGFragmentsInfo.cxx
+++ b/src/gdcmJPEGFragmentsInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/28 22:21:57 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2007/05/23 14:18:10 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,9 +17,18 @@
 =========================================================================*/
 
 #include "gdcmJPEGFragmentsInfo.h"
+#include "gdcmDebug.h"
 
-namespace gdcm 
+#include <fstream>
+
+namespace GDCM_NAME_SPACE 
+{
+//-------------------------------------------------------------------------
+// Constructor / Destructor
+JPEGFragmentsInfo::JPEGFragmentsInfo()
 {
+   StateSuspension = 0;
+}
 
 /**
  * \brief Default destructor
@@ -35,16 +44,72 @@ JPEGFragmentsInfo::~JPEGFragmentsInfo()
    Fragments.clear();
 }
 
+//-----------------------------------------------------------------------------
+// Public
+void JPEGFragmentsInfo::DecompressFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int , int )
+{
+   // Pointer to the Raw image
+   uint8_t *localRaw = buffer;
+
+  // Loop on the fragment[s]
+   JPEGFragmentsList::const_iterator it;
+   for( it  = Fragments.begin();
+        it != Fragments.end();
+        ++it )
+   {
+     (*it)->DecompressJPEGFramesFromFile(fp, localRaw, nBits, StateSuspension);
+     // update pointer to image after some scanlines read:
+     localRaw = (*it)->GetImage();
+   }
+}
+
+void JPEGFragmentsInfo::AddFragment(JPEGFragment *fragment)
+{
+   Fragments.push_back(fragment);
+}
+
+JPEGFragment *JPEGFragmentsInfo::GetFirstFragment()
+{
+   ItFragments = Fragments.begin();
+   if (ItFragments != Fragments.end())
+      return  *ItFragments;
+   return NULL;
+}
+
+JPEGFragment *JPEGFragmentsInfo::GetNextFragment()
+{
+   gdcmAssertMacro (ItFragments != Fragments.end());
+
+   ++ItFragments;
+   if (ItFragments != Fragments.end())
+      return  *ItFragments;
+   return NULL;
+}
+
+unsigned int JPEGFragmentsInfo::GetFragmentCount()
+{
+   return Fragments.size();
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
 /**
  * \brief        Print self.
- * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
+ * @param indent Indentation string to be prepended during printing.
  */
-void JPEGFragmentsInfo::Print( std::string indent, std::ostream &os )
+void JPEGFragmentsInfo::Print( std::ostream &os, std::string const &indent )
 {
+   os << std::endl;
    os << indent
       << "----------------- JPEG fragments --------------------------------"
-      << std::endl;
+      << std::endl << std::endl;
    os << indent
       << "Total number of fragments : " << Fragments.size()
       << std::endl;
@@ -55,10 +120,10 @@ void JPEGFragmentsInfo::Print( std::string indent, std::ostream &os )
    {
       os << indent
          << "   fragment number :" << fragmentNumber++;
-      (*it)->Print( indent + "   ", os );
-      os << std::endl;
+      (*it)->Print( os, indent + "   ");
    }
+   os << std::endl;
 }
 
-
+//-----------------------------------------------------------------------------
 } // end namespace gdcm