X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg.cxx;h=10f175811f28d956f782e6e21408d682b67706f1;hb=1623bd44a698b1dd935de6575332604a2073534e;hp=90498140367f1ebd3a52daf0449a03ee6839c75a;hpb=1729671595ec6792d8499f727c80279f7dd46d21;p=gdcm.git

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 90498140..10f17581 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:36:26 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/11/29 08:32:44 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -56,7 +56,7 @@ namespace gdcm
  * @return 1 on success, 0 on error
  */
  
-bool gdcm_write_JPEG_file (std::ofstream *fp, void *im_buf, 
+bool gdcm_write_JPEG_file (std::ostream *fp, void *im_buf, 
                            int image_width, int image_height, int quality)
 {
 
@@ -107,7 +107,9 @@ bool gdcm_write_JPEG_file (std::ofstream *fp, void *im_buf,
  //   exit(1);
  //
  // }
-  jpeg_stdio_dest(&cinfo, fp);
+  assert( 0 );
+  (void)fp;
+  //jpeg_stdio_dest(&cinfo, fp, 0, 0, image_width, image_height, quality);
 
   /* Step 3: set parameters for compression */
 
@@ -170,7 +172,7 @@ bool gdcm_write_JPEG_file (std::ofstream *fp, void *im_buf,
 
   /* And we're done! */
 
-  return true; //???
+  return true;
 }
 
 //-----------------------------------------------------------------------------
@@ -196,10 +198,22 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo) {
    /* Return control to the setjmp point */
    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:
+//   gdcmStaticErrorMacro( buffer );
+//}
+
 }
 //-----------------------------------------------------------------------------
  
- /**
+/**
  * \brief   routine for JPEG decompression 
  * @param fp pointer to an already open file descriptor 
  *                      8 significant bits per pixel
@@ -243,8 +257,11 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
   // We set up the normal JPEG error routines, then override error_exit.
   
   cinfo.err = jpeg_std_error(&jerr.pub);
+  // 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;
+
   // Establish the setjmp return context for my_error_exit to use.
   if (setjmp(jerr.setjmp_buffer))
   {
@@ -256,7 +273,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
     return 0;
   }
   // Now we can initialize the JPEG decompression object.
-  if( statesuspension == 0 )
+  if ( statesuspension == 0 )
     {
     jpeg_create_decompress(&cinfo);
     jpeg_stdio_src(&cinfo, fp, this, 1);
@@ -267,17 +284,17 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
     }
    // Step 3: read file parameters with jpeg_read_header()
 
-   if( statesuspension < 2 )
+   if ( statesuspension < 2 )
    {
-      if( jpeg_read_header(&cinfo, TRUE) == JPEG_SUSPENDED )
+      if ( jpeg_read_header(&cinfo, TRUE) == JPEG_SUSPENDED )
       {
       // Suspension in jpeg_read_header
       statesuspension = 2; 
       }
-   
+ 
       // Step 4: set parameters for decompression
       // prevent the library from performing any color space conversion
-      if( cinfo.process == JPROC_LOSSLESS )
+      if ( cinfo.process == JPROC_LOSSLESS )
       {
          cinfo.jpeg_color_space = JCS_UNKNOWN;
          cinfo.out_color_space = JCS_UNKNOWN;
@@ -285,9 +302,9 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
    }
 
    // Step 5: Start decompressor
-   if(statesuspension < 3 )
+   if (statesuspension < 3 )
    {
-      if( jpeg_start_decompress(&cinfo) == FALSE )
+      if ( jpeg_start_decompress(&cinfo) == FALSE )
       {
          // Suspension: jpeg_start_decompress
          statesuspension = 3;
@@ -315,14 +332,14 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
 
    while (cinfo.output_scanline < cinfo.output_height)
    {
-      if( jpeg_read_scanlines(&cinfo, buffer, 1) == 0 )
+      if ( jpeg_read_scanlines(&cinfo, buffer, 1) == 0 )
         {
         // Suspension in jpeg_read_scanlines
         statesuspension = 3;
         return true;
         }
 // The ijg has no notion of big endian, therefore always swap the jpeg stream
-#if defined(GDCM_WORDS_BIGENDIAN) && (CMAKE_BITS_IN_JSAMPLE != 8)
+#if (defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)) && (CMAKE_BITS_IN_JSAMPLE != 8)
       uint16_t *buffer16 = (uint16_t*)*buffer;
       uint16_t *pimage16 = (uint16_t*)pImage;
       for(unsigned int i=0;i<rowsize/2;i++)
@@ -334,7 +351,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
    }
 
    // Step 7: Finish decompression
-   if( jpeg_finish_decompress(&cinfo) == FALSE )
+   if ( jpeg_finish_decompress(&cinfo) == FALSE )
      {
      // Suspension: jpeg_finish_decompress
      statesuspension = 4;