X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=69f334b5ad2c86e1cc8afcaec349c154b19a898e;hb=efd3ea11eb9d6da5f3034f5e46649d250b90c75a;hp=3b0499bef8e1ee69028516968ae113a2c1795b7d;hpb=f6fd616782f9811f1390c64c9a3e7beb50ca4a04;p=gdcm.git

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 3b0499be..69f334b5 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/08 04:52:55 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/02/05 01:37:09 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,12 +15,16 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-//-----------------------------------------------------------------------------
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
+
+#include <iostream>
+#include <fstream>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
  /**
- * \ingroup gdcmFile
  * \brief   routine for JPEG decompression 
  * @param fp pointer to an already open file descriptor 
  *                      JPEG2000 encoded image
@@ -29,12 +33,12 @@
  * @warning : not yet made
  */
 
-bool gdcmFile::gdcm_read_JPEG2000_file (FILE* fp,void* image_buffer) {
-   (void)fp;                  //FIXME
-   (void)image_buffer;        //FIXME
-   std::cout << "Sorry JPEG 2000 File not yet taken into account" << std::endl;
+bool gdcm_read_JPEG2000_file (std::ifstream* , void* )
+{
+   gdcmWarningMacro( "Sorry JPEG 2000 File not yet taken into account" );
    return false;
 }
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm