diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 03:01:00 +0200 |
| commit | aa332026488e8e441a4187898534c59cd657e70e (patch) | |
| tree | 1eb1efac80b21a2889c7ea03ead5e203c2ee85c6 /src/3rdparty/libwebp/src/enc/alpha_enc.c | |
| parent | c6e1c8f3a8e0d0153ff82da88593edb9b7bf8995 (diff) | |
| parent | 62082a63e112e9991b33c2045896ced78ffcb62e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I06492f609fbb58d78738fff6d124b616287b03bd
Diffstat (limited to 'src/3rdparty/libwebp/src/enc/alpha_enc.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/enc/alpha_enc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/libwebp/src/enc/alpha_enc.c b/src/3rdparty/libwebp/src/enc/alpha_enc.c index 7e8d87f..dce9ca9 100644 --- a/src/3rdparty/libwebp/src/enc/alpha_enc.c +++ b/src/3rdparty/libwebp/src/enc/alpha_enc.c @@ -361,7 +361,8 @@ static int EncodeAlpha(VP8Encoder* const enc, //------------------------------------------------------------------------------ // Main calls -static int CompressAlphaJob(VP8Encoder* const enc, void* dummy) { +static int CompressAlphaJob(void* arg1, void* dummy) { + VP8Encoder* const enc = (VP8Encoder*)arg1; const WebPConfig* config = enc->config_; uint8_t* alpha_data = NULL; size_t alpha_size = 0; @@ -394,7 +395,7 @@ void VP8EncInitAlpha(VP8Encoder* const enc) { WebPGetWorkerInterface()->Init(worker); worker->data1 = enc; worker->data2 = NULL; - worker->hook = (WebPWorkerHook)CompressAlphaJob; + worker->hook = CompressAlphaJob; } } |