X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=ad5956c5b5cfbf5082a4a5717f0fcf158f35dbcc;hb=baa2037ebb1ea642207f98a099306b3e9fd7d9f4;hp=895c865b553b971dbd5376c6e4da8de192b57b88;hpb=2fde1103e77a2448cce41d061781d0ec89ef239b;p=gdcm.git

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 895c865b..ad5956c5 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -1,16 +1,46 @@
- 
- /* -------------------------------------------------------------------- */
- //
- // JPEG 2000 Files
- //
- /* -------------------------------------------------------------------- */
-
-#include <stdio.h>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmJpeg2000.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/12/04 17:17:15 $
+  Version:   $Revision: 1.15 $
+                                                                                
+  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 "gdcmFile.h"
 
-bool gdcmFile::gdcm_read_JPEG2000_file (FILE *fp,void * image_buffer) {
-   printf("Sorry JPEG 2000 File not yet taken into account\n");
+#include <iostream>
+#include <fstream>
+
+namespace gdcm 
+{
+
+//-----------------------------------------------------------------------------
+ /**
+ * \brief   routine for JPEG decompression 
+ * @param fp pointer to an already open file descriptor 
+ *                      JPEG2000 encoded image
+ * @param image_buffer to receive uncompressed pixels
+ * @return 1 on success, 0 on error
+ * @warning : not yet made
+ */
+
+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
 
+//-----------------------------------------------------------------------------