* software
*/
/*
- * $Id: huffd.c,v 1.1 2003/10/21 12:08:53 jpr Exp $
+ * $Id: huffd.c,v 1.5 2004/09/12 02:48:23 malaterre Exp $
*/
#include <stdio.h>
#include <stdlib.h>
#include "proto.h"
#include "predict.h"
-
#define RST0 0xD0 /* RST0 marker code */
static long getBuffer; /* current bit-extraction buffer */
* The following variables keep track of the input buffer
* for the JPEG data, which is read by ReadJpegData.
*/
-Uchar *inputBuffer; /* Input buffer for JPEG data */
+Uchar *inputBuffer = 0; /* Input buffer for JPEG data */
int inputBufferOffset = 0; /* Offset of current byte */
/*
else if (depth == 24)
PmPutRow24 (curRowBuf, numCOL, &image24tmp);
- swap(MCU *, prevRowBuf, curRowBuf);
+ gdcmSWAP(MCU *, prevRowBuf, curRowBuf);
/* optimal case : 8 bit image, one color component, no restartInRows */
if ((depth == 8) && (compsInScan == 1) && (dcPtr->restartInRows == 0))
else if (depth == 24)
PmPutRow24 (curRowBuf, numCOL, &image24tmp);
- swap(MCU *,prevRowBuf,curRowBuf);
+ gdcmSWAP(MCU *,prevRowBuf,curRowBuf);
continue;
}
dcPtr->restartRowsToGo--;
/* The upper neighbors are predictors for the first column. */
for (curComp = 0; curComp < compsInScan; curComp++)
- {
+ {
ci = dcPtr->MCUmembership[curComp];
compptr = dcPtr->curCompInfo[ci];
dctbl = dcPtr->dcHuffTblPtrs[compptr->dcTblNo];
for (col=1; col < numCOL; col++)
{
for (curComp = 0; curComp < compsInScan; curComp++)
- {
+ {
ci = dcPtr->MCUmembership[curComp];
compptr = dcPtr->curCompInfo[ci];
dctbl = dcPtr->dcHuffTblPtrs[compptr->dcTblNo];
else if (depth == 24)
PmPutRow24 (curRowBuf, numCOL, &image24tmp);
- swap(MCU *, prevRowBuf, curRowBuf);
+ gdcmSWAP(MCU *, prevRowBuf, curRowBuf);
}/*endfor row*/
}/*endelse*/