X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpegLS.cxx;h=b84278181b5428e208e6bcf0f854ec202e5d229f;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=e0094b2ab84a50ac4a2f1f31776c94e761c6ead9;hpb=4b66b19dfd3c15f96b843923ca587252bf988cde;p=gdcm.git

diff --git a/src/gdcmJpegLS.cxx b/src/gdcmJpegLS.cxx
index e0094b2a..b8427818 100644
--- a/src/gdcmJpegLS.cxx
+++ b/src/gdcmJpegLS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpegLS.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:03:58 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/05/23 14:18:10 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,18 +15,22 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-//-----------------------------------------------------------------------------
 #include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 //-----------------------------------------------------------------------------
  /**
- * \brief   routine for JPEG decompression 
+ * \brief   routine for JPEG decompression. WARNING LPEG-LS is NOT
+ *   the 'classical' jpeg lossless. See :
+ *   http://www.jpeg.org/jpeg/jpegls.html
+ *   gdcm DOES deal with 'classical' jpeg lossless
+ *
  * @param fp pointer to an already open file descriptor 
  *                      JPEG-LS encoded image
  * @param image_buffer to receive uncompressed pixels
@@ -34,10 +38,11 @@ namespace gdcm
  * @warning : not yet made
  */
 
-bool gdcm_read_JPEGLS_file (std::ifstream* fp,void* image_buffer) {
-   (void)fp;                  //FIXME
-   (void)image_buffer;        //FIXME
-   std::cout << "Sorry JPEG-LS File not yet taken into account" << std::endl;
+bool gdcm_read_JPEGLS_file (std::ifstream *fp, void *image_buffer)
+{
+   (void)fp;
+   (void)image_buffer;
+   gdcmWarningMacro( "Sorry JPEG-LS File not yet taken into account" );
    return false;
 }
 } // end namespace gdcm