diff --git a/jpgtest.c b/jpgtest.c index 84516421..25e9ef3a 100644 --- a/jpgtest.c +++ b/jpgtest.c @@ -94,10 +94,10 @@ void dotest(unsigned char *srcbuf, int w, int h, int pf, int bu, if(!quiet) { if(yuv==YUVENCODE) - printf("\n>>>>> %s (%s) <--> YUV %s <<<<<\n", _pfname[pf], + printf(">>>>> %s (%s) <--> YUV %s <<<<<\n", _pfname[pf], bu?"Bottom-up":"Top-down", _subnamel[jpegsub]); else - printf("\n>>>>> %s (%s) <--> JPEG %s Q%d <<<<<\n", _pfname[pf], + printf(">>>>> %s (%s) <--> JPEG %s Q%d <<<<<\n", _pfname[pf], bu?"Bottom-up":"Top-down", _subnamel[jpegsub], qual); } if(yuv==YUVDECODE) dotile=0; @@ -188,7 +188,10 @@ void dotest(unsigned char *srcbuf, int w, int h, int pf, int bu, fclose(outfile); outfile=NULL; if(!quiet) printf("Reference image written to %s\n", tempstr); } - if(yuv==YUVENCODE) goto bailout; + if(yuv==YUVENCODE) + { + if(quiet==1) printf("\n"); goto bailout; + } // Decompression test if(yuv==YUVDECODE) flags |= TJ_YUV; @@ -353,7 +356,7 @@ void dodecomptest(char *filename, int pf, int bu, int useppm, if(quiet==1) { - printf("\nAll performance values in Mpixels/sec\n\n"); + printf("All performance values in Mpixels/sec\n\n"); printf("Bitmap\tBitmap\tImage Size\tDecomp\n"), printf("Format\tOrder\t X Y \tPerf\n\n"); printf("%s\t%s\t%-4d %-4d\t", _pfname[pf], bu?"BU":"TD", w, h); @@ -365,9 +368,9 @@ void dodecomptest(char *filename, int pf, int bu, int useppm, if(!quiet) { if(yuv==YUVDECODE) - printf("\n>>>>> JPEG --> YUV %s <<<<<\n", _subnamel[jpegsub]); + printf(">>>>> JPEG --> YUV %s <<<<<\n", _subnamel[jpegsub]); else - printf("\n>>>>> JPEG --> %s (%s) <<<<<\n", _pfname[pf], + printf(">>>>> JPEG --> %s (%s) <<<<<\n", _pfname[pf], bu?"Bottom-up":"Top-down"); printf("\nImage size: %d x %d\n", w, h); } @@ -464,18 +467,20 @@ int main(int argc, char *argv[]) if(!stricmp(temp, ".jpg") || !stricmp(temp, ".jpeg")) decomponly=1; } + printf("\n"); + if(argc>minarg) { for(i=minarg; i=qual; i--) dotest(bmpbuf, w, h, pf, bu, TJ_GRAYSCALE, i, argv[1], dotile, useppm, quiet); - if(quiet) printf("\n"); + printf("\n"); for(i=hiqual; i>=qual; i--) dotest(bmpbuf, w, h, pf, bu, TJ_420, i, argv[1], dotile, useppm, quiet); - if(quiet) printf("\n"); + printf("\n"); for(i=hiqual; i>=qual; i--) dotest(bmpbuf, w, h, pf, bu, TJ_422, i, argv[1], dotile, useppm, quiet); - if(quiet) printf("\n"); + printf("\n"); for(i=hiqual; i>=qual; i--) dotest(bmpbuf, w, h, pf, bu, TJ_444, i, argv[1], dotile, useppm, quiet); + printf("\n"); bailout: if(bmpbuf) free(bmpbuf);