#define BITS_IN_JSAMPLE 12
+#define GDCM_jpr_DEBUG 0
// BITS_IN_JSAMPLE is a compile time defined options.
// We need both 8 an 12;
// To avoid renaming *all* the Jpeg functions,
#define jpeg_read_header jReadHeader
#define jpeg_read_scanlines jReadScanlines
#define jpeg_finish_decompress jFinDecompress
-#define jpeg_create_decompress jCreaDecompress
+//#define jpeg_create_decompress jCreaDecompress //FIXME
// -----------------
#define jpeg_std_error jStdError
#define jpeg_destroy jDestroy
#define jpeg_resync_to_restart jResyncRestart
-#define DEBUG 0
-
/*
* <setjmp.h> is used for the optional error recovery mechanism shown in
* the second part of the example.
//-----------------------------------------------------------------------------
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);
}
/* 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 :
// 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 dans gdcmFile::gdcm_read_JPEG_file12, depuis gdcmJpeg\n");
-
+#ifdef GDCM_jpr_DEBUG
+ printf("entree dans gdcmFile::gdcm_read_JPEG_file12, depuis gdcmJpeg\n");
+#endif //GDCM_jpr_DEBUG
/* 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.
*/
/* Step 1: allocate and initialize JPEG decompression object */
- if (DEBUG)printf("Entree Step 1\n");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 1\n");
+#endif //GDCM_jpr_DEBUG
/* We set up the normal JPEG error routines, then override error_exit. */
jpeg_create_decompress(&cinfo);
/* Step 2: specify data source (eg, a file) */
- if (DEBUG) printf("Entree Step 2\n");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 2\n");
+#endif //GDCM_jpr_DEBUG
jpeg_stdio_src(&cinfo, fp);
/* Step 3: read file parameters with jpeg_read_header() */
- if (DEBUG) printf("Entree Step 3\n");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 3\n");
+#endif //GDCM_jpr_DEBUG
(void) jpeg_read_header(&cinfo, TRUE);
/* We can ignore the return value from jpeg_read_header since
* See libjpeg.doc for more info.
*/
- if (DEBUG) {
+#ifdef GDCM_jpr_DEBUG
printf("--------------Header contents :----------------\n");
printf("image_width %d image_height %d\n",
- cinfo.image_width , cinfo.image_height);
+ cinfo.image_width , cinfo.image_height);
printf("bits of precision in image data %d \n",
- cinfo.output_components);
+ cinfo.output_components);
printf("nb of color components returned %d \n",
- cinfo.data_precision);
- }
+ cinfo.data_precision);
+#endif //GDCM_jpr_DEBUG
/*
*/
/* Step 4: set parameters for decompression */
- if (DEBUG) printf("Entree Step 4\n");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 4\n");
+#endif //GDCM_jpr_DEBUG
/* 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");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 5\n");
+#endif //GDCM_jpr_DEBUG
(void) jpeg_start_decompress(&cinfo);
/* We can ignore the return value since suspension is not possible
/* JSAMPLEs per row in output buffer */
row_stride = cinfo.output_width * cinfo.output_components;
- if (DEBUG)
+#ifdef GDCM_jpr_DEBUG
printf ("cinfo.output_width %d cinfo.output_components %d row_stride %d\n",
cinfo.output_width, cinfo.output_components,row_stride);
-
+#endif //GDCM_jpr_DEBUG
+
/* 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);
+ ((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");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 6\n");
+#endif //GDCM_jpr_DEBUG
/* jpeg_read_scanlines(...); */
* 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);
+#ifdef GDCM_jpr_DEBUG
+ printf ("cinfo.output_height %d cinfo.output_width %d\n",
+ cinfo.output_height,cinfo.output_width);
+#endif //GDCM_jpr_DEBUG
pimage=(char *)image_buffer;
}
/* Step 7: Finish decompression */
- if (DEBUG) printf("Entree Step 7\n");
- (void) jpeg_finish_decompress(&cinfo);
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 7\n");
+#endif //GDCM_jpr_DEBUG
+ (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 */
- if (DEBUG) printf("Entree Step 8\n");
+#ifdef GDCM_jpr_DEBUG
+ printf("Entree Step 8\n");
+#endif //GDCM_jpr_DEBUG
/* This is an important step since it will release a good deal of memory. */
jpeg_destroy_decompress(&cinfo);
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff