* src/gdcmDicomDir*.[h|cxx] : rename methods to be logik in their name.

[gdcm.git] / src / gdcmJpeg12.cxx

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index c43f1fcc479c4e3f4bf82978641b19b98f2fb463..d4069cb53d3215fdccfd13557fb55c06aac241b5 100644 (file)
--- 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: 2004/12/12 17:21:08 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,14 +16,18 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.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
 
 #include "gdcmJpeg.cxx"