X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fjpeg%2Fljpg%2Fhuffd.c;h=1b60b4a2fbf6ffd4d88c5753b346c2b55baf2105;hb=16427285cc469276c1664a3e0f69867c59342e32;hp=6b4bc0b0e88781883619bfea16f598f2938f8631;hpb=659604feaaaf9519d03d59d66711f6b4b8290804;p=gdcm.git diff --git a/src/jpeg/ljpg/huffd.c b/src/jpeg/ljpg/huffd.c index 6b4bc0b0..1b60b4a2 100644 --- a/src/jpeg/ljpg/huffd.c +++ b/src/jpeg/ljpg/huffd.c @@ -5,7 +5,7 @@ * software */ /* - * $Id: huffd.c,v 1.2 2004/01/07 10:07:28 regrain Exp $ + * $Id: huffd.c,v 1.5 2004/09/12 02:48:23 malaterre Exp $ */ #include #include @@ -16,7 +16,6 @@ #include "proto.h" #include "predict.h" - #define RST0 0xD0 /* RST0 marker code */ static long getBuffer; /* current bit-extraction buffer */ @@ -26,7 +25,7 @@ static int bitsLeft; /* # of unused bits in it */ * 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 */ /* @@ -646,7 +645,7 @@ void DecodeImage (DecompressInfo *dcPtr, unsigned short **image, int depth) /* 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]; @@ -661,7 +660,7 @@ void DecodeImage (DecompressInfo *dcPtr, unsigned short **image, int depth) 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];