-#include <iddcmjpeg.h>
+#include "iddcmjpeg.h"
#include <stdlib.h>
static ClbJpeg* ClbJpegAlloc(void);
ClbJpeg * _IdDcmJpegRead (FILE * fp){
ClbJpeg * jpg=NULL;
jpg=ClbJpegAlloc();
- if(!jpg)
- return(NULL);
+ if(!jpg) {
+ printf("Fail to ClbJpegAlloc \n");
+ return(NULL);
+ }
ClbJpegInit (jpg);
- if(!ClbJpegStart(jpg, fp))
- return (NULL);
+ if(!ClbJpegStart(jpg, fp)) {
+ printf("Fail to ClbJpegStart \n");
+ return (NULL);
+ }
return (jpg);
}
static BOOL ClbJpegStart(ClbJpeg *jpg, FILE *inputfp)
{
jpg->infp=inputfp;
- if (!ClbJpegReadHeader(jpg)) return 0;
+ if (!ClbJpegReadHeader(jpg)) {
+ printf("Fail to ClbJpegReadHeader\n");
+ return 0;
+ }
//printf("sortie ClbJpegReadHeader\n");
- if (!ClbJpegDecodeData(jpg)) return 0;
+ if (!ClbJpegDecodeData(jpg)) {
+ printf("Fail to ClbJpegDecodeData\n");
+ return 0;
+ }
//printf("sortie ClbJpegDecodeData\n");
return 1;
}
while(!HeaderEnd)
{
gr=fgetc(jpg->infp);
- if(gr!=0xFF) return 0;
+ if(gr!=0xFF) {
+ printf("gr!=0xFF (=%02x)\n",gr);
+ return 0;
+ }
el=fgetc(jpg->infp);
if ( (el==0xFF) || (el==0x01) || (el==0xD8) ||(el==0xD9) ||( (el>=0xD0) && (el<=0xD7) ))
l2=fgetc(jpg->infp);
jpg->lSof.Wimg=(l1*256)+l2;
- jpg->lSof.NbComponent=fgetc(jpg->infp);
+ jpg->lSof.NbComponent=fgetc(jpg->infp);
jpg->lSof.SofTabPos=ftell(jpg->infp);
}
}
- if (!isLossLess) return 0;
+ if (!isLossLess) {
+ printf("NOT isLossLess\n");
+ return 0;
+ }
return 1;
}