Add RGBX BGRX support to WEBPImportPicture

third_party/libwebp/webp/encode.h

 // 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/
 // -----------------------------------------------------------------------------
 //
 //   WebP encoder: main interface
 //
 // Author: Skal (pascal.massimino@gmail.com)
@@ skipping 234 matching lines @@
 
 // Colorspace conversion function to import RGB samples.
 // Previous buffer will be free'd, if any.
 // *rgb buffer should have a size of at least height * rgb_stride.
 // Returns 0 in case of memory error.
 WEBP_EXTERN(int) WebPPictureImportRGB(
     WebPPicture* const picture, const uint8_t* const rgb, int rgb_stride);
 // Same, but for RGBA buffer
 WEBP_EXTERN(int) WebPPictureImportRGBA(
     WebPPicture* const picture, const uint8_t* const rgba, int rgba_stride);
+// Same again, RGBA buffer, ignoring the alpha channel

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

you can add a comment about why this is useful compared to
WebPPictureImportRGBA. Something like:
"useful when input is totally opaque, but one want to retain the 32-bit packed
layout and avoid converting to 24-bit RGB".

+WEBP_EXTERN(int) WebPPictureImportRGBX(
+    WebPPicture* const picture, const uint8_t* const rgbx, int rgbx_stride);
 
-// Variant of the above, but taking BGR(A) input:
+// Variant of the above, but taking BGR(A) input
 WEBP_EXTERN(int) WebPPictureImportBGR(
     WebPPicture* const picture, const uint8_t* const bgr, int bgr_stride);
 WEBP_EXTERN(int) WebPPictureImportBGRA(
     WebPPicture* const picture, const uint8_t* const bgra, int bgra_stride);
+WEBP_EXTERN(int) WebPPictureImportBGRX(
+    WebPPicture* const picture, const uint8_t* const bgrx, int bgrx_stride);
 
 //------------------------------------------------------------------------------
 // Main call
 
 // Main encoding call, after config and picture have been initialized.
 // 'picture' must be less than 16384x16384 in dimension (cf WEBP_MAX_DIMENSION),
 // and the 'config' object must be a valid one.
 // Returns false in case of error, true otherwise.
 // In case of error, picture->error_code is updated accordingly.
 WEBP_EXTERN(int) WebPEncode(
     const WebPConfig* const config, WebPPicture* const picture);
 
 //------------------------------------------------------------------------------
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }    // extern "C"
 #endif
 
 #endif  /* WEBP_WEBP_ENCODE_H_ */