X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg12.cxx;h=a107ac22663b763998dc750c610b89366c8e878e;hb=4672e071f29ed17f7258b27e40d47642abfbb53f;hp=1b8ae574319582c2358ddd0c6b2943e9babb64ff;hpb=d0249ea513b772047eff7ad65c185f2f27689487;p=gdcm.git

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 1b8ae574..a107ac22 100644
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg12.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/08 17:24:54 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/10/12 04:35:46 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,12 +32,12 @@
  */
 
 extern "C" {
-//#include <stdio.h>
 #include "src/jpeg/libijg12/jconfig.h"
 #include "src/jpeg/libijg12/jpeglib.h"
-//#include "jconfig12.h"
 #include <setjmp.h>
 }
+namespace gdcm 
+{
 /******************** JPEG COMPRESSION SAMPLE INTERFACE *******************/
 
 //
@@ -128,7 +128,7 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo)
  */
  
  /**
- * \ingroup gdcmFile
+ * \ingroup File
  * \brief   routine for JPEG decompression 
  * @param fp pointer to an already open file descriptor 
  *                      12 significant bits per pixel
@@ -136,7 +136,7 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo)
  * @return 1 on success, 0 on error
  */
  
-bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer)
+bool gdcm_read_JPEG_file12 ( FILE* fp,void* image_buffer )
 {
    char *pimage;
 
@@ -171,7 +171,7 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer)
 
    int row_stride;/* physical row width in output buffer */
 #ifdef GDCM_JPG_DEBUG
-   printf("entree dans gdcmFile::gdcm_read_JPEG_file12, depuis gdcmJpeg\n");
+   printf("entree dans File::gdcm_read_JPEG_file12, depuis gdcmJpeg\n");
 #endif //GDCM_JPG_DEBUG
 
    /* In this example we want to open the input file before doing anything else,
@@ -371,3 +371,6 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer)
  */
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm
+