X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg.cxx;h=3d11de65781c9b6cf9218726d320e50da6f18f3b;hb=0ce6682a82eacb85233fcccef601f83bb591ec12;hp=d95fbd541dd25263a1cd611fb3b44beead36c6ae;hpb=7a822ba5bef24e1f37e5ffa15d9c9fbaeb66cffa;p=gdcm.git

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index d95fbd54..3d11de65 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/11 20:04:08 $
+  Version:   $Revision: 1.48 $
                                                                                 
   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,8 +258,8 @@ 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))
   {
@@ -289,7 +289,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
       // 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 )
@@ -337,7 +337,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
         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++)