Merge pull request #26 from qnighy/feat/libwebp-1.5.0

Support libwebp 1.5.0

Author: qnighy

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         rust: [stable]
-        webp: [0.4.4, 0.5.2, 1.0.3, 1.1.0, 1.2.0]
+        webp: [0.4.4, 0.5.2, 1.0.3, 1.1.0, 1.2.0, 1.4.0, 1.5.0]
         webp_from: ["build"]
         common_features: [""]
         include:
@@ -18,23 +18,23 @@ jobs:
           webp_from: distr
           common_features: ""
         - rust: stable
-          webp: 1.2.0
+          webp: 1.5.0
           webp_from: bundled
           common_features: ""
         - rust: 1.31.0
-          webp: 1.2.0
+          webp: 1.5.0
           webp_from: build
           common_features: ""
         - rust: beta
-          webp: 1.2.0
+          webp: 1.5.0
           webp_from: build
           common_features: ""
         - rust: nightly
-          webp: 1.2.0
+          webp: 1.5.0
           webp_from: build
           common_features: ""
         - rust: nightly
-          webp: 1.2.0
+          webp: 1.5.0
           webp_from: build
           common_features: extern-types,
 
@@ -101,12 +101,26 @@ jobs:
         cargo test --all --features "${{ matrix.common_features }}1_2,mux"
         cargo test --all --features "${{ matrix.common_features }}1_2,demux,mux"
       if: matrix.webp >= '1.2'
+    - name: Test 1.4
+      run: |
+        cargo test --all --features "${{ matrix.common_features }}1_4"
+        cargo test --all --features "${{ matrix.common_features }}1_4,demux"
+        cargo test --all --features "${{ matrix.common_features }}1_4,mux"
+        cargo test --all --features "${{ matrix.common_features }}1_4,demux,mux"
+      if: matrix.webp >= '1.4'
+    - name: Test 1.5
+      run: |
+        cargo test --all --features "${{ matrix.common_features }}1_5"
+        cargo test --all --features "${{ matrix.common_features }}1_5,demux"
+        cargo test --all --features "${{ matrix.common_features }}1_5,mux"
+        cargo test --all --features "${{ matrix.common_features }}1_5,demux,mux"
+      if: matrix.webp >= '1.5'
     - name: Test static builds
       run: |
-        cargo test --all --features "${{ matrix.common_features }}1_2,static"
-        cargo test --all --features "${{ matrix.common_features }}1_2,static,demux"
-        cargo test --all --features "${{ matrix.common_features }}1_2,static,mux"
-        cargo test --all --features "${{ matrix.common_features }}1_2,static,demux,mux"
+        cargo test --all --features "${{ matrix.common_features }}1_5,static"
+        cargo test --all --features "${{ matrix.common_features }}1_5,static,demux"
+        cargo test --all --features "${{ matrix.common_features }}1_5,static,mux"
+        cargo test --all --features "${{ matrix.common_features }}1_5,static,demux,mux"
       if: matrix.webp_from == 'bundled'
     - name: Test __doc_cfg
       run: |

Cargo.toml

@@ -35,12 +35,15 @@ mux = []
 "0_6" = ["0_5"]
 "1_1" = ["0_6"]
 "1_2" = ["1_1"]
+"1_4" = ["1_2"]
+"1_5" = ["1_4"]
 static = []
 extern-types = []
-__doc_cfg = ["1_2", "demux", "mux"]
+must-use = []
+__doc_cfg = ["1_5", "demux", "mux"]
 
 [package.metadata.docs.rs]
-features = ["1_2", "demux", "mux", "__doc_cfg", "extern-types"]
+features = ["1_5", "demux", "mux", "__doc_cfg", "extern-types", "must-use"]
 
 [build-dependencies]
 pkg-config = "0.3.17"

build.rs

@@ -209,6 +209,7 @@ fn build_libwebp() {
         .file("c_src/src/utils/color_cache_utils.c")
         .file("c_src/src/utils/filters_utils.c")
         .file("c_src/src/utils/huffman_utils.c")
+        .file("c_src/src/utils/palette.c")
         .file("c_src/src/utils/quant_levels_dec_utils.c")
         .file("c_src/src/utils/rescaler_utils.c")
         .file("c_src/src/utils/random_utils.c")

c_src

@@ -169,6 +169,7 @@ impl std::fmt::Debug for __WebPDecBufferUnion {
 
 /// Enumeration of the status codes
 #[allow(non_camel_case_types)]
+// #[cfg_attr(feature = "must-use", must_use)] // meaningless for type aliases
 pub type VP8StatusCode = u32;
 
 pub const VP8_STATUS_OK: VP8StatusCode = 0;
@@ -322,6 +323,7 @@ extern "C" {
     /// RIFF + VP8X + (optional chunks) + VP8(L)
     /// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose.
     /// VP8(L)     <-- Not a valid WebP format: only allowed for internal purpose.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPGetInfo(
         data: *const u8,
         data_size: usize,
@@ -333,20 +335,23 @@ extern "C" {
     /// memory is R, G, B, A, R, G, B, A... in scan order (endian-independent).
     /// The returned pointer should be deleted calling WebPFree().
     /// Returns NULL in case of error.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeRGBA(
         data: *const u8,
         data_size: usize,
         width: *mut c_int,
         height: *mut c_int,
     ) -> *mut u8;
     /// Same as WebPDecodeRGBA, but returning A, R, G, B, A, R, G, B... ordered data.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeARGB(
         data: *const u8,
         data_size: usize,
         width: *mut c_int,
         height: *mut c_int,
     ) -> *mut u8;
     /// Same as WebPDecodeRGBA, but returning B, G, R, A, B, G, R, A... ordered data.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeBGRA(
         data: *const u8,
         data_size: usize,
@@ -355,13 +360,15 @@ extern "C" {
     ) -> *mut u8;
     /// Same as WebPDecodeRGBA, but returning R, G, B, R, G, B... ordered data.
     /// If the bitstream contains transparency, it is ignored.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeRGB(
         data: *const u8,
         data_size: usize,
         width: *mut c_int,
         height: *mut c_int,
     ) -> *mut u8;
     /// Same as WebPDecodeRGB, but returning B, G, R, B, G, R... ordered data.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeBGR(
         data: *const u8,
         data_size: usize,
@@ -378,6 +385,7 @@ extern "C" {
     /// 'width' and 'height' may be NULL, the other pointers must not be.
     /// Returns NULL in case of error.
     /// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeYUV(
         data: *const u8,
         data_size: usize,
@@ -396,20 +404,23 @@ extern "C" {
     // The parameter 'output_stride' specifies the distance (in bytes)
     // between scanlines. Hence, output_buffer_size is expected to be at least
     // output_stride x picture-height.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeRGBAInto(
         data: *const u8,
         data_size: usize,
         output_buffer: *mut u8,
         output_buffer_size: usize,
         output_stride: c_int,
     ) -> *mut u8;
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeARGBInto(
         data: *const u8,
         data_size: usize,
         output_buffer: *mut u8,
         output_buffer_size: usize,
         output_stride: c_int,
     ) -> *mut u8;
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeBGRAInto(
         data: *const u8,
         data_size: usize,
@@ -419,13 +430,15 @@ extern "C" {
     ) -> *mut u8;
     // RGB and BGR variants. Here too the transparency information, if present,
     // will be dropped and ignored.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeRGBInto(
         data: *const u8,
         data_size: usize,
         output_buffer: *mut u8,
         output_buffer_size: usize,
         output_stride: c_int,
     ) -> *mut u8;
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeBGRInto(
         data: *const u8,
         data_size: usize,
@@ -440,6 +453,7 @@ extern "C" {
     /// 'u_size' and 'v_size' respectively.
     /// Pointer to the luma plane ('*luma') is returned or NULL if an error occurred
     /// during decoding (or because some buffers were found to be too small).
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPDecodeYUVInto(
         data: *const u8,
         data_size: usize,
@@ -455,6 +469,7 @@ extern "C" {
     ) -> *mut u8;
     /// Internal, version-checked, entry point
     #[doc(hidden)]
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPInitDecBufferInternal(_: *mut WebPDecBuffer, _: c_int) -> c_int;
     /// Free any memory associated with the buffer. Must always be called last.
     /// Note: doesn't free the 'buffer' structure itself.
@@ -471,6 +486,7 @@ extern "C" {
     /// within valid bounds.
     /// All other fields of WebPDecBuffer MUST remain constant between calls.
     /// Returns NULL if the allocation failed.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPINewDecoder(output_buffer: *mut WebPDecBuffer) -> *mut WebPIDecoder;
     /// This function allocates and initializes an incremental-decoder object, which
     /// will output the RGB/A samples specified by 'csp' into a preallocated
@@ -482,6 +498,7 @@ extern "C" {
     /// colorspace 'csp' is taken into account for allocating this buffer. All other
     /// parameters are ignored.
     /// Returns NULL if the allocation failed, or if some parameters are invalid.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPINewRGB(
         csp: WEBP_CSP_MODE,
         output_buffer: *mut u8,
@@ -499,6 +516,7 @@ extern "C" {
     /// In this case, the output buffer will be automatically allocated (using
     /// MODE_YUVA) when decoding starts. All parameters are then ignored.
     /// Returns NULL if the allocation failed or if a parameter is invalid.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPINewYUVA(
         luma: *mut u8,
         luma_size: usize,
@@ -515,6 +533,7 @@ extern "C" {
     ) -> *mut WebPIDecoder;
     /// Deprecated version of the above, without the alpha plane.
     /// Kept for backward compatibility.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPINewYUV(
         luma: *mut u8,
         luma_size: usize,
@@ -548,6 +567,7 @@ extern "C" {
     /// (*last_y, *width etc.) can be NULL if corresponding information is not
     /// needed. The values in these pointers are only valid on successful (non-NULL)
     /// return.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPIDecGetRGB(
         idec: *const WebPIDecoder,
         last_y: *mut c_int,
@@ -558,6 +578,7 @@ extern "C" {
     /// Same as above function to get a YUVA image. Returns pointer to the luma
     /// plane or NULL in case of error. If there is no alpha information
     /// the alpha pointer '*a' will be returned NULL.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPIDecGetYUVA(
         idec: *const WebPIDecoder,
         last_y: *mut c_int,
@@ -576,6 +597,7 @@ extern "C" {
     /// Returns NULL in case the incremental decoder object is in an invalid state.
     /// Otherwise returns the pointer to the internal representation. This structure
     /// is read-only, tied to WebPIDecoder's lifespan and should not be modified.
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPIDecodedArea(
         idec: *const WebPIDecoder,
         left: *mut c_int,
@@ -593,6 +615,7 @@ extern "C" {
     ) -> VP8StatusCode;
     /// Internal, version-checked, entry point
     #[doc(hidden)]
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPInitDecoderConfigInternal(_: *mut WebPDecoderConfig, _: c_int) -> c_int;
     /// Instantiate a new incremental decoder object with the requested
     /// configuration. The bitstream can be passed using 'data' and 'data_size'
@@ -605,6 +628,7 @@ extern "C" {
     /// The return WebPIDecoder object must always be deleted calling WebPIDelete().
     /// Returns NULL in case of error (and config->status will then reflect
     /// the error condition, if available).
+    #[cfg_attr(feature = "must-use", must_use)]
     pub fn WebPIDecode(
         data: *const u8,
         data_size: usize,
@@ -623,6 +647,7 @@ extern "C" {
 /// Initialize the structure as empty. Must be called before any other use.
 /// Returns false in case of version mismatch
 #[allow(non_snake_case)]
+#[cfg_attr(feature = "must-use", must_use)]
 #[inline]
 pub unsafe extern "C" fn WebPInitDecBuffer(buffer: *mut WebPDecBuffer) -> c_int {
     WebPInitDecBufferInternal(buffer, WEBP_DECODER_ABI_VERSION)
@@ -653,6 +678,7 @@ pub unsafe extern "C" fn WebPGetFeatures(
 /// called first, unless WebPGetFeatures() is to be called.
 /// Returns false in case of mismatched version.
 #[allow(non_snake_case)]
+#[cfg_attr(feature = "must-use", must_use)]
 #[inline]
 pub unsafe extern "C" fn WebPInitDecoderConfig(config: *mut WebPDecoderConfig) -> c_int {
     WebPInitDecoderConfigInternal(config, WEBP_DECODER_ABI_VERSION)