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

Fix the buffer size regression test so that it generates the intended pixel patterns

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@450 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-25 02:13:07 +00:00
parent 0745c0fb6a
commit d5a69afa5a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jpegut.c
View File

@@ -547,9 +547,9 @@ void dotest1(void)
{ {
bmpbuf[i2*4]=pixels[i2%9][2]; bmpbuf[i2*4]=pixels[i2%9][2];
bmpbuf[i2*4+1]=pixels[i2%9][1]; bmpbuf[i2*4+1]=pixels[i2%9][1];
bmpbuf[i2*2+2]=pixels[i2%9][0]; bmpbuf[i2*4+2]=pixels[i2%9][0];
} }
_catch(tjCompress(hnd, bmpbuf, i, i*4, j, 4, _catch(tjCompress(hnd, bmpbuf, i, 0, j, 4,
jpgbuf, &size, TJ_444, 100, TJ_BGR)); jpgbuf, &size, TJ_444, 100, TJ_BGR));
free(bmpbuf); bmpbuf=NULL; free(jpgbuf); jpgbuf=NULL; free(bmpbuf); bmpbuf=NULL; free(jpgbuf); jpgbuf=NULL;
@@ -558,12 +558,12 @@ void dotest1(void)
{ {
printf("Memory allocation failure\n"); bailout(); printf("Memory allocation failure\n"); bailout();
} }
for(i2=0; i2<j*i*4; i2++) for(i2=0; i2<j*i; i2++)
{ {
if(i2%2==0) bmpbuf[i2]=0xFF; if(i2%2==0) bmpbuf[i2*4]=bmpbuf[i2*4+1]=bmpbuf[i2*4+2]=0xFF;
else bmpbuf[i2]=0; else bmpbuf[i2*4]=bmpbuf[i2*4+1]=bmpbuf[i2*4+2]=0;
} }
_catch(tjCompress(hnd, bmpbuf, j, j*4, i, 4, _catch(tjCompress(hnd, bmpbuf, j, 0, i, 4,
jpgbuf, &size, TJ_444, 100, TJ_BGR)); jpgbuf, &size, TJ_444, 100, TJ_BGR));
free(bmpbuf); bmpbuf=NULL; free(jpgbuf); jpgbuf=NULL; free(bmpbuf); bmpbuf=NULL; free(jpgbuf); jpgbuf=NULL;
} }