X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg.cxx;h=c2b93070ac28ff1836fa12d6afdf175ff294d3c0;hb=bceba88a812a964eef1cdaa53bcc809739e5dda7;hp=4796cb46f570fc72c8fda1901a40f41cbcb17f88;hpb=b158878c883def8179e3eccc27fcea5bb6035a4c;p=gdcm.git diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx index 4796cb46..c2b93070 100644 --- a/src/gdcmJpeg.cxx +++ b/src/gdcmJpeg.cxx @@ -1,10 +1,9 @@ +// gdcmJpeg.cxx +//----------------------------------------------------------------------------- #include #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 @@ -119,96 +118,96 @@ extern "C" { * Here's the extended error handler struct: */ +//----------------------------------------------------------------------------- struct my_error_mgr { - struct jpeg_error_mgr pub; /* "public" fields */ - jmp_buf setjmp_buffer; /* for return to caller */ + struct jpeg_error_mgr pub; /* "public" fields */ + jmp_buf setjmp_buffer; /* for return to caller */ }; +//----------------------------------------------------------------------------- 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) { + /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */ + my_error_ptr myerr = (my_error_ptr) cinfo->err; -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; + /* Always display the message. */ + /* We could postpone this until after returning, if we chose. */ + (*cinfo->err->output_message) (cinfo); - /* Always display the message. */ - /* We could postpone this until after returning, if we chose. */ - (*cinfo->err->output_message) (cinfo); - - /* Return control to the setjmp point */ - longjmp(myerr->setjmp_buffer, 1); + /* Return control to the setjmp point */ + longjmp(myerr->setjmp_buffer, 1); } - +//----------------------------------------------------------------------------- /* * 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) { - -char *pimage; - - /* This struct contains the JPEG decompression parameters and pointers to - * working space (which is allocated as needed by the JPEG library). - */ - - struct jpeg_decompress_struct cinfo; - - /* -------------- inside, we found : - JDIMENSION image_width; // input image width - JDIMENSION image_height; // input image height - int input_components; // nb of color components in input image - J_COLOR_SPACE in_color_space; // colorspace of input image - double input_gamma; // image gamma of input image - -------------- */ - - /* We use our private extension JPEG error handler. - * Note that this struct must live as long as the main JPEG parameter - * struct, to avoid dangling-pointer problems. - */ - struct my_error_mgr jerr; - /* More stuff */ - JSAMPARRAY buffer; /* Output row buffer */ - - // rappel : - // ------ - // typedef unsigned char JSAMPLE; - // typedef JSAMPLE FAR *JSAMPROW; /* ptr to one image row of pixel samples. */ - // typedef JSAMPROW *JSAMPARRAY; /* ptr to some rows (a 2-D sample array) */ - // typedef JSAMPARRAY *JSAMPIMAGE; /* a 3-D sample array: top index is color */ - + /** + * \ingroup gdcmFile + * \brief routine for JPEG decompression + * @param fp pointer to an already open file descriptor + * 8 significant bits per pixel + * @param image_buffer to receive uncompressed pixels + * @return 1 on success, 0 on error + */ - int row_stride; /* physical row width in output buffer */ +bool gdcmFile::gdcm_read_JPEG_file (FILE *fp,void * image_buffer) { + char *pimage; + + /* This struct contains the JPEG decompression parameters and pointers to + * working space (which is allocated as needed by the JPEG library). + */ + struct jpeg_decompress_struct cinfo; + + /* -------------- inside, we found : + * JDIMENSION image_width; // input image width + * JDIMENSION image_height; // input image height + * int input_components; // nb of color components in input image + * J_COLOR_SPACE in_color_space; // colorspace of input image + * double input_gamma; // image gamma of input image + * -------------- */ + + /* We use our private extension JPEG error handler. + * Note that this struct must live as long as the main JPEG parameter + * struct, to avoid dangling-pointer problems. + */ + struct my_error_mgr jerr; + /* More stuff */ + + JSAMPARRAY buffer; /* Output row buffer */ - if (DEBUG) printf("entree dans gdcmFile::gdcm_read_JPEG_file, depuis gdcmJpeg\n"); - - - /* In this example we want to open the input file before doing anything else, - * so that the setjmp() error recovery below can assume the file is open. - * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that - * requires it in order to read binary files. - */ - - /* Step 1: allocate and initialize JPEG decompression object */ + // rappel : + // ------ + // typedef unsigned char JSAMPLE; + // typedef JSAMPLE FAR *JSAMPROW; /* ptr to one image row of pixel samples. */ + // typedef JSAMPROW *JSAMPARRAY; /* ptr to some rows (a 2-D sample array) */ + // typedef JSAMPARRAY *JSAMPIMAGE; /* a 3-D sample array: top index is color */ + + int row_stride; /* physical row width in output buffer */ - if (DEBUG)printf("Entree Step 1\n"); + if (DEBUG) printf("entree dans gdcmFile::gdcm_read_JPEG_file12, depuis gdcmJpeg\n"); + /* In this example we want to open the input file before doing anything else, + * so that the setjmp() error recovery below can assume the file is open. + * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that + * requires it in order to read binary files. + */ + + /* Step 1: allocate and initialize JPEG decompression object */ + if (DEBUG)printf("Entree Step 1\n"); + /* We set up the normal JPEG error routines, then override error_exit. */ cinfo.err = jpeg_std_error(&jerr.pub); jerr.pub.error_exit = my_error_exit; - /* Establish the setjmp return context for my_error_exit to use. */ - + /* Establish the setjmp return context for my_error_exit to use. */ if (setjmp(jerr.setjmp_buffer)) { /* If we get here, the JPEG code has signaled an error. * We need to clean up the JPEG object, close the input file, and return. @@ -219,100 +218,92 @@ char *pimage; /* Now we can initialize the JPEG decompression object. */ jpeg_create_decompress(&cinfo); - /* Step 2: specify data source (eg, a file) */ - -if (DEBUG) printf("Entree Step 2\n"); + /* Step 2: specify data source (eg, a file) */ + if (DEBUG) printf("Entree Step 2\n"); - jpeg_stdio_src(&cinfo, fp); + jpeg_stdio_src(&cinfo, fp); - /* Step 3: read file parameters with jpeg_read_header() */ + /* Step 3: read file parameters with jpeg_read_header() */ + if (DEBUG) printf("Entree Step 3\n"); - if (DEBUG) printf("Entree Step 3\n"); - - (void) jpeg_read_header(&cinfo, TRUE); + (void) jpeg_read_header(&cinfo, TRUE); - /* We can ignore the return value from jpeg_read_header since - * (a) suspension is not possible with the stdio data source, and - * (b) we passed TRUE to reject a tables-only JPEG file as an error. - * See libjpeg.doc for more info. - */ - -if (DEBUG) { - printf("--------------Header contents :----------------\n"); - printf("image_width %d image_height %d\n", - cinfo.image_width , cinfo.image_height); - printf("bits of precision in image data %d \n", - cinfo.output_components); - printf("nb of color components returned %d \n", - cinfo.data_precision); -} - - -/* - JDIMENSION image_width; // input image width - JDIMENSION image_height; // input image height - int output_components; // # of color components returned - J_COLOR_SPACE in_color_space; // colorspace of input image - double input_gamma; // image gamma of input image - int data_precision; // bits of precision in image data - -*/ - - /* Step 4: set parameters for decompression */ + /* We can ignore the return value from jpeg_read_header since + * (a) suspension is not possible with the stdio data source, and + * (b) we passed TRUE to reject a tables-only JPEG file as an error. + * See libjpeg.doc for more info. + */ + + if (DEBUG) { + printf("--------------Header contents :----------------\n"); + printf("image_width %d image_height %d\n", + cinfo.image_width , cinfo.image_height); + printf("bits of precision in image data %d \n", + cinfo.output_components); + printf("nb of color components returned %d \n", + cinfo.data_precision); + } + + + /* + * JDIMENSION image_width; // input image width + * JDIMENSION image_height; // input image height + * int output_components; // # of color components returned + * J_COLOR_SPACE in_color_space; // colorspace of input image + * double input_gamma; // image gamma of input image + * int data_precision; // bits of precision in image data + */ + + /* Step 4: set parameters for decompression */ + if (DEBUG) printf("Entree Step 4\n"); + /* In this example, we don't need to change any of the defaults set by + * jpeg_read_header(), so we do nothing here. + */ + + /* Step 5: Start decompressor */ + if (DEBUG) printf("Entree Step 5\n"); + + (void) jpeg_start_decompress(&cinfo); + /* We can ignore the return value since suspension is not possible + * with the stdio data source. + */ + + /* We may need to do some setup of our own at this point before reading + * the data. After jpeg_start_decompress() we have the correct scaled + * output image dimensions available, as well as the output colormap + * if we asked for color quantization. + * In this example, we need to make an output work buffer of the right size. + */ + + /* JSAMPLEs per row in output buffer */ + row_stride = cinfo.output_width * cinfo.output_components; - if (DEBUG) printf("Entree Step 4\n"); - - /* In this example, we don't need to change any of the defaults set by - * jpeg_read_header(), so we do nothing here. - */ - - /* Step 5: Start decompressor */ - - if (DEBUG) printf("Entree Step 5\n"); - - (void) jpeg_start_decompress(&cinfo); - /* We can ignore the return value since suspension is not possible - * with the stdio data source. - */ - - /* We may need to do some setup of our own at this point before reading - * the data. After jpeg_start_decompress() we have the correct scaled - * output image dimensions available, as well as the output colormap - * if we asked for color quantization. - * In this example, we need to make an output work buffer of the right size. - */ - - /* JSAMPLEs per row in output buffer */ - row_stride = cinfo.output_width * cinfo.output_components; - - if (DEBUG) printf ("cinfo.output_width %d cinfo.output_components %d row_stride %d\n", - cinfo.output_width, cinfo.output_components,row_stride); + if (DEBUG) printf ("cinfo.output_width %d cinfo.output_components %d row_stride %d\n", + cinfo.output_width, cinfo.output_components,row_stride); - /* Make a one-row-high sample array that will go away when done with image */ - buffer = (*cinfo.mem->alloc_sarray) - ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); + /* Make a one-row-high sample array that will go away when done with image */ + buffer = (*cinfo.mem->alloc_sarray) + ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); - /* Step 6: while (scan lines remain to be read) */ - - if (DEBUG) printf("Entree Step 6\n"); + /* Step 6: while (scan lines remain to be read) */ + if (DEBUG) printf("Entree Step 6\n"); - /* jpeg_read_scanlines(...); */ + /* jpeg_read_scanlines(...); */ - /* Here we use the library's state variable cinfo.output_scanline as the - * loop counter, so that we don't have to keep track ourselves. - */ - - if (DEBUG) printf ("cinfo.output_height %d cinfo.output_width %d\n", - cinfo.output_height,cinfo.output_width); + /* Here we use the library's state variable cinfo.output_scanline as the + * loop counter, so that we don't have to keep track ourselves. + */ + if (DEBUG) + printf ("cinfo.output_height %d cinfo.output_width %d\n", + cinfo.output_height,cinfo.output_width); - pimage=(char *)image_buffer; - + pimage=(char *)image_buffer; - while (cinfo.output_scanline < cinfo.output_height) { - /* jpeg_read_scanlines expects an array of pointers to scanlines. - * Here the array is only one element long, but you could ask for - * more than one scanline at a time if that's more convenient. - */ + while (cinfo.output_scanline < cinfo.output_height) { + /* jpeg_read_scanlines expects an array of pointers to scanlines. + * Here the array is only one element long, but you could ask for + * more than one scanline at a time if that's more convenient. + */ // l'image est deja allouée (et passée en param) // on ecrit directement les pixels @@ -332,35 +323,34 @@ if (DEBUG) { } /* Step 7: Finish decompression */ - -if (DEBUG) printf("Entree Step 7\n"); + if (DEBUG) printf("Entree Step 7\n"); + (void) jpeg_finish_decompress(&cinfo); + + /* We can ignore the return value since suspension is not possible + * with the stdio data source. + */ - (void) jpeg_finish_decompress(&cinfo); - /* We can ignore the return value since suspension is not possible - * with the stdio data source. - */ + /* Step 8: Release JPEG decompression object */ - /* Step 8: Release JPEG decompression object */ - -if (DEBUG) printf("Entree Step 8\n"); + if (DEBUG) printf("Entree Step 8\n"); - /* This is an important step since it will release a good deal of memory. */ - - jpeg_destroy_decompress(&cinfo); + /* This is an important step since it will release a good deal of memory. */ - /* After finish_decompress, we can close the input file. - * Here we postpone it until after no more JPEG errors are possible, - * so as to simplify the setjmp error logic above. (Actually, I don't - * think that jpeg_destroy can do an error exit, but why assume anything...) - */ + jpeg_destroy_decompress(&cinfo); - /* At this point you may want to check to see whether any corrupt-data - * warnings occurred (test whether jerr.pub.num_warnings is nonzero). - */ + /* After finish_decompress, we can close the input file. + * Here we postpone it until after no more JPEG errors are possible, + * so as to simplify the setjmp error logic above. (Actually, I don't + * think that jpeg_destroy can do an error exit, but why assume anything...) + */ - /* And we're done! */ - - return 1; + /* At this point you may want to check to see whether any corrupt-data + * warnings occurred (test whether jerr.pub.num_warnings is nonzero). + */ + + /* And we're done! */ + + return(true); } /* @@ -388,9 +378,4 @@ if (DEBUG) printf("Entree Step 8\n"); * temporary files are deleted if the program is interrupted. See libjpeg.doc. */ - - - - - - +//-----------------------------------------------------------------------------