-#include "iddcmjpeg.h"
-#include <stdlib.h>
-
-static ClbJpeg* ClbJpegAlloc(void);
-static void ClbJpegInit (ClbJpeg *);
-static int ClbJpegDecodeDiff(ClbJpeg *);
-static BOOL ClbJpegDecodeData(ClbJpeg *);
-static int ClbJpegReadBit(ClbJpeg *);
-static BOOL ClbJpegReadHeader(ClbJpeg *);
-static BOOL ClbJpegStart(ClbJpeg *,FILE *);
-static BOOL ClbJpegFillHuffTable(ClbJpeg *);
-
-
-
-
-void _IdDcmJpegFree(ClbJpeg *jpg)
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmJpeg.cxx,v $
+ Language: C++
+ Date: $Date: 2007/08/30 17:37:16 $
+ Version: $Revision: 1.59 $
+
+ 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.
+
+=========================================================================*/
+#include "gdcmFileHelper.h"
+#include "gdcmJPEGFragment.h"
+#include "gdcmDebug.h"
+
+#if defined(__sgi) && !defined(__GNUC__)
+// Try to get rid of the warning:
+//cc-3505 CC: WARNING File = /usr/include/internal/setjmp_core.h, Line = 74
+// setjmp not marked as unknown_control_flow because it is not declared as a
+// function
+//
+// #pragma unknown_control_flow (setjmp)
+# if (_COMPILER_VERSION >= 730)
+# pragma set woff 3505
+# endif
+#endif
+#ifdef _MSC_VER
+// Let us get rid of this funny warning on /W4:
+// warning C4611: interaction between '_setjmp' and C++ object
+// destruction is non-portable
+#pragma warning( disable : 4611 )
+#endif
+
+#include <setjmp.h>
+#include <fstream>
+
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
+
+#include "jdatasrc.cxx"
+#include "jdatadst.cxx"
+
+namespace GDCM_NAME_SPACE
{
- free(jpg->DataImg);
- free(jpg);
-}
-
-
-ClbJpeg * _IdDcmJpegRead (FILE * fp){
-ClbJpeg * jpg=NULL;
- jpg=ClbJpegAlloc();
- if(!jpg)
- return(NULL);
- ClbJpegInit (jpg);
- if(!ClbJpegStart(jpg, fp))
- return (NULL);
- return (jpg);
-}
-
-
-
-static void ClbJpegInit (ClbJpeg *jpg) {
-int n;
- for (n=0;n<256;n++)
- {
- jpg->lHuffTable[n].HufCode=0;
- jpg->lHuffTable[n].HufSz=0;
- jpg->lHuffTable[n].HufVal=0;
- }
- jpg->ValCurByte=0;
- jpg->PosCurBit=10;
- jpg->MarkerFound=0;
- jpg->RestartInterval=0;
-}
-
-static ClbJpeg *ClbJpegAlloc(void) {
-ClbJpeg * jpg;
- jpg = (ClbJpeg *)malloc(sizeof(ClbJpeg));
- ClbJpegInit(jpg);
-return jpg;
-}
-
-
-static BOOL ClbJpegFillHuffTable(ClbJpeg *jpg)
+ /**
+ * \brief routine for JPEG decompression
+ * @param fp pointer to an already open file descriptor
+ * 8 significant bits per pixel
+ * @param im_buf Points to array (of R,G,B-order) data to compress
+ * @param quality compression quality
+ * @param image_height Number of rows in image
+ * @param image_width Number of columns in image
+ * @return 1 on success, 0 on error
+ */
+
+bool gdcm_write_JPEG_file (std::ostream *fp, char *inputdata, size_t inputlength,
+ int image_width, int image_height, int numZ,
+ int sample_pixel, int bitsallocated, int quality)
{
- unsigned char c;
- //int testindex=0;
- int n=0;
- int NiDHT=0;
- int indexY=0;
- int k, Code, Si, i;
-
- for (c=0;c<255;c++)
- jpg->RawDHTstart[c]=0;
-
- c=fgetc(jpg->infp);
-
-
- jpg->MaxHuffSz=0;
- jpg->MaxHuffVal=0;
-
- for (n=1;n<17;n++)
- {
- jpg->RawDHT[n]=fgetc(jpg->infp);
- NiDHT+=jpg->RawDHT[n];
- if (jpg->RawDHT[n]!=0)
- jpg->MaxHuffSz=n;
- }
-
- for(n=1;n<16;n++)
- {
- if(jpg->RawDHT[n]>0)
- {
- jpg->RawDHTstart[n]=indexY+1;
- for (i=1;i<(jpg->RawDHT[n]+1);i++)
- {
- indexY+=1;
- c=fgetc(jpg->infp);
- jpg->lHuffTable[indexY].HufVal=c;
- jpg->MaxHuffVal=c;
- jpg->lHuffTable[indexY].HufSz=n;
- }
- }
- }
- k=1;
- Code=0;
-
- Si=jpg->lHuffTable[k].HufSz;
-
- while(1)
- {
- if (k>=NiDHT) break;
- while( Si==jpg->lHuffTable[k].HufSz)
- {
- jpg->lHuffTable[k].HufCode=Code;
- Code+=1;
- k+=1;
- }
- if (k<NiDHT)
- {
- while (jpg->lHuffTable[k].HufSz>Si)
- {
- Code=Code<<1;
- Si+=1;
- }
- }
- }
-
- return 1;
+ (void)bitsallocated;
+ struct jpeg_compress_struct cinfo;
+ int row_stride; /* physical row width in image buffer */
+
+ /* This struct contains the JPEG compression parameters and pointers to
+ * working space (which is allocated as needed by the JPEG library).
+ * It is possible to have several such structures, representing multiple
+ * compression/decompression processes, in existence at once. We refer
+ * to any one struct (and its associated working data) as a "JPEG object".
+ */
+ //struct jpeg_compress_struct cinfo;
+ /* This struct represents a JPEG error handler. It is declared separately
+ * because applications often want to supply a specialized error handler
+ * (see the second half of this file for an example). But here we just
+ * take the easy way out and use the standard error handler, which will
+ * print a message on stderr and call exit() if compression fails.
+ * Note that this struct must live as long as the main JPEG parameter
+ * struct, to avoid dangling-pointer problems.
+ */
+ struct jpeg_error_mgr jerr;
+ /* More stuff */
+
+ /* Step 1: allocate and initialize JPEG compression object */
+
+ /* We have to set up the error handler first, in case the initialization
+ * step fails. (Unlikely, but it could happen if you are out of memory.)
+ * This routine fills in the contents of struct jerr, and returns jerr's
+ * address which we place into the link field in cinfo.
+ */
+ cinfo.err = jpeg_std_error(&jerr);
+ /* Now we can initialize the JPEG compression object. */
+ jpeg_create_compress(&cinfo);
+
+ /* Step 2: specify data destination (eg, a file) */
+ /* Note: steps 2 and 3 can be done in either order. */
+
+ int fragment_size = static_cast< int >( inputlength );
+ jpeg_stdio_dest(&cinfo, fp, fragment_size, 1);
+
+ /* Step 3: set parameters for compression */
+
+ /* First we supply a description of the input image.
+ * Four fields of the cinfo struct must be filled in:
+ */
+ cinfo.image_width = image_width;/* image width and height, in pixels */
+ cinfo.image_height = image_height;
+ if ( sample_pixel == 3 )
+ {
+ cinfo.input_components = 3; /* # of color components per pixel */
+ cinfo.in_color_space = JCS_RGB; /* colorspace of input image */
+ }
+ else
+ {
+ cinfo.input_components = 1; /* # of color components per pixel */
+ cinfo.in_color_space = JCS_GRAYSCALE; /* colorspace of input image */
+ }
+ /* Now use the library's routine to set default compression parameters.
+ * (You must set at least cinfo.in_color_space before calling this,
+ * since the defaults depend on the source color space.)
+ */
+ jpeg_set_defaults(&cinfo);
+ /*
+ * http://www.koders.com/c/fid80DBBF1D49D004EF71CE7C493C34610C4F17D3D3.aspx
+ * http://studio.imagemagick.org/pipermail/magick-users/2002-September/004685.html
+ * You need to set -quality 101 or greater. If quality is 100 or less you
+ * get regular JPEG output. This is not explained in the documentation, only
+ * in the comments in coder/jpeg.c. When you have configured libjpeg with
+ * lossless support, then
+ *
+ * quality=predictor*100 + point_transform
+ *
+ * If you don't know what these values should be, just use 101.
+ * They only affect the compression ratio, not the image appearance,
+ * which is lossless.
+ */
+ jpeg_simple_lossless (&cinfo, 1, 0);
+ /* Now you can set any non-default parameters you wish to.
+ * Here we just illustrate the use of quality (quantization table) scaling:
+ */
+ jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+
+ /* Step 4: Start compressor */
+
+ /* TRUE ensures that we will write a complete interchange-JPEG file.
+ * Pass TRUE unless you are very sure of what you're doing.
+ */
+ jpeg_start_compress(&cinfo, TRUE);
+
+ /* Step 5: while (scan lines remain to be written) */
+ /* jpeg_write_scanlines(...); */
+
+ /* Here we use the library's state variable cinfo.next_scanline as the
+ * loop counter, so that we don't have to keep track ourselves.
+ * To keep things simple, we pass one scanline per call; you can pass
+ * more if you wish, though.
+ */
+ if (sample_pixel == 3)
+ {
+ row_stride = image_width * 3;/* JSAMPLEs per row in image_buffer */
+ }
+ else
+ {
+ assert( sample_pixel == 1 );
+ row_stride = image_width * 1;/* JSAMPLEs per row in image_buffer */
+ }
+
+ (void)numZ;
+
+ uint8_t* input_buffer = (uint8_t*)inputdata;
+ //uint8_t *pbuffer = input_buffer;
+ //int i;
+ //for(i=0; i<numZ; ++i)
+// {
+ JSAMPLE *image_buffer = (JSAMPLE*) input_buffer;
+ JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
+ row_pointer[0] = image_buffer;
+
+ while (cinfo.next_scanline < cinfo.image_height) {
+ /* jpeg_write_scanlines expects an array of pointers to scanlines.
+ * Here the array is only one element long, but you could pass
+ * more than one scanline at a time if that's more convenient.
+ */
+ //row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride];
+
+ if( jpeg_write_scanlines(&cinfo, row_pointer, 1) != 1)
+ {
+ //entering suspension mode, basically we wrote the whole jpeg fragment
+ // technically we could enforce that by checkig the value of row_pointer to
+ // actually be at the end of the image...TODO
+ return false;
+ }
+ row_pointer[0] += row_stride;
+ }
+// pbuffer+=fragment_size; //shift to next image
+
+ //Upodate frag size
+// size_t end = fp->tellp();
+// std::cerr << "DIFF: " << end-beg << std::endl;
+
+// JpegPair &jp = v[i];
+// jp.second = end-beg;
+ //beg = end; //
+ // }
+
+ /* Step 6: Finish compression */
+
+ jpeg_finish_compress(&cinfo);
+
+ /* Step 7: release JPEG compression object */
+
+ /* This is an important step since it will release a good deal of memory. */
+ jpeg_destroy_compress(&cinfo);
+
+ /* And we're done! */
+
+ return true;
}
-
-
-static BOOL ClbJpegStart(ClbJpeg *jpg, FILE *inputfp)
-{
- jpg->infp=inputfp;
- if (!ClbJpegReadHeader(jpg)) return 0;
- //printf("sortie ClbJpegReadHeader\n");
- if (!ClbJpegDecodeData(jpg)) return 0;
- //printf("sortie ClbJpegDecodeData\n");
- return 1;
+//-----------------------------------------------------------------------------
+struct my_error_mgr {
+ struct jpeg_error_mgr pub; /* "public" fields */
+ jmp_buf setjmp_buffer; /* for return to caller */
+};
+typedef struct my_error_mgr* my_error_ptr;
+//-----------------------------------------------------------------------------
+
+/*
+ * Here's the routine that will replace the standard error_exit method:
+ */
+extern "C" {
+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;
+
+ /* Always display the message. */
+ /* We could postpone this until after returning, if we chose. */
+ (*cinfo->err->output_message) (cinfo);
+
+ /* Return control to the setjmp point */
+ longjmp(myerr->setjmp_buffer, 1);
}
-static BOOL ClbJpegReadHeader(ClbJpeg *jpg)
-{
- unsigned char gr;
- unsigned char el;
- unsigned char l2;
- unsigned char l1;
- unsigned int sztag;
- long ouca=0;
- BOOL HeaderEnd=0;
- BOOL isLossLess=0;
-
- int tp;
-
- gr=fgetc(jpg->infp); //FF
- el=fgetc(jpg->infp); //D8
-
- while(!HeaderEnd)
- {
- gr=fgetc(jpg->infp);
- if(gr!=0xFF) return 0;
- el=fgetc(jpg->infp);
-
- if ( (el==0xFF) || (el==0x01) || (el==0xD8) ||(el==0xD9) ||( (el>=0xD0) && (el<=0xD7) ))
- ;
- else
- {
- l1=fgetc(jpg->infp);
- l2=fgetc(jpg->infp);
- sztag=(l1*256)+l2-2; //tag lengh
- ouca=ftell(jpg->infp);
-
- if (el==0xC3)
- {
- jpg->lSof.precision=fgetc(jpg->infp);
-
- l1=fgetc(jpg->infp);
- l2=fgetc(jpg->infp);
- jpg->lSof.Himg=(l1*256)+l2;
-
- l1=fgetc(jpg->infp);
- l2=fgetc(jpg->infp);
- jpg->lSof.Wimg=(l1*256)+l2;
-
- jpg->lSof.NbComponent=fgetc(jpg->infp);
-
- jpg->lSof.SofTabPos=ftell(jpg->infp);
-
- isLossLess=1; // TRUE
- }
-
- if (el==0xC4)
- {
- ClbJpegFillHuffTable(jpg);
- }
- if (el==0xDA)
- {
- jpg->lSos.CompCount=fgetc(jpg->infp);
- for (tp=0;tp<jpg->lSos.CompCount;tp++)
- {
- jpg->lSos.CompId=fgetc(jpg->infp);
- jpg->lSos.CompDc=fgetc(jpg->infp);
- }
- jpg->lSos.SpectralSelStart=fgetc(jpg->infp);
- jpg->lSos.SpectralSelEnd=fgetc(jpg->infp);
- jpg->lSos.SuccessiveAp=fgetc(jpg->infp);
- jpg->lSos.Sospttrans=(jpg->lSos.SuccessiveAp & 16);
- HeaderEnd=1;
- }
- if (el==0xDD)
- {
- l1=fgetc(jpg->infp);
- l2=fgetc(jpg->infp);
- jpg->RestartInterval=(l1*256)+l2;
- }
-
- fseek(jpg->infp,(ouca+sztag),0);
- }
- }
-
- if (!isLossLess) return 0;
- return 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 );
+//}
}
-
-static int ClbJpegReadBit(ClbJpeg *jpg)
+//-----------------------------------------------------------------------------
+
+/**
+ * \brief routine for JPEG decompression
+ * @param fp pointer to an already open file descriptor
+ * 8 significant bits per pixel
+ * @param image_buffer to receive uncompressed pixels
+ * @param statesuspension Suspension State basically it should be 3 otherwise more complex to handle
+ * @return 1 on success, 0 on error
+ */
+void *SampBuffer;
+bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &statesuspension)
{
- int r=0;
- unsigned char c;
- if(jpg->PosCurBit>8) // need lire octet suivant
- {
- jpg->ValCurByte=fgetc(jpg->infp);
- if (jpg->ValCurByte==0xFF)
- {
- c=fgetc(jpg->infp);// est 00 ou restart marker: a skiper
- if (c!=0)
- {
- jpg->ValCurByte=fgetc(jpg->infp);
- jpg->PosCurBit=1;
- jpg->MarkerFound=1;
- return 0;
- }
- }
- jpg->PosCurBit=2;
- return (jpg->ValCurByte>>7);
- }
- else
- {
- r=(1&(jpg->ValCurByte>>(8-jpg->PosCurBit)));
- jpg->PosCurBit+=1;
- return r;
- }
+ pImage = (uint8_t*)image_buffer;
+ // This struct contains the JPEG decompression parameters and pointers to
+ // working space (which is allocated as needed by the JPEG library).
+
+ static struct jpeg_decompress_struct cinfo;
+
+ // -------------- inside, we found :
+ // JDIMENSION image_width; // input image width
+ // JDIMENSION image_height; // input image height
+ // int input_components; // nb of color components in input image
+ // J_COLOR_SPACE in_color_space; // colorspace of input image
+ // double input_gamma; // image gamma of input image
+
+ // We use our private extension JPEG error handler.
+ // Note that this struct must live as long as the main JPEG parameter
+ // struct, to avoid dangling-pointer problems.
+
+ struct my_error_mgr jerr;
+
+ JSAMPARRAY buffer;// Output row buffer
+
+ // rappel :
+ // ------
+ // typedef unsigned char JSAMPLE;
+ // typedef JSAMPLE FAR *JSAMPROW;/* ptr to one image row of pixel samples. */
+ // typedef JSAMPROW *JSAMPARRAY;/* ptr to some rows (a 2-D sample array) */
+ // typedef JSAMPARRAY *JSAMPIMAGE;/* a 3-D sample array: top index is color */
+
+ int row_stride;// physical row width in output buffer
+
+ // 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))
+ {
+ // 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.
+
+ gdcmErrorMacro( "Serious Problem !" );
+ jpeg_destroy_decompress(&cinfo);
+ return 0;
+ }
+ // Now we can initialize the JPEG decompression object.
+ if ( statesuspension == 0 )
+ {
+ jpeg_create_decompress(&cinfo);
+ jpeg_stdio_src(&cinfo, fp, this, 1);
+ }
+ else
+ {
+ jpeg_stdio_src(&cinfo, fp, this, 0);
+ }
+ // Step 3: read file parameters with jpeg_read_header()
+
+ if ( statesuspension < 2 )
+ {
+ 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 )
+ {
+ cinfo.jpeg_color_space = JCS_UNKNOWN;
+ cinfo.out_color_space = JCS_UNKNOWN;
+ }
+ }
+
+ // Step 5: Start decompressor
+ if (statesuspension < 3 )
+ {
+ if ( jpeg_start_decompress(&cinfo) == FALSE )
+ {
+ // Suspension: jpeg_start_decompress
+ statesuspension = 3;
+ }
+
+ // JSAMPLEs per row in output buffer
+ row_stride = cinfo.output_width * cinfo.output_components*2;
+
+ // 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)
+
+ // Save the buffer in case of suspension to be able to reuse it later:
+ SampBuffer = buffer;
+ }
+ else
+ {
+ // Suspension: re-use the buffer:
+ buffer = (JSAMPARRAY)SampBuffer;
+ }
+ int bufsize = cinfo.output_width * cinfo.output_components;
+ size_t rowsize = bufsize * sizeof(JSAMPLE);
+
+ while (cinfo.output_scanline < cinfo.output_height)
+ {
+ 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) || 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++)
+ pimage16[i] = (buffer16[i] >> 8) | (buffer16[i] << 8 );
+#else
+ memcpy( pImage, *buffer,rowsize);
+#endif //GDCM_WORDS_BIGENDIAN
+ pImage+=rowsize;
+ }
+
+ // Step 7: Finish decompression
+ if ( jpeg_finish_decompress(&cinfo) == FALSE )
+ {
+ // Suspension: jpeg_finish_decompress
+ statesuspension = 4;
+ }
+
+ // Step 8: Release JPEG decompression object
+ jpeg_destroy_decompress(&cinfo);
+
+ // At this point you may want to check to see whether any corrupt-data
+ // warnings occurred (test whether jerr.pub.num_warnings is nonzero).
+
+ return true;
}
+#ifdef _MSC_VER
+// Put the warning back
+#pragma warning( default : 4611 )
+#endif
-static BOOL ClbJpegDecodeData(ClbJpeg *jpg)
-{
- int iX,iY;
- int lbInc=0;
- unsigned int mask;
-
- int lPredicted=(1<<(jpg->lSof.precision-1-jpg->lSos.Sospttrans));
-
- jpg->ValCurByte=jpg->lSos.SuccessiveAp;
- jpg->PosCurBit=9;
-
- if (jpg->lSof.precision==8)
- mask=0xFF;
- if (jpg->lSof.precision==12)
- mask=0xFFF;
- if (jpg->lSof.precision==16)
- mask=0xFFFF;
-
- jpg->DataImg=(int*)malloc(jpg->lSof.Himg*jpg->lSof.Wimg*sizeof(*jpg->DataImg));
- memset( jpg->DataImg,0,(jpg->lSof.Himg*jpg->lSof.Wimg*sizeof(*jpg->DataImg)));
-
- if (!jpg->RestartInterval)
- {
- for(iX=0;iX<jpg->lSof.Wimg;iX++) // lit première ligne
- {
- lbInc+=1;
- if (lbInc>1)
- lPredicted= jpg->DataImg[lbInc-1];
- jpg->DataImg[lbInc]=lPredicted+ClbJpegDecodeDiff(jpg);
-
- if ( jpg->DataImg[lbInc] > ((1<<(jpg->lSof.precision))-1) )
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
- if ( jpg->DataImg[lbInc]<0)
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
- }
-
- for (iY=1;iY<jpg->lSof.Himg;iY++) //lit la suite
- {
- lbInc+=1;
- if (lbInc>(jpg->lSof.Himg*jpg->lSof.Wimg-1)) break;
- lPredicted= jpg->DataImg[lbInc-jpg->lSof.Wimg]; // se base % premier é ligne d'avant
- jpg->DataImg[lbInc]=lPredicted+ClbJpegDecodeDiff(jpg);
-
- if ( jpg->DataImg[lbInc] > ((1<<(jpg->lSof.precision))-1) )
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
- if ( jpg->DataImg[lbInc]<0)
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
-
- for(iX=1;iX<jpg->lSof.Wimg;iX++)
- {
- lbInc+=1;
- if (lbInc>(jpg->lSof.Himg*jpg->lSof.Wimg-1)) break;
- if (jpg->lSos.SpectralSelStart==7) // si spectral
- lPredicted=( jpg->DataImg[lbInc-1]+ jpg->DataImg[lbInc-jpg->lSof.Wimg])>>1;
- else
- lPredicted= jpg->DataImg[lbInc-1]; // se base%pixel juste avant
- jpg->DataImg[lbInc]=lPredicted+ClbJpegDecodeDiff(jpg);
-
- if ( jpg->DataImg[lbInc] > ((1<<(jpg->lSof.precision))-1) )
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
- if ( jpg->DataImg[lbInc]<0)
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
-
- }
- }
- }
- else // il y a un define interval
- {
- while(1)
- {
- jpg->MarkerFound=0;
- lPredicted=(1<<(jpg->lSof.precision - 1 - jpg->lSos.Sospttrans));
- for (iY=0;iY<jpg->RestartInterval;iY++)
- {
- jpg->DataImg[lbInc]=lPredicted+ClbJpegDecodeDiff(jpg);
-
- if ( jpg->DataImg[lbInc] > ((1<<(jpg->lSof.precision))-1) )
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
- if ( jpg->DataImg[lbInc]<0)
- jpg->DataImg[lbInc]= jpg->DataImg[lbInc]&mask;
-
- lbInc+=1;
- if (lbInc>(jpg->lSof.Himg*jpg->lSof.Wimg-1)) return 1;
-
- if (jpg->lSos.SpectralSelStart==7) // si spectral
- lPredicted=( jpg->DataImg[lbInc-1]+ jpg->DataImg[lbInc-jpg->lSof.Wimg])>>1;
- else
- lPredicted= jpg->DataImg[lbInc-1];
- }
- while (!jpg->MarkerFound)
- {
- ClbJpegReadBit(jpg); // skip bits restant avant restart marker
- }
- }
- }
- return 1;
-}
-
-static int ClbJpegDecodeDiff(ClbJpeg *jpg)
-{
- int lInput;
- int lInputBits;
- int lHufVal;
- int lDiff;
- int lI;
- int resultat;
- lHufVal = 666;
- lInput = 0;
- lInputBits = 0;
-
-
- while (1)
- {
- lInputBits+=1;
- lInput=(lInput<<1)+ClbJpegReadBit(jpg);
- if (jpg->RawDHT[lInputBits]!=0)
- {
- for(lI=jpg->RawDHTstart[lInputBits];lI<(jpg->RawDHTstart[lInputBits]+jpg->RawDHT[lInputBits]);lI++)
- {
- if (lInput==jpg->lHuffTable[lI].HufCode)
- lHufVal=jpg->lHuffTable[lI].HufVal;
- }
- }
- if (lInputBits>=jpg->MaxHuffSz)
- lHufVal=jpg->MaxHuffVal;
- if (lHufVal<255) break;
- }
- if (lHufVal==0) resultat= 0;
-
- if ( (lHufVal>0) && (lHufVal<16))
- {
- lDiff=0;
- if( ClbJpegReadBit(jpg)==1)
- {
- for (lI=1;lI<lHufVal;lI++)
- {
- lDiff=(lDiff<<1)+ClbJpegReadBit(jpg);
- }
-
- resultat= (lDiff+(1<<(lHufVal-1)));
- }
- else
- {
- for (lI=1;lI<lHufVal;lI++)
- lDiff=(lDiff<<1)+1-ClbJpegReadBit(jpg);
- resultat= -(lDiff+(1<<(lHufVal-1)));
- }
- }
-
- return resultat;
-
-}
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff