ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the exit status of the program indicates failure if one of the pixel value checks fails

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@363 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-15 05:19:31 +00:00
parent b306607ad6 cfef7f1bd8
commit f98553bae1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jpegut.c
View File

@@ -1,6 +1,6 @@
/* Copyright (C)2004 Landmark Graphics Corporation /* Copyright (C)2004 Landmark Graphics Corporation
* Copyright (C)2005 Sun Microsystems, Inc. * Copyright (C)2005 Sun Microsystems, Inc.
* Copyright (C)2009-2010 D. R. Commander * Copyright (C)2009-2011 D. R. Commander
* *
* This library is free software and may be redistributed and/or modified under * This library is free software and may be redistributed and/or modified under
* the terms of the wxWindows Library License, Version 3.1 or (at your option) * the terms of the wxWindows Library License, Version 3.1 or (at your option)
@@ -390,7 +390,7 @@ void gentestjpeg(tjhandle hnd, unsigned char *jpegbuf, unsigned long *size,
if(yuv==YUVENCODE) if(yuv==YUVENCODE)
{ {
if(checkbufyuv(jpegbuf, *size, w, h, subsamp)) printf("Passed."); if(checkbufyuv(jpegbuf, *size, w, h, subsamp)) printf("Passed.");
else printf("FAILED!"); else {printf("FAILED!"); exitstatus=-1;}
} }
else printf("Done."); else printf("Done.");
printf(" %f ms\n Result in %s\n", t*1000., tempstr); printf(" %f ms\n Result in %s\n", t*1000., tempstr);
@@ -454,12 +454,16 @@ void gentestbmp(tjhandle hnd, unsigned char *jpegbuf, unsigned long jpegsize,
{ {
if(checkbufyuv(bmpbuf, size, pw, ph, subsamp)) if(checkbufyuv(bmpbuf, size, pw, ph, subsamp))
printf("Passed."); printf("Passed.");
else printf("FAILED!"); else {printf("FAILED!"); exitstatus=-1;}
} }
else else
{ {
if(checkbuf(bmpbuf, w, h, ps, subsamp, flags)) printf("Passed."); if(checkbuf(bmpbuf, w, h, ps, subsamp, flags)) printf("Passed.");
else {printf("FAILED!"); dumpbuf(bmpbuf, w, h, ps, flags);} else
{
printf("FAILED!"); exitstatus=-1;
dumpbuf(bmpbuf, w, h, ps, flags);
}
} }
printf(" %f ms\n\n", t*1000.); printf(" %f ms\n\n", t*1000.);