X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmJpeg12.cxx;h=6b84a9579e214cb1896333a1df9b6976d809fb67;hb=854ec81bfcffd6f0e5939789b0ffbc410f7910b7;hp=29b6d9280c2a84dfb4a685611918ef9546c58e17;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 29b6d928..6b84a957 100644
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -5,8 +5,6 @@
 
 #define BITS_IN_JSAMPLE 12
 
-#define DEBUG 0
-
 // BITS_IN_JSAMPLE is a compile time defined options.
 // We need both 8 an 12;
 // To avoid renaming *all* the Jpeg functions,
@@ -21,7 +19,7 @@
 #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
@@ -203,8 +201,9 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
    // 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_DEBUG
+   printf("entree dans gdcmFile::gdcm_read_JPEG_file12, depuis gdcmJpeg\n");
+#endif //GDCM_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.
@@ -213,7 +212,9 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
     */
 
    /* Step 1: allocate and initialize JPEG decompression object */
-   if (DEBUG)printf("Entree Step 1\n");
+#ifdef GDCM_DEBUG
+   printf("Entree Step 1\n");
+#endif //GDCM_DEBUG
 
    /* We set up the normal JPEG error routines, then override error_exit. */
 
@@ -233,11 +234,15 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
    jpeg_create_decompress(&cinfo);
 
    /* Step 2: specify data source (eg, a file) */
-   if (DEBUG) printf("Entree Step 2\n");
+#ifdef GDCM_DEBUG
+   printf("Entree Step 2\n");
+#endif //GDCM_DEBUG
    jpeg_stdio_src(&cinfo, fp);
 
    /* Step 3: read file parameters with jpeg_read_header() */
-   if (DEBUG) printf("Entree Step 3\n");
+#ifdef GDCM_DEBUG
+   printf("Entree Step 3\n");
+#endif //GDCM_DEBUG
    (void) jpeg_read_header(&cinfo, TRUE);
 
    /* We can ignore the return value from jpeg_read_header since
@@ -246,7 +251,7 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
     * See libjpeg.doc for more info.
     */
 
-   if (DEBUG) {   
+#ifdef GDCM_DEBUG
       printf("--------------Header contents :----------------\n");
       printf("image_width %d image_height %d\n", 
               cinfo.image_width , cinfo.image_height);
@@ -254,7 +259,7 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
               cinfo.output_components);
       printf("nb of color components returned  %d \n", 
               cinfo.data_precision);
-   }
+#endif //GDCM_DEBUG
 
 
    /*
@@ -267,14 +272,18 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
     */
 
    /* Step 4: set parameters for decompression */
-   if (DEBUG) printf("Entree Step 4\n");
+#ifdef GDCM_DEBUG
+   printf("Entree Step 4\n");
+#endif //GDCM_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_DEBUG
+   printf("Entree Step 5\n");
+#endif //GDCM_DEBUG
 
    (void) jpeg_start_decompress(&cinfo);
    /* We can ignore the return value since suspension is not possible
@@ -291,16 +300,19 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
    /* JSAMPLEs per row in output buffer */
    row_stride = cinfo.output_width * cinfo.output_components;
   
-   if (DEBUG) 
+#ifdef GDCM_DEBUG
       printf ("cinfo.output_width %d cinfo.output_components %d  row_stride %d\n",
               cinfo.output_width, cinfo.output_components,row_stride);
-  	
+#endif //GDCM_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);
 
    /* Step 6: while (scan lines remain to be read) */
-   if (DEBUG)  printf("Entree Step 6\n"); 
+#ifdef GDCM_DEBUG
+   printf("Entree Step 6\n"); 
+#endif //GDCM_DEBUG
 
    /*           jpeg_read_scanlines(...); */
 
@@ -308,8 +320,10 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
     * loop counter, so that we don't have to keep track ourselves.
     */
 
-   if (DEBUG)  printf ("cinfo.output_height %d  cinfo.output_width %d\n",
+#ifdef GDCM_DEBUG
+   printf ("cinfo.output_height %d  cinfo.output_width %d\n",
  		       cinfo.output_height,cinfo.output_width);
+#endif //GDCM_DEBUG
 
    pimage=(char *)image_buffer;
 
@@ -331,14 +345,18 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE *fp,void * image_buffer) {
    }
  
   /* Step 7: Finish decompression */
-   if (DEBUG)  printf("Entree Step 7\n");
+#ifdef GDCM_DEBUG
+   printf("Entree Step 7\n");
+#endif //GDCM_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_DEBUG
+   printf("Entree Step 8\n");
+#endif //GDCM_DEBUG
 
    /* This is an important step since it will release a good deal of memory. */
    jpeg_destroy_decompress(&cinfo);