X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg12.cxx;h=0478a2e33967b67f73df94b4c0b9c38bb716ea1a;hb=c67ffef593e7635d8dfa7d3fe63d702e5afafc3e;hp=c43f1fcc479c4e3f4bf82978641b19b98f2fb463;hpb=e1830579102f036e9e558320a21990a9438ec9ef;p=gdcm.git

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index c43f1fcc..0478a2e3 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/11/07 14:28:55 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/01/24 14:52:50 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,15 +15,22 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
+#include <stdio.h>
 
 extern "C" {
-#include "gdcmjpeg/12/jinclude.h"
+#include "gdcmjpeg/12/jconfig.h"
 #include "gdcmjpeg/12/jpeglib.h"
+#include "gdcmjpeg/12/jinclude.h"
+#include "gdcmjpeg/12/jerror.h"
 }
 
-#define gdcm_write_JPEG_file gdcm_write_JPEG_file12
-#define gdcm_read_JPEG_file  gdcm_read_JPEG_file12
+#define gdcm_write_JPEG_file  gdcm_write_JPEG_file12
+#define gdcm_read_JPEG_file   gdcm_read_JPEG_file12
+#define gdcm_read_JPEG_memory gdcm_read_JPEG_memory12
+//#define StateSuspension StateSuspension12
+#define SampBuffer SampBuffer12
+//#define pimage pimage12
 
 #include "gdcmJpeg.cxx"