Update libjpeg-turbo to 1.2.

turbojpeg.c

 /*
  * Copyright (C)2009-2011 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 129 matching lines @@
         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;
                 case TJPF_BGR:
                         cinfo->in_color_space=JCS_EXT_BGR;  break;
                 case TJPF_RGBX:
+                case TJPF_RGBA:
                         cinfo->in_color_space=JCS_EXT_RGBX;  break;
                 case TJPF_BGRX:
+                case TJPF_BGRA:
                         cinfo->in_color_space=JCS_EXT_BGRX;  break;
                 case TJPF_XRGB:
+                case TJPF_ARGB:
                         cinfo->in_color_space=JCS_EXT_XRGB;  break;
                 case TJPF_XBGR:
+                case TJPF_ABGR:
                         cinfo->in_color_space=JCS_EXT_XBGR;  break;
                 #else
                 case TJPF_RGB:
                         if(RGB_RED==0 && RGB_GREEN==1 && RGB_BLUE==2 && RGB_PIXELSIZE==3)
                         {
                                 cinfo->in_color_space=JCS_RGB;  break;
                         }
                 default:
                         _throw("Unsupported pixel format");
                 #endif
@@ skipping 40 matching lines @@
                 case TJPF_BGR:
                         dinfo->out_color_space=JCS_EXT_BGR;  break;
                 case TJPF_RGBX:
                         dinfo->out_color_space=JCS_EXT_RGBX;  break;
                 case TJPF_BGRX:
                         dinfo->out_color_space=JCS_EXT_BGRX;  break;
                 case TJPF_XRGB:
                         dinfo->out_color_space=JCS_EXT_XRGB;  break;
                 case TJPF_XBGR:
                         dinfo->out_color_space=JCS_EXT_XBGR;  break;
+                #if JCS_ALPHA_EXTENSIONS==1
+                case TJPF_RGBA:
+                        dinfo->out_color_space=JCS_EXT_RGBA;  break;
+                case TJPF_BGRA:
+                        dinfo->out_color_space=JCS_EXT_BGRA;  break;
+                case TJPF_ARGB:
+                        dinfo->out_color_space=JCS_EXT_ARGB;  break;
+                case TJPF_ABGR:
+                        dinfo->out_color_space=JCS_EXT_ABGR;  break;
+                #endif
                 #else
                 case TJPF_RGB:
                         if(RGB_RED==0 && RGB_GREEN==1 && RGB_BLUE==2 && RGB_PIXELSIZE==3)
                         {
                                 dinfo->out_color_space=JCS_RGB;  break;
                         }
+                #endif
                 default:
                         _throw("Unsupported pixel format");
-                #endif
         }
 
-        #if JCS_EXTENSIONS!=1
         bailout:
-        #endif
         return retval;
 }
 
 
 static int getSubsamp(j_decompress_ptr dinfo)
 {
         int retval=-1, i, k;
         for(i=0; i<NUMSUBOPT; i++)
         {
                 if(dinfo->num_components==pixelsize[i])
@@ skipping 840 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;
 }