diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-07 13:05:21 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-13 10:47:45 +0000 |
commit | b7ec9e78633d8f2c75a8b02e17e169497bb103e2 (patch) | |
tree | e4be04af4dbcf8cd635715efdf4e769281183746 /src/3rdparty/libwebp.pri | |
parent | f2dbc67c2b032a5f27d0224e020fb6dfcd3fd142 (diff) | |
download | qtimageformats-b7ec9e78633d8f2c75a8b02e17e169497bb103e2.tar.gz |
Bundled libwebp updated to version 0.6.0
This commit imports libwebp 0.6.0, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.
Upstream changes since 0.5.1 have been merged in.
Also updated version in qt_attribution.json.
Conflicts:
src/3rdparty/libwebp.pri
src/3rdparty/libwebp/qt_attribution.json
src/3rdparty/libwebp/src/webp/config.h
Change-Id: I001aa7a3fabf0130b54f9005c23aa822bc1d0ec1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libwebp.pri')
-rw-r--r-- | src/3rdparty/libwebp.pri | 110 |
1 files changed, 57 insertions, 53 deletions
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index f21ba6d..61fbee9 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -1,30 +1,29 @@ -CONFIG += object_parallel_to_source no_batch - INCLUDEPATH += \ $$PWD/libwebp \ $$PWD/libwebp/src \ $$PWD/libwebp/src/dec \ $$PWD/libwebp/src/enc \ - $$PWD/libwebp/src/extra \ $$PWD/libwebp/src/dsp \ $$PWD/libwebp/src/mux \ $$PWD/libwebp/src/utils \ $$PWD/libwebp/src/webp SOURCES += \ - $$PWD/libwebp/src/dec/alpha.c \ - $$PWD/libwebp/src/dec/buffer.c \ - $$PWD/libwebp/src/dec/frame.c \ - $$PWD/libwebp/src/dec/idec.c \ - $$PWD/libwebp/src/dec/io.c \ - $$PWD/libwebp/src/dec/quant.c \ - $$PWD/libwebp/src/dec/tree.c \ - $$PWD/libwebp/src/dec/vp8.c \ - $$PWD/libwebp/src/dec/vp8l.c \ - $$PWD/libwebp/src/dec/webp.c \ + $$PWD/libwebp/src/dec/alpha_dec.c \ + $$PWD/libwebp/src/dec/buffer_dec.c \ + $$PWD/libwebp/src/dec/frame_dec.c \ + $$PWD/libwebp/src/dec/idec_dec.c \ + $$PWD/libwebp/src/dec/io_dec.c \ + $$PWD/libwebp/src/dec/quant_dec.c \ + $$PWD/libwebp/src/dec/tree_dec.c \ + $$PWD/libwebp/src/dec/vp8_dec.c \ + $$PWD/libwebp/src/dec/vp8l_dec.c \ + $$PWD/libwebp/src/dec/webp_dec.c \ $$PWD/libwebp/src/demux/demux.c \ $$PWD/libwebp/src/demux/anim_decode.c \ + $$PWD/libwebp/src/dsp/alpha_processing.c \ $$PWD/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/alpha_processing_sse2.c \ $$PWD/libwebp/src/dsp/alpha_processing_sse41.c \ $$PWD/libwebp/src/dsp/argb.c \ $$PWD/libwebp/src/dsp/argb_mips_dsp_r2.c \ @@ -35,80 +34,83 @@ SOURCES += \ $$PWD/libwebp/src/dsp/cost_sse2.c \ $$PWD/libwebp/src/dsp/cpu.c \ $$PWD/libwebp/src/dsp/dec.c \ + $$PWD/libwebp/src/dsp/dec_clip_tables.c \ + $$PWD/libwebp/src/dsp/dec_mips32.c \ $$PWD/libwebp/src/dsp/dec_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/dec_msa.c \ $$PWD/libwebp/src/dsp/dec_sse2.c \ $$PWD/libwebp/src/dsp/dec_sse41.c \ $$PWD/libwebp/src/dsp/enc.c \ + $$PWD/libwebp/src/dsp/enc_avx2.c \ + $$PWD/libwebp/src/dsp/enc_mips32.c \ $$PWD/libwebp/src/dsp/enc_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/enc_msa.c \ $$PWD/libwebp/src/dsp/enc_sse2.c \ $$PWD/libwebp/src/dsp/enc_sse41.c \ $$PWD/libwebp/src/dsp/filters.c \ $$PWD/libwebp/src/dsp/filters_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/filters_msa.c \ $$PWD/libwebp/src/dsp/filters_sse2.c \ $$PWD/libwebp/src/dsp/lossless.c \ $$PWD/libwebp/src/dsp/lossless_enc.c \ $$PWD/libwebp/src/dsp/lossless_enc_mips32.c \ $$PWD/libwebp/src/dsp/lossless_enc_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/lossless_enc_msa.c \ $$PWD/libwebp/src/dsp/lossless_enc_sse2.c \ $$PWD/libwebp/src/dsp/lossless_enc_sse41.c \ $$PWD/libwebp/src/dsp/lossless_mips_dsp_r2.c \ $$PWD/libwebp/src/dsp/rescaler.c \ $$PWD/libwebp/src/dsp/rescaler_mips32.c \ $$PWD/libwebp/src/dsp/rescaler_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/rescaler_msa.c \ $$PWD/libwebp/src/dsp/rescaler_sse2.c \ $$PWD/libwebp/src/dsp/upsampling.c \ $$PWD/libwebp/src/dsp/upsampling_mips_dsp_r2.c \ + $$PWD/libwebp/src/dsp/upsampling_msa.c \ $$PWD/libwebp/src/dsp/upsampling_sse2.c \ $$PWD/libwebp/src/dsp/yuv.c \ $$PWD/libwebp/src/dsp/yuv_mips_dsp_r2.c \ - $$PWD/libwebp/src/dsp/alpha_processing.c \ - $$PWD/libwebp/src/dsp/alpha_processing_sse2.c \ - $$PWD/libwebp/src/dsp/dec_clip_tables.c \ - $$PWD/libwebp/src/dsp/dec_mips32.c \ - $$PWD/libwebp/src/dsp/enc_avx2.c \ - $$PWD/libwebp/src/dsp/enc_mips32.c \ $$PWD/libwebp/src/dsp/lossless_sse2.c \ $$PWD/libwebp/src/dsp/yuv_mips32.c \ $$PWD/libwebp/src/dsp/yuv_sse2.c \ - $$PWD/libwebp/src/enc/alpha.c \ - $$PWD/libwebp/src/enc/analysis.c \ - $$PWD/libwebp/src/enc/backward_references.c \ - $$PWD/libwebp/src/enc/config.c \ - $$PWD/libwebp/src/enc/cost.c \ - $$PWD/libwebp/src/enc/delta_palettization.c \ - $$PWD/libwebp/src/enc/filter.c \ - $$PWD/libwebp/src/enc/frame.c \ - $$PWD/libwebp/src/enc/histogram.c \ - $$PWD/libwebp/src/enc/iterator.c \ - $$PWD/libwebp/src/enc/near_lossless.c \ - $$PWD/libwebp/src/enc/picture.c \ - $$PWD/libwebp/src/enc/quant.c \ - $$PWD/libwebp/src/enc/syntax.c \ - $$PWD/libwebp/src/enc/token.c \ - $$PWD/libwebp/src/enc/tree.c \ - $$PWD/libwebp/src/enc/vp8l.c \ - $$PWD/libwebp/src/enc/webpenc.c \ - $$PWD/libwebp/src/enc/picture_csp.c \ - $$PWD/libwebp/src/enc/picture_psnr.c \ - $$PWD/libwebp/src/enc/picture_rescale.c \ - $$PWD/libwebp/src/enc/picture_tools.c \ - $$PWD/libwebp/src/extras/extras.c \ + $$PWD/libwebp/src/enc/alpha_enc.c \ + $$PWD/libwebp/src/enc/analysis_enc.c \ + $$PWD/libwebp/src/enc/backward_references_enc.c \ + $$PWD/libwebp/src/enc/config_enc.c \ + $$PWD/libwebp/src/enc/cost_enc.c \ + $$PWD/libwebp/src/enc/delta_palettization_enc.c \ + $$PWD/libwebp/src/enc/filter_enc.c \ + $$PWD/libwebp/src/enc/frame_enc.c \ + $$PWD/libwebp/src/enc/histogram_enc.c \ + $$PWD/libwebp/src/enc/iterator_enc.c \ + $$PWD/libwebp/src/enc/near_lossless_enc.c \ + $$PWD/libwebp/src/enc/picture_enc.c \ + $$PWD/libwebp/src/enc/picture_csp_enc.c \ + $$PWD/libwebp/src/enc/picture_psnr_enc.c \ + $$PWD/libwebp/src/enc/picture_rescale_enc.c \ + $$PWD/libwebp/src/enc/picture_tools_enc.c \ + $$PWD/libwebp/src/enc/predictor_enc.c \ + $$PWD/libwebp/src/enc/quant_enc.c \ + $$PWD/libwebp/src/enc/syntax_enc.c \ + $$PWD/libwebp/src/enc/token_enc.c \ + $$PWD/libwebp/src/enc/tree_enc.c \ + $$PWD/libwebp/src/enc/vp8l_enc.c \ + $$PWD/libwebp/src/enc/webp_enc.c \ $$PWD/libwebp/src/mux/anim_encode.c \ $$PWD/libwebp/src/mux/muxedit.c \ $$PWD/libwebp/src/mux/muxinternal.c \ $$PWD/libwebp/src/mux/muxread.c \ - $$PWD/libwebp/src/utils/bit_reader.c \ - $$PWD/libwebp/src/utils/bit_writer.c \ - $$PWD/libwebp/src/utils/color_cache.c \ - $$PWD/libwebp/src/utils/filters.c \ - $$PWD/libwebp/src/utils/huffman.c \ - $$PWD/libwebp/src/utils/huffman_encode.c \ - $$PWD/libwebp/src/utils/quant_levels.c \ - $$PWD/libwebp/src/utils/quant_levels_dec.c \ - $$PWD/libwebp/src/utils/random.c \ - $$PWD/libwebp/src/utils/rescaler.c \ - $$PWD/libwebp/src/utils/thread.c \ + $$PWD/libwebp/src/utils/bit_reader_utils.c \ + $$PWD/libwebp/src/utils/bit_writer_utils.c \ + $$PWD/libwebp/src/utils/color_cache_utils.c \ + $$PWD/libwebp/src/utils/filters_utils.c \ + $$PWD/libwebp/src/utils/huffman_utils.c \ + $$PWD/libwebp/src/utils/huffman_encode_utils.c \ + $$PWD/libwebp/src/utils/quant_levels_utils.c \ + $$PWD/libwebp/src/utils/quant_levels_dec_utils.c \ + $$PWD/libwebp/src/utils/random_utils.c \ + $$PWD/libwebp/src/utils/rescaler_utils.c \ + $$PWD/libwebp/src/utils/thread_utils.c \ $$PWD/libwebp/src/utils/utils.c android { @@ -122,8 +124,10 @@ integrity { equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { SOURCES_FOR_NEON += \ + $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ $$PWD/libwebp/src/dsp/dec_neon.c \ $$PWD/libwebp/src/dsp/enc_neon.c \ + $$PWD/libwebp/src/dsp/filters_neon.c \ $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ $$PWD/libwebp/src/dsp/lossless_neon.c \ $$PWD/libwebp/src/dsp/rescaler_neon.c \ |