Add RGBX BGRX support to WEBPImportPicture

third_party/libwebp/enc/picture.c

 // Copyright 2011 Google Inc.
 //
 // This code is licensed under the same terms as WebM:
 //  Software License Agreement:  http://www.webmproject.org/license/software/
 //  Additional IP Rights Grant:  http://www.webmproject.org/license/additional/
 // -----------------------------------------------------------------------------
 //
 // WebPPicture utils: colorspace conversion, crop, ...
 //
 // Author: Skal (pascal.massimino@gmail.com)
@@ skipping 575 matching lines @@
   return Import(picture, rgba, rgba_stride, 4, 0, 1);
 }
 
 int WebPPictureImportBGRA(WebPPicture* const picture,
                           const uint8_t* const rgba, int rgba_stride) {
   picture->colorspace |= WEBP_CSP_ALPHA_BIT;
   if (!WebPPictureAlloc(picture)) return 0;
   return Import(picture, rgba, rgba_stride, 4, 1, 1);
 }
 
+int WebPPictureImportRGBX(WebPPicture* const picture,
+                          const uint8_t* const rgbx, int rgbx_stride) {
+  // In libwebp.next, assert picture->user_argb_input here.

[skal, 2012/06/04 04:34:55]

not necessarily. What if you want to convert to YUV?

I'd just remove this comment

+  picture->colorspace &= ~WEBP_CSP_ALPHA_BIT;
+  if (!WebPPictureAlloc(picture)) return 0;
+  return Import(picture, rgbx, rgbx_stride, 4, 0, 0);
+}
+
+int WebPPictureImportBGRX(WebPPicture* const picture,
+                          const uint8_t* const rgbx, int rgbx_stride) {
+  // In libwebp.next, assert picture->user_argb_input here.

[skal, 2012/06/04 04:34:55]

here too

+  picture->colorspace &= ~WEBP_CSP_ALPHA_BIT;
+  if (!WebPPictureAlloc(picture)) return 0;
+  return Import(picture, rgbx, rgbx_stride, 4, 1, 0);
+}
+
 //------------------------------------------------------------------------------
 // Simplest call:
 
 typedef int (*Importer)(WebPPicture* const, const uint8_t* const, int);
 
 static size_t Encode(const uint8_t* rgba, int width, int height, int stride,
                      Importer import, float quality_factor, uint8_t** output) {
   size_t output_size = 0;
   WebPPicture pic;
   WebPConfig config;
@@ skipping 35 matching lines @@
 ENCODE_FUNC(WebPEncodeRGBA, WebPPictureImportRGBA);
 ENCODE_FUNC(WebPEncodeBGRA, WebPPictureImportBGRA);
 
 #undef ENCODE_FUNC
 
 //------------------------------------------------------------------------------
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }    // extern "C"
 #endif