Update libjpeg-turbo.

tjunittest.c

 /*
- * Copyright (C)2009-2011 D. R. Commander.  All Rights Reserved.
+ * Copyright (C)2009-2012 D. R. Commander.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
  * - Neither the name of the libjpeg-turbo Project nor the names of its
@@ skipping 57 matching lines @@
 };
 
 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};
 const int _onlyGray[]={TJPF_GRAY};
 const int _onlyRGB[]={TJPF_RGB};
 
 enum {YUVENCODE=1, YUVDECODE};
-int yuv=0, alloc=0, alpha=0;
+int yuv=0, alloc=0;
 
 int exitStatus=0;
 #define bailout() {exitStatus=-1;  goto bailout;}
 
 
 void initBuf(unsigned char *buf, int w, int h, int pf, int flags)
 {
         int roffset=tjRedOffset[pf];
         int goffset=tjGreenOffset[pf];
         int boffset=tjBlueOffset[pf];
@@ skipping 404 matching lines @@
         }
 
         if((chandle=tjInitCompress())==NULL || (dhandle=tjInitDecompress())==NULL)
                 _throwtj();
 
         for(pfi=0; pfi<nformats; pfi++)
         {
                 for(i=0; i<2; i++)
                 {
                         int flags=0;
+                        if(subsamp==TJSAMP_422 || subsamp==TJSAMP_420 || subsamp==TJSAMP_440)
+                                flags|=TJFLAG_FASTUPSAMPLE;
                         if(i==1)
                         {
                                 if(yuv==YUVDECODE) goto bailout;
                                 else flags|=TJFLAG_BOTTOMUP;
                         }
                         pf=formats[pfi];
                         compTest(chandle, &dstBuf, &size, w, h, pf, basename, subsamp, 100,
                                 flags);
                         decompTest(dhandle, dstBuf, size, w, h, pf, basename, subsamp,
                                 flags);
@@ skipping 95 matching lines @@
                         if(!strcasecmp(argv[i], "-yuv")) doyuv=1;
                         if(!strcasecmp(argv[i], "-alloc")) alloc=1;
                         if(!strncasecmp(argv[i], "-h", 2) || !strcasecmp(argv[i], "-?"))
                                 usage(argv[0]);
                 }
         }
         if(alloc) printf("Testing automatic buffer allocation\n");
         if(doyuv) {yuv=YUVENCODE;  alloc=0;}
         doTest(35, 39, _3byteFormats, 2, TJSAMP_444, "test");
         doTest(39, 41, _4byteFormats, 4, TJSAMP_444, "test");
-        if(doyuv)
-        {
-                doTest(41, 35, _3byteFormats, 2, TJSAMP_422, "test");
-                doTest(35, 39, _4byteFormats, 4, TJSAMP_422, "test");
-                doTest(39, 41, _3byteFormats, 2, TJSAMP_420, "test");
-                doTest(41, 35, _4byteFormats, 4, TJSAMP_420, "test");
-                doTest(35, 39, _3byteFormats, 2, TJSAMP_440, "test");
-                doTest(39, 41, _4byteFormats, 4, TJSAMP_440, "test");
-        }
+        doTest(41, 35, _3byteFormats, 2, TJSAMP_422, "test");
+        doTest(35, 39, _4byteFormats, 4, TJSAMP_422, "test");
+        doTest(39, 41, _3byteFormats, 2, TJSAMP_420, "test");
+        doTest(41, 35, _4byteFormats, 4, TJSAMP_420, "test");
+        doTest(35, 39, _3byteFormats, 2, TJSAMP_440, "test");
+        doTest(39, 41, _4byteFormats, 4, TJSAMP_440, "test");
         doTest(35, 39, _onlyGray, 1, TJSAMP_GRAY, "test");
         doTest(39, 41, _3byteFormats, 2, TJSAMP_GRAY, "test");
         doTest(41, 35, _4byteFormats, 4, TJSAMP_GRAY, "test");
         if(!doyuv) bufSizeTest();
         if(doyuv)
         {
                 yuv=YUVDECODE;
                 doTest(48, 48, _onlyRGB, 1, TJSAMP_444, "test_yuv0");
                 doTest(35, 39, _onlyRGB, 1, TJSAMP_444, "test_yuv1");
                 doTest(48, 48, _onlyRGB, 1, TJSAMP_422, "test_yuv0");
                 doTest(39, 41, _onlyRGB, 1, TJSAMP_422, "test_yuv1");
                 doTest(48, 48, _onlyRGB, 1, TJSAMP_420, "test_yuv0");
                 doTest(41, 35, _onlyRGB, 1, TJSAMP_420, "test_yuv1");
                 doTest(48, 48, _onlyRGB, 1, TJSAMP_440, "test_yuv0");
                 doTest(35, 39, _onlyRGB, 1, TJSAMP_440, "test_yuv1");
                 doTest(48, 48, _onlyRGB, 1, TJSAMP_GRAY, "test_yuv0");
                 doTest(35, 39, _onlyRGB, 1, TJSAMP_GRAY, "test_yuv1");
                 doTest(48, 48, _onlyGray, 1, TJSAMP_GRAY, "test_yuv0");
                 doTest(39, 41, _onlyGray, 1, TJSAMP_GRAY, "test_yuv1");
         }
 
         return exitStatus;
 }