Update libjpeg-turbo.

tjbench.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 90 matching lines @@
 
         if(jpegqual>0)
         {
                 snprintf(qualstr, 6, "_Q%d", jpegqual);
                 qualstr[5]=0;
         }
 
         if((handle=tjInitDecompress())==NULL)
                 _throwtj("executing tjInitDecompress()");
 
-        bufsize=(yuv==YUVDECODE? yuvsize:pitch*h);
+        bufsize=(yuv==YUVDECODE? yuvsize:pitch*scaledh);
         if(dstbuf==NULL)
         {
                 if((dstbuf=(unsigned char *)malloc(bufsize)) == NULL)
                         _throwunix("allocating image buffer");
                 dstbufalloc=1;
         }
         /* Set the destination buffer to gray so we know whether the decompressor
            attempted to write to it */
         memset(dstbuf, 127, bufsize);
 
@@ skipping 550 matching lines @@
         printf("-alloc = Dynamically allocate JPEG image buffers\n");
         printf("-bmp = Generate output images in Windows Bitmap format (default=PPM)\n");
         printf("-bottomup = Test bottom-up compression/decompression\n");
         printf("-tile = Test performance of the codec when the image is encoded as separate\n");
         printf("     tiles of varying sizes.\n");
         printf("-forcemmx, -forcesse, -forcesse2, -forcesse3 =\n");
         printf("     Force MMX, SSE, SSE2, or SSE3 code paths in the underlying codec\n");
         printf("-rgb, -bgr, -rgbx, -bgrx, -xbgr, -xrgb =\n");
         printf("     Test the specified color conversion path in the codec (default: BGR)\n");
         printf("-fastupsample = Use fast, inaccurate upsampling code to perform 4:2:2 and 4:2:0\n");
-        printf("     YUV decoding in libjpeg decompressor\n");
+        printf("     YUV decoding\n");
         printf("-quiet = Output results in tabular rather than verbose format\n");
         printf("-yuvencode = Encode RGB input as planar YUV rather than compressing as JPEG\n");
         printf("-yuvdecode = Decode JPEG image to planar YUV rather than RGB\n");
         printf("-scale M/N = scale down the width/height of the decompressed JPEG image by a\n");
         printf("     factor of M/N (M/N = ");
         for(i=0; i<nsf; i++)
         {
                 printf("%d/%d", scalingfactors[i].num, scalingfactors[i].denom);
                 if(nsf==2 && i!=nsf-1) printf(" or ");
                 else if(nsf>2)
                 {
                         if(i!=nsf-1) printf(", ");
                         if(i==nsf-2) printf("or ");
                 }
+                if(i%8==0 && i!=0) printf("\n     ");
         }
         printf(")\n");
         printf("-hflip, -vflip, -transpose, -transverse, -rot90, -rot180, -rot270 =\n");
         printf("     Perform the corresponding lossless transform prior to\n");
         printf("     decompression (these options are mutually exclusive)\n");
         printf("-grayscale = Perform lossless grayscale conversion prior to decompression\n");
         printf("     test (can be combined with the other transforms above)\n");
         printf("-benchtime <t> = Run each benchmark for at least <t> seconds (default = 5.0)\n\n");
         printf("NOTE:  If the quality is specified as a range (e.g. 90-100), a separate\n");
         printf("test will be performed for all quality values in the range.\n\n");
@@ skipping 95 matching lines @@
                         if(!strcasecmp(argv[i], "-bottomup")) flags|=TJFLAG_BOTTOMUP;
                         if(!strcasecmp(argv[i], "-quiet")) quiet=1;
                         if(!strcasecmp(argv[i], "-qq")) quiet=2;
                         if(!strcasecmp(argv[i], "-scale") && i<argc-1)
                         {
                                 int temp1=0, temp2=0, match=0;
                                 if(sscanf(argv[++i], "%d/%d", &temp1, &temp2)==2)
                                 {
                                         for(j=0; j<nsf; j++)
                                         {
-                                                if(temp1==scalingfactors[j].num && temp2==scalingfactors[j].denom)
+                                                if((double)temp1/(double)temp2
+                                                        == (double)scalingfactors[j].num/(double)scalingfactors[j].denom)
                                                 {
                                                         sf=scalingfactors[j];
                                                         match=1;  break;
                                                 }
                                         }
                                         if(!match) usage(argv[0]);
                                 }
                                 else usage(argv[0]);
                         }
                         if(!strcasecmp(argv[i], "-hflip")) xformop=TJXOP_HFLIP;
@@ skipping 64 matching lines @@
                 dotest(srcbuf, w, h, TJ_422, i, argv[1]);
         printf("\n");
         for(i=maxqual; i>=minqual; i--)
                 dotest(srcbuf, w, h, TJ_444, i, argv[1]);
         printf("\n");
 
         bailout:
         if(srcbuf) free(srcbuf);
         return retval;
 }