diff options
| author | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2011-11-29 05:16:26 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2011-11-29 05:16:26 +0000 |
| commit | c6beb74efd1b43982a5b6c957c57426442359c17 (patch) | |
| tree | eb0161babfcef429f7feccb7c407b6d66fa9290a /tjunittest.c | |
| parent | dd03f0f2343b6b732fb65fe8bc38811be877e4f8 (diff) | |
Update libjpeg-turbo to r722.
This change just updates our copy of libjpeg-turbo to r722.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8720003
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@111873 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'tjunittest.c')
| -rw-r--r-- | tjunittest.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tjunittest.c b/tjunittest.c index 08d8fe2..3a57347 100644 --- a/tjunittest.c +++ b/tjunittest.c @@ -68,6 +68,8 @@ const char *pixFormatStr[TJ_NUMPF]= "RGB", "BGR", "RGBX", "BGRX", "XBGR", "XRGB", "Grayscale" }; +const int alphaOffset[TJ_NUMPF] = {-1, -1, 3, 3, 0, 0, -1}; + const int _3byteFormats[]={TJPF_RGB, TJPF_BGR}; const int _4byteFormats[]={TJPF_RGBX, TJPF_BGRX, TJPF_XBGR, TJPF_XRGB}; const int _onlyGray[]={TJPF_GRAY}; @@ -156,6 +158,7 @@ int checkBuf(unsigned char *buf, int w, int h, int pf, int subsamp, int roffset=tjRedOffset[pf]; int goffset=tjGreenOffset[pf]; int boffset=tjBlueOffset[pf]; + int aoffset=alphaOffset[pf]; int ps=tjPixelSize[pf]; int index, row, col, retval=1; int halfway=16*sf.num/sf.denom; @@ -165,12 +168,13 @@ int checkBuf(unsigned char *buf, int w, int h, int pf, int subsamp, { for(col=0; col<w; col++) { - unsigned char r, g, b; + unsigned char r, g, b, a; if(flags&TJFLAG_BOTTOMUP) index=(h-row-1)*w+col; else index=row*w+col; r=buf[index*ps+roffset]; g=buf[index*ps+goffset]; b=buf[index*ps+boffset]; + a=aoffset>=0? buf[index*ps+aoffset]:0xFF; if(((row/blocksize)+(col/blocksize))%2==0) { if(row<halfway) @@ -207,6 +211,7 @@ int checkBuf(unsigned char *buf, int w, int h, int pf, int subsamp, } } } + checkval255(a); } } |