X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg12.cxx;h=1b8ae574319582c2358ddd0c6b2943e9babb64ff;hb=3370a8090c600a3d4dbe5573a62d1dddb59819f2;hp=18d0787c184404ed5ef2fe9c55510928cad76eff;hpb=f6fd616782f9811f1390c64c9a3e7beb50ca4a04;p=gdcm.git diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx index 18d0787c..1b8ae574 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 04:52:55 $ - Version: $Revision: 1.17 $ + Date: $Date: 2004/10/08 17:24:54 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,7 +32,7 @@ */ extern "C" { -#include +//#include #include "src/jpeg/libijg12/jconfig.h" #include "src/jpeg/libijg12/jpeglib.h" //#include "jconfig12.h" @@ -107,7 +107,8 @@ typedef struct my_error_mgr * my_error_ptr; /* * Here's the routine that will replace the standard error_exit method: */ -METHODDEF(void) my_error_exit (j_common_ptr cinfo) { +METHODDEF(void) my_error_exit (j_common_ptr cinfo) +{ /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */ my_error_ptr myerr = (my_error_ptr) cinfo->err; @@ -135,7 +136,8 @@ 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 gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer) +{ char *pimage; /* This struct contains the JPEG decompression parameters and pointers to @@ -340,7 +342,7 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer) { /* And we're done! */ - return(true); + return true; } /*