X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg.cxx;h=76dfaa0724eb506f16304bd654cd162e0c9fd4d1;hb=8132e180439a6e41d07240cad48be249b66e5e05;hp=9b663f9f7f0bf8e184a89e5e279666a51f01bd16;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 9b663f9f..76dfaa07 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/11/28 15:20:33 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2006/01/27 10:01:34 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,6 +39,11 @@
 
 #include <setjmp.h>
 #include <fstream>
+
+#if defined(__BORLANDC__)
+   #include <mem.h> // for memset
+#endif 
+
 #include "jdatasrc.cxx"
 #include "jdatadst.cxx"
 
@@ -207,13 +212,13 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo) {
 //   (*cinfo->err->format_message) (cinfo, buffer);
 //
 //   // Custom display message, we could be more fancy and throw an exception:
-//   gdcmErrorMacro( buffer );
+//   gdcmStaticErrorMacro( buffer );
 //}
 
 }
 //-----------------------------------------------------------------------------
  
- /**
+/**
  * \brief   routine for JPEG decompression 
  * @param fp pointer to an already open file descriptor 
  *                      8 significant bits per pixel
@@ -268,7 +273,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta
     // 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.
 
-    gdcmStaticErrorMacro( "Serious Problem !" );
+    gdcmErrorMacro( "Serious Problem !" );
     jpeg_destroy_decompress(&cinfo);
     return 0;
   }