Update libjpeg-turbo to 1.2.0.
This change applies the upstream changes from 1.1.90 to 1.2.0 (r733).
BUG=none
TEST=webkit layout_tests
Review URL: https://chromiumcodereview.appspot.com/9232002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@118072 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/tjunittest.c b/tjunittest.c
index 3a57347..d14ec52 100644
--- a/tjunittest.c
+++ b/tjunittest.c
@@ -65,10 +65,11 @@
const char *pixFormatStr[TJ_NUMPF]=
{
- "RGB", "BGR", "RGBX", "BGRX", "XBGR", "XRGB", "Grayscale"
+ "RGB", "BGR", "RGBX", "BGRX", "XBGR", "XRGB", "Grayscale",
+ "RGBA", "BGRA", "ABGR", "ARGB"
};
-const int alphaOffset[TJ_NUMPF] = {-1, -1, 3, 3, 0, 0, -1};
+const int alphaOffset[TJ_NUMPF] = {-1, -1, -1, -1, -1, -1, -1, 3, 3, 0, 0};
const int _3byteFormats[]={TJPF_RGB, TJPF_BGR};
const int _4byteFormats[]={TJPF_RGBX, TJPF_BGRX, TJPF_XBGR, TJPF_XRGB};
@@ -76,7 +77,7 @@
const int _onlyRGB[]={TJPF_RGB};
enum {YUVENCODE=1, YUVDECODE};
-int yuv=0, alloc=0;
+int yuv=0, alloc=0, alpha=0;
int exitStatus=0;
#define bailout() {exitStatus=-1; goto bailout;}
@@ -511,6 +512,9 @@
flags);
decompTest(dhandle, dstBuf, size, w, h, pf, basename, subsamp,
flags);
+ if(pf>=TJPF_RGBX && pf<=TJPF_XRGB)
+ decompTest(dhandle, dstBuf, size, w, h, pf+(TJPF_RGBA-TJPF_RGBX),
+ basename, subsamp, flags);
}
}