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

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 29393004..69f334b5 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -1,29 +1,44 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
- 
- 
- /* -------------------------------------------------------------------- */
- //
- // JPEG 2000 Files
- //
- /* -------------------------------------------------------------------- */
+/*=========================================================================
+                                                                                
+  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 <stdio.h>
-#include "gdcmFile.h"
+#include <iostream>
+#include <fstream>
 
-int
-gdcmFile::gdcm_read_JPEG2000_file (void * image_buffer) {
+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
+ */
 
-
-   printf("Sorry JPEG 2000 File not yet taken into account\n");
-   return 0;
+bool gdcm_read_JPEG2000_file (std::ifstream* , void* )
+{
+   gdcmWarningMacro( "Sorry JPEG 2000 File not yet taken into account" );
+   return false;
 }
 
+//-----------------------------------------------------------------------------
+} // end namespace gdcm