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

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 3b0499be..d2862fa9 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/01/20 17:17:12 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,11 +16,16 @@
                                                                                 
 =========================================================================*/
 //-----------------------------------------------------------------------------
-#include "gdcmFile.h"
+#include "gdcmFileHelper.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 +34,13 @@
  * @warning : not yet made
  */
 
-bool gdcmFile::gdcm_read_JPEG2000_file (FILE* fp,void* image_buffer) {
+bool gdcm_read_JPEG2000_file (std::ifstream* fp,void* image_buffer) {
    (void)fp;                  //FIXME
    (void)image_buffer;        //FIXME
    std::cout << "Sorry JPEG 2000 File not yet taken into account" << std::endl;
    return false;
 }
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------