X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelWriteConvert.cxx;h=899f816f84e8047ed78399f4cfa27119930b3356;hb=ebc807df21ba9e4e7ecae409d875ed46b47cd79c;hp=a4f8cec9072a94114db333ec351f4976b0b2a17e;hpb=5d1776a78fb7d94a8325a00e438f7be82c16053c;p=gdcm.git

diff --git a/src/gdcmPixelWriteConvert.cxx b/src/gdcmPixelWriteConvert.cxx
index a4f8cec9..899f816f 100644
--- a/src/gdcmPixelWriteConvert.cxx
+++ b/src/gdcmPixelWriteConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelWriteConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 11:55:38 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/01/23 10:12:34 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,20 +16,15 @@
                                                                                 
 =========================================================================*/
 
-//////////////////   TEMPORARY NOTE
-// look for "fixMem" and convert that to a member of this class
-// Removing the prefix fixMem and dealing with allocations should do the trick
-//
-// grep PixelWriteConvert everywhere and clean up !
-
 #include "gdcmDebug.h"
 #include "gdcmPixelWriteConvert.h"
-#include <stdio.h>
 
 namespace gdcm
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
+
+/// \brief Construcror
 PixelWriteConvert::PixelWriteConvert() 
 {
    ReadData = 0;
@@ -39,33 +34,67 @@ PixelWriteConvert::PixelWriteConvert()
    UserDataSize = 0;
 }
 
+/// \brief Destructor
 PixelWriteConvert::~PixelWriteConvert() 
 {
 }
 
 //-----------------------------------------------------------------------------
 // Public
-void PixelWriteConvert::SetReadData(uint8_t* data,size_t size)
+
+/**
+ * \brief   SetReadData
+ * @param   data data
+ * @param   size size
+ */
+void PixelWriteConvert::SetReadData(uint8_t *data,size_t size)
 {
    ReadData = data;
    ReadDataSize = size;
 }
 
-void PixelWriteConvert::SetUserData(uint8_t* data,size_t size)
+/**
+ * \brief   SetUserData
+ * @param   data data
+ * @param   size size
+ */
+void PixelWriteConvert::SetUserData(uint8_t *data,size_t size)
 {
    UserData = data;
    UserDataSize = size;
 }
 
+/**
+ * \brief   GetData
+ * @return  data 
+ */
+uint8_t *PixelWriteConvert::GetData()
+{
+   if(UserData)
+   {
+      return UserData;
+   }
+   else
+   {
+      return ReadData;
+   }
+}
+
+/**
+ * \brief   GetDataSize
+ * @return  size 
+ */
+size_t PixelWriteConvert::GetDataSize()
+{
+   if(UserData)
+   {
+      return UserDataSize;
+   }
+   else
+   {
+      return ReadDataSize;
+   }
+}
+
 //-----------------------------------------------------------------------------
 } // end namespace gdcm
-
-// NOTES on File internal calls
-// User
-// ---> GetImageData
-//     ---> GetImageDataIntoVector
-//        |---> GetImageDataIntoVectorRaw
-//        | lut intervention
-// User
-// ---> GetImageDataRaw
-//     ---> GetImageDataIntoVectorRaw