X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg12.cxx;h=056afa399ef5aecb4ca8c8d5a250bf0ab4dee68d;hb=00e89cde772e18e4f2baab2b01680330af909d59;hp=4a00622ac6f6f5bd82d7ad52c7470a3a5eec289b;hpb=e62d57cbd05c8e864fd2ba197a271cdcac9a2128;p=gdcm.git

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 4a00622a..056afa39 100644
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -1,79 +1,22 @@
-// gdcmJpeg12.cxx
-//-----------------------------------------------------------------------------
-#include <stdio.h>
-#include "gdcmFile.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmJpeg12.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/10 00:42:55 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
-#define BITS_IN_JSAMPLE 12
-
-#ifdef GDCM_DEBUG
-#define GDCM_jpr_DEBUG 0
-#endif   //GDCM_DEBUG
-
-// BITS_IN_JSAMPLE is a compile time defined options.
-// We need both 8 an 12;
-// To avoid renaming *all* the Jpeg functions,
-// we hard code the 'brain damaged liker' option.
-// For all the functions, we shall have the 8 and 12 version
-// (8 with the 'long' name, 12 with the 'short' name)
-
-#define jpeg_read_header        jReadHeader
-#define my_error_exit           myErrorExit
-#define jpeg_destroy_decompress jDestDecompress
-#define jpeg_stdio_src          jStdSrc
-#define jpeg_read_header        jReadHeader
-#define jpeg_read_scanlines     jReadScanlines
-#define jpeg_finish_decompress  jFinDecompress
-//#define jpeg_create_decompress  jCreaDecompress //FIXME
-
-// -----------------
-#define jpeg_std_error           jStdError
-#define jpeg_CreateCompress      jCreaCompress
-#define jpeg_CreateDecompress    jCreaDecompress
-#define jpeg_destroy_compress    jDestCompress
-#define jpeg_destroy_decompress  jDestDecompress
-#define jpeg_stdio_dest          jStdDest
-#define jpeg_stdio_src           jStdSrc
-#define jpeg_set_defaults        jSetDefaults
-#define jpeg_set_colorspace      jSetColorspace
-#define jpeg_default_colorspace  jDefColorspace
-#define jpeg_set_quality         jSetQuality
-#define jpeg_set_linear_quality  jSetLQuality
-#define jpeg_add_quant_table     jAddQuantTable
-#define jpeg_quality_scaling     jQualityScaling
-#define jpeg_simple_progression  jSimProgress
-#define jpeg_suppress_tables     jSuppressTables
-#define jpeg_alloc_quant_table   jAlcQTable
-#define jpeg_alloc_huff_table    jAlcHTable
-#define jpeg_start_compress      jStrtCompress
-#define jpeg_write_scanlines     jWrtScanlines
-#define jpeg_finish_compress     jFinCompress
-#define jpeg_write_raw_data      jWrtRawData
-#define jpeg_write_marker        jWrtMarker
-#define jpeg_write_m_header      jWrtMHeader
-#define jpeg_write_m_byte        jWrtMByte
-#define jpeg_write_tables        jWrtTables
-#define jpeg_read_header         jReadHeader
-#define jpeg_start_decompress    jStrtDecompress
-#define jpeg_read_scanlines      jReadScanlines
-#define jpeg_finish_decompress   jFinDecompress
-#define jpeg_read_raw_data       jReadRawData
-#define jpeg_has_multiple_scans  jHasMultScn
-#define jpeg_start_output        jStrtOutput
-#define jpeg_finish_output       jFinOutput
-#define jpeg_input_complete      jInComplete
-#define jpeg_new_colormap        jNewCMap
-#define jpeg_consume_input          jConsumeInput
-#define jpeg_calc_output_dimensions jCalcDimensions
-#define jpeg_save_markers           jSaveMarkers
-#define jpeg_set_marker_processor   jSetMarker
-#define jpeg_read_coefficients      jReadCoefs
-#define jpeg_write_coefficients     jWrtCoefs
-#define jpeg_copy_critical_parameters jCopyCrit
-#define jpeg_abort_compress      jAbrtCompress
-#define jpeg_abort_decompress    jAbrtDecompress
-#define jpeg_abort               jAbort
-#define jpeg_destroy             jDestroy
-#define jpeg_resync_to_restart   jResyncRestart
+#include "gdcmFile.h"
 
 /*
  * <setjmp.h> is used for the optional error recovery mechanism shown in
@@ -89,7 +32,8 @@
  */
 
 extern "C" {
-#include "jpeg/libijg12/jpeglib12.h"
+#include "src/jpeg/libijg12/jconfig.h"
+#include "src/jpeg/libijg12/jpeglib.h"
 #include <setjmp.h>
 }
 /******************** JPEG COMPRESSION SAMPLE INTERFACE *******************/
@@ -161,7 +105,8 @@ 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) {
+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;
 
@@ -189,7 +134,8 @@ METHODDEF(void) my_error_exit (j_common_ptr cinfo) {
  * @return 1 on success, 0 on error
  */
  
-bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer) {
+bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer)
+{
    char *pimage;
 
    /* This struct contains the JPEG decompression parameters and pointers to
@@ -394,7 +340,7 @@ bool gdcmFile::gdcm_read_JPEG_file12 (FILE* fp,void* image_buffer) {
 
    /* And we're done! */
 
-   return(true);
+   return true;
 }
 
 /*