X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmJpeg.cxx;h=76f04c23b834a962fc14e59e75958123277773a0;hb=659604feaaaf9519d03d59d66711f6b4b8290804;hp=4796cb46f570fc72c8fda1901a40f41cbcb17f88;hpb=b158878c883def8179e3eccc27fcea5bb6035a4c;p=gdcm.git

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 4796cb46..76f04c23 100644
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -1,10 +1,8 @@
+
 #include <stdio.h>
 #include "gdcmFile.h"
 
-// for jpeglib defined BITS_IN_JSAMPLE
-#include "jpeg/libijg8/jBitsInJsample.h"
-// FIXME : find something else when both 
-// libJpeg8 and libJpeg12 will be active
+#define BITS_IN_JSAMPLE 8
 
 #define DEBUG 0
 
@@ -148,11 +146,8 @@ my_error_exit (j_common_ptr cinfo) {
  * Sample routine for JPEG decompression.  We assume that the source file name
  * is passed in.  We want to return 1 on success, 0 on error.
  */
-
-
-//GLOBAL(int)
-int
-gdcmFile::gdcm_read_JPEG_file (void * image_buffer) {
+//GLOBAL(bool)
+bool gdcmFile::gdcm_read_JPEG_file (FILE *fp,void * image_buffer) {
 
 char *pimage;