STYLE: Better approach to work around the timeval definition. Use type directly inste...

[gdcm.git] / src / gdcmJpeg16.cxx

diff --git a/src/gdcmJpeg16.cxx b/src/gdcmJpeg16.cxx
index fa9368dd1a4b6d171cd018739d79c85442e681e4..e7b2e6c6a1604b47521f3111951f27b017bb0f4a 100644 (file)
--- a/src/gdcmJpeg16.cxx
+++ b/src/gdcmJpeg16.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg16.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/07 14:28:55 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/01/20 17:17:12 $
+  Version:   $Revision: 1.8 $
                                                                                 
   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,19 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
+#include <stdio.h>
 
 extern "C" {
-#include "gdcmjpeg/16/jinclude.h"
+#include "gdcmjpeg/16/jconfig.h"
 #include "gdcmjpeg/16/jpeglib.h"
+#include "gdcmjpeg/16/jinclude.h"
+#include "gdcmjpeg/16/jerror.h"
 }
 
-#define gdcm_write_JPEG_file gdcm_write_JPEG_file16
-#define gdcm_read_JPEG_file  gdcm_read_JPEG_file16
+#define gdcm_write_JPEG_file  gdcm_write_JPEG_file16
+#define gdcm_read_JPEG_file   gdcm_read_JPEG_file16
+#define gdcm_read_JPEG_memory gdcm_read_JPEG_memory16
 
 #include "gdcmJpeg.cxx"