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

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index bbfed948..69f334b5 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -1,11 +1,30 @@
-// gdcmJpeg2000.cxx
-//-----------------------------------------------------------------------------
-#include <stdio.h>
-#include "gdcmFile.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmJpeg2000.cxx,v $
+  Language:  C++
+  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
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+#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
@@ -14,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
-   printf("Sorry JPEG 2000 File not yet taken into account\n");
+bool gdcm_read_JPEG2000_file (std::ifstream* , void* )
+{
+   gdcmWarningMacro( "Sorry JPEG 2000 File not yet taken into account" );
    return false;
 }
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm