X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.cxx;h=31f933f358c0b41fffc92354d5901bbe80ac4868;hb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;hp=ba65b834c394c5b340d13358cd478e0c498be9b6;hpb=145420342c6af4fc7a257c809a105ecd3d8d85cc;p=gdcm.git

diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx
index ba65b834..31f933f3 100644
--- a/src/gdcmRLEFramesInfo.cxx
+++ b/src/gdcmRLEFramesInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/28 15:42:22 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/02/02 10:16:02 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,8 @@
 
 namespace gdcm 
 {
-
+//-------------------------------------------------------------------------
+// Constructor / Destructor
 RLEFramesInfo::~RLEFramesInfo()
 {
    for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it)
@@ -31,6 +32,116 @@ RLEFramesInfo::~RLEFramesInfo()
    Frames.clear();
 }
 
+//-----------------------------------------------------------------------------
+// Public
+void RLEFramesInfo::AddFrame(RLEFrame *frame)
+{
+   Frames.push_back(frame);
+}
+
+RLEFrame *RLEFramesInfo::GetFirstFrame()
+{
+   ItFrames = Frames.begin();
+   if (ItFrames != Frames.end())
+      return  *ItFrames;
+   return NULL;
+}
+
+RLEFrame *RLEFramesInfo::GetNextFrame()
+{
+   gdcmAssertMacro (ItFrames != Frames.end());
+
+   ++ItFrames;
+   if (ItFrames != Frames.end())
+      return  *ItFrames;
+   return NULL;
+}
+
+/**
+ * \brief     Reads from disk the Pixel Data of 'Run Length Encoded'
+ *            Dicom encapsulated file and decompress it.
+ * @param     fp already open File Pointer
+ *            at which the pixel data should be copied
+ * @param raw raw
+ * @param xSize x Size
+ * @param ySize y Size
+ * @param zSize z Size
+ * @param bitsAllocated Bits allocated
+ * @return    Boolean
+ */
+bool RLEFramesInfo::DecompressRLEFile( std::ifstream *fp , uint8_t *raw, 
+                                       int xSize, int ySize, int zSize, 
+                                       int bitsAllocated )
+{
+   uint8_t *subRaw = raw;
+   long rawSegmentSize = xSize * ySize;
+
+   // Loop on the frame[s]
+   for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it)
+   {
+      subRaw = (*it)->ReadAndDecompressRLEFrame( subRaw, rawSegmentSize, fp);
+   }
+
+   if ( bitsAllocated == 16 )
+   {
+      // Try to deal with RLE 16 Bits
+      ConvertRLE16BitsFromRLE8Bits( raw, xSize, ySize, zSize );
+   }
+
+   return true;
+}
+
+/**
+ * \brief  We assume Raw contains the decoded RLE pixels but as
+ *         8 bits per pixel. We convert those pixels to 16 bits
+ *         per pixel.
+ * @param raw raw
+ * @param xSize x Size
+ * @param ySize y Size
+ * @param numberOfFrames number of frames 
+ * @return    Boolean always true
+ */
+bool RLEFramesInfo::ConvertRLE16BitsFromRLE8Bits(uint8_t *raw, int xSize, 
+                                                 int ySize, int numberOfFrames)
+{
+   size_t pixelNumber = xSize * ySize;
+   size_t rawSize = xSize * ySize * numberOfFrames;
+
+   // We assumed Raw contains the decoded RLE pixels but as
+   // 8 bits per pixel. In order to convert those pixels to 16 bits
+   // per pixel we cannot work in place within Raw and hence
+   // we copy it in a safe place, say copyRaw.
+
+   uint8_t *copyRaw = new uint8_t[rawSize * 2];
+   memmove( copyRaw, raw, rawSize * 2 );
+
+   uint8_t *x = raw;
+   uint8_t *a = copyRaw;
+   uint8_t *b = a + pixelNumber;
+
+   for ( int i = 0; i < numberOfFrames; i++ )
+   {
+      for ( unsigned int j = 0; j < pixelNumber; j++ )
+      {
+         *(x++) = *(b++);
+         *(x++) = *(a++);
+      }
+   }
+   delete[] copyRaw;
+
+   /// \todo check that operator new [] didn't fail, and sometimes return false
+
+   return true;
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
 /**
  * \brief        Print self.
  * @param indent Indentation string to be prepended during printing.
@@ -55,27 +166,5 @@ void RLEFramesInfo::Print( std::ostream &os, std::string indent )
    }
 }
 
-void RLEFramesInfo::AddFrame(RLEFrame *frame)
-{
-   Frames.push_back(frame);
-}
-
-RLEFrame *RLEFramesInfo::GetFirstFrame()
-{
-   ItFrames = Frames.begin();
-   if (ItFrames != Frames.end())
-      return  *ItFrames;
-   return NULL;
-}
-
-RLEFrame *RLEFramesInfo::GetNexttFrame()
-{
-   gdcmAssertMacro (ItFrames != Frames.end());
-
-   ++ItFrames;
-   if (ItFrames != Frames.end())
-      return  *ItFrames;
-   return NULL;
-}
-
+//-----------------------------------------------------------------------------
 } // end namespace gdcm