X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg.cxx;h=7cce70bf59048f6de789eaefc3538f6aab3bfb33;hb=7acc5e4b2b49b027c93e29f871980d0b40fed541;hp=d95fbd541dd25263a1cd611fb3b44beead36c6ae;hpb=7a822ba5bef24e1f37e5ffa15d9c9fbaeb66cffa;p=gdcm.git diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx index d95fbd54..7cce70bf 100644 --- a/src/gdcmJpeg.cxx +++ b/src/gdcmJpeg.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJpeg.cxx,v $ Language: C++ - Date: $Date: 2005/02/04 23:49:23 $ - Version: $Revision: 1.44 $ + Date: $Date: 2005/02/05 15:15:26 $ + Version: $Revision: 1.46 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -197,16 +197,16 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo) { longjmp(myerr->setjmp_buffer, 1); } -METHODDEF(void) my_output_message (j_common_ptr cinfo) -{ - char buffer[JMSG_LENGTH_MAX]; - - /* Create the message */ - (*cinfo->err->format_message) (cinfo, buffer); - - // Custom display message, we could be more fancy and throw an exception: - gdcmErrorMacro( buffer ); -} +//METHODDEF(void) my_output_message (j_common_ptr cinfo) +//{ +// char buffer[JMSG_LENGTH_MAX]; +// +// /* Create the message */ +// (*cinfo->err->format_message) (cinfo, buffer); +// +// // Custom display message, we could be more fancy and throw an exception: +// gdcmErrorMacro( buffer ); +//} } //----------------------------------------------------------------------------- @@ -258,7 +258,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta // for any jpeg error call my_error_exit jerr.pub.error_exit = my_error_exit; // for any output message call my_output_message - jerr.pub.output_message = my_output_message; + //jerr.pub.output_message = my_output_message; // Establish the setjmp return context for my_error_exit to use. if (setjmp(jerr.setjmp_buffer))