Update libjpeg-turbo to r856.

turbojpeg.c

 /*
  * 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
@@ skipping 127 matching lines @@
                 else
                 {
                         if(flags&TJ_BGR) return TJPF_BGRX;
                         else return TJPF_RGBX;
                 }
         }
         return -1;
 }
 
 static int setCompDefaults(struct jpeg_compress_struct *cinfo,
-        int pixelFormat, int subsamp, int jpegQual)
+        int pixelFormat, int subsamp, int jpegQual, int flags)
 {
         int retval=0;
 
         switch(pixelFormat)
         {
                 case TJPF_GRAY:
                         cinfo->in_color_space=JCS_GRAYSCALE;  break;
                 #if JCS_EXTENSIONS==1
                 case TJPF_RGB:
                         cinfo->in_color_space=JCS_EXT_RGB;  break;
@@ skipping 25 matching lines @@
                         cinfo->in_color_space=JCS_RGB;  pixelFormat=TJPF_RGB;
                         break;
                 #endif
         }
 
         cinfo->input_components=tjPixelSize[pixelFormat];
         jpeg_set_defaults(cinfo);
         if(jpegQual>=0)
         {
                 jpeg_set_quality(cinfo, jpegQual, TRUE);
-                if(jpegQual>=96) cinfo->dct_method=JDCT_ISLOW;
+                if(jpegQual>=96 || flags&TJFLAG_ACCURATEDCT) cinfo->dct_method=JDCT_ISLOW;
                 else cinfo->dct_method=JDCT_FASTEST;
         }
         if(subsamp==TJSAMP_GRAY)
                 jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
         else
                 jpeg_set_colorspace(cinfo, JCS_YCbCr);
 
         cinfo->comp_info[0].h_samp_factor=tjMCUWidth[subsamp]/8;
         cinfo->comp_info[1].h_samp_factor=1;
         cinfo->comp_info[2].h_samp_factor=1;
         cinfo->comp_info[0].v_samp_factor=tjMCUHeight[subsamp]/8;
         cinfo->comp_info[1].v_samp_factor=1;
         cinfo->comp_info[2].v_samp_factor=1;
 
         return retval;
 }
 
 static int setDecompDefaults(struct jpeg_decompress_struct *dinfo,
-        int pixelFormat)
+        int pixelFormat, int flags)
 {
         int retval=0;
 
         switch(pixelFormat)
         {
                 case TJPF_GRAY:
                         dinfo->out_color_space=JCS_GRAYSCALE;  break;
                 #if JCS_EXTENSIONS==1
                 case TJPF_RGB:
                         dinfo->out_color_space=JCS_EXT_RGB;  break;
@@ skipping 27 matching lines @@
                 case TJPF_RGBA:
                 case TJPF_BGRA:
                 case TJPF_ARGB:
                 case TJPF_ABGR:
                         dinfo->out_color_space=JCS_RGB;  break;
                 #endif
                 default:
                         _throw("Unsupported pixel format");
         }
 
+        if(flags&TJFLAG_FASTDCT) dinfo->dct_method=JDCT_FASTEST;
+
         bailout:
         return retval;
 }
 
 
 static int getSubsamp(j_decompress_ptr dinfo)
 {
         int retval=-1, i, k;
         for(i=0; i<NUMSUBOPT; i++)
         {
@@ skipping 340 matching lines @@
 
         if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1");
         else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1");
         else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1");
 
         if(flags&TJFLAG_NOREALLOC)
         {
                 alloc=0;  *jpegSize=tjBufSize(width, height, jpegSubsamp);
         }
         jpeg_mem_dest_tj(cinfo, jpegBuf, jpegSize, alloc);
-        if(setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual)==-1)
+        if(setCompDefaults(cinfo, pixelFormat, jpegSubsamp, jpegQual, flags)==-1)
                 return -1;
 
         jpeg_start_compress(cinfo, TRUE);
         if((row_pointer=(JSAMPROW *)malloc(sizeof(JSAMPROW)*height))==NULL)
                 _throw("tjCompress2(): Memory allocation failure");
         for(i=0; i<height; i++)
         {
                 if(flags&TJFLAG_BOTTOMUP) row_pointer[i]=&srcBuf[(height-i-1)*pitch];
                 else row_pointer[i]=&srcBuf[i*pitch];
         }
@@ skipping 87 matching lines @@
 
         cinfo->image_width=width;
         cinfo->image_height=height;
 
         if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1");
         else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1");
         else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1");
 
         yuvsize=tjBufSizeYUV(width, height, subsamp);
         jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0);
-        if(setCompDefaults(cinfo, pixelFormat, subsamp, -1)==-1) return -1;
+        if(setCompDefaults(cinfo, pixelFormat, subsamp, -1, flags)==-1) return -1;
 
         jpeg_start_compress(cinfo, TRUE);
         pw=PAD(width, cinfo->max_h_samp_factor);
         ph=PAD(height, cinfo->max_v_samp_factor);
 
         if((row_pointer=(JSAMPROW *)malloc(sizeof(JSAMPROW)*ph))==NULL)
                 _throw("tjEncodeYUV2(): Memory allocation failure");
         for(i=0; i<height; i++)
         {
                 if(flags&TJFLAG_BOTTOMUP) row_pointer[i]=&srcBuf[(height-i-1)*pitch];
@@ skipping 208 matching lines @@
 
         if(setjmp(this->jerr.setjmp_buffer))
         {
                 /* If we get here, the JPEG code has signaled an error. */
                 retval=-1;
                 goto bailout;
         }
 
         jpeg_mem_src_tj(dinfo, jpegBuf, jpegSize);
         jpeg_read_header(dinfo, TRUE);
-        if(setDecompDefaults(dinfo, pixelFormat)==-1)
+        if(setDecompDefaults(dinfo, pixelFormat, flags)==-1)
         {
                 retval=-1;  goto bailout;
         }
 
         if(flags&TJFLAG_FASTUPSAMPLE) dinfo->do_fancy_upsampling=FALSE;
 
         jpegwidth=dinfo->image_width;  jpegheight=dinfo->image_height;
         if(width==0) width=jpegwidth;
         if(height==0) height=jpegheight;
         for(i=0; i<NUMSF; i++)
@@ skipping 134 matching lines @@
                                 _throw("tjDecompressToYUV(): Memory allocation failure");
                         for(row=0; row<th[i]; row++)
                         {
                                 tmpbuf[i][row]=ptr;
                                 ptr+=iw[i];
                         }
                 }
         }
 
         if(flags&TJFLAG_FASTUPSAMPLE) dinfo->do_fancy_upsampling=FALSE;
+        if(flags&TJFLAG_FASTDCT) dinfo->dct_method=JDCT_FASTEST;
         dinfo->raw_data_out=TRUE;
 
         jpeg_start_decompress(dinfo);
         for(row=0; row<(int)dinfo->output_height;
                 row+=dinfo->max_v_samp_factor*DCTSIZE)
         {
                 JSAMPARRAY yuvptr[MAX_COMPONENTS];
                 int crow[MAX_COMPONENTS];
                 for(i=0; i<dinfo->num_components; i++)
                 {
@@ skipping 193 matching lines @@
         }
 
         jpeg_finish_decompress(dinfo);
 
         bailout:
         if(cinfo->global_state>CSTATE_START) jpeg_abort_compress(cinfo);
         if(dinfo->global_state>DSTATE_START) jpeg_abort_decompress(dinfo);
         if(xinfo) free(xinfo);
         return retval;
 }