diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:46 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:46 +0100 |
commit | 59354c50b52131987d5716f3254ddd2b5b2b4865 (patch) | |
tree | 651cb09c5268a795058b1570d0fe2eb2f73d55b2 | |
parent | c7c9fd2337b06498c3d04799d12382c156d873fb (diff) | |
parent | 9141782adabcfd374285c3a52b7c386b9b90aa9a (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I8b76d2098cc2d8bca5a63798d53182144d6a4442
-rw-r--r-- | config.tests/libwebp/libwebp.cpp | 9 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/base/jas_getopt.c | 1 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c | 1 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c | 1 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c | 24 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/mif/mif_cod.c | 1 | ||||
-rw-r--r-- | src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c | 1 | ||||
-rw-r--r-- | src/plugins/imageformats/imageformats.pro | 2 |
8 files changed, 27 insertions, 13 deletions
diff --git a/config.tests/libwebp/libwebp.cpp b/config.tests/libwebp/libwebp.cpp index 8a4f370..35e9b9b 100644 --- a/config.tests/libwebp/libwebp.cpp +++ b/config.tests/libwebp/libwebp.cpp @@ -32,12 +32,21 @@ ****************************************************************************/ #include <webp/decode.h> +#include <webp/encode.h> + +#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202) +#error "Incompatible libwebp version" +#endif int main(int, char **) { WebPDecoderConfig config; WebPDecBuffer *output_buffer = &config.output; WebPBitstreamFeatures *bitstream = &config.input; + WebPPicture picture; + picture.use_argb = 0; + WebPConfig config2; + config2.lossless = 0; return 0; } diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c b/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c index d1a6733..6b65a30 100644 --- a/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c +++ b/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c @@ -74,6 +74,7 @@ #include <stdio.h> #include <string.h> +#include "jasper/jas_debug.h" #include "jasper/jas_getopt.h" #include "jasper/jas_math.h" diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c b/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c index a37966d..b1ff065 100644 --- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c +++ b/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c @@ -73,6 +73,7 @@ #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_types.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h" diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c index ac5e0e4..7c85407 100644 --- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c +++ b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c @@ -75,6 +75,7 @@ #include <stdlib.h> #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_fix.h" #include "jasper/jas_stream.h" #include "jasper/jas_math.h" diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c index f20a7ea..54854af 100644 --- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c +++ b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c @@ -119,14 +119,6 @@ void jpc_tsfb_destroy(jpc_tsfb_t *tsfb) free(tsfb); } -int jpc_tsfb_analyze(jpc_tsfb_t *tsfb, jas_seq2d_t *a) -{ - return (tsfb->numlvls > 0) ? jpc_tsfb_analyze2(tsfb, jas_seq2d_getref(a, - jas_seq2d_xstart(a), jas_seq2d_ystart(a)), jas_seq2d_xstart(a), - jas_seq2d_ystart(a), jas_seq2d_width(a), - jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; -} - int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, int width, int height, int stride, int numlvls) { @@ -146,11 +138,11 @@ int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, return 0; } -int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *a) +int jpc_tsfb_analyze(jpc_tsfb_t *tsfb, jas_seq2d_t *a) { - return (tsfb->numlvls > 0) ? jpc_tsfb_synthesize2(tsfb, - jas_seq2d_getref(a, jas_seq2d_xstart(a), jas_seq2d_ystart(a)), - jas_seq2d_xstart(a), jas_seq2d_ystart(a), jas_seq2d_width(a), + return (tsfb->numlvls > 0) ? jpc_tsfb_analyze2(tsfb, jas_seq2d_getref(a, + jas_seq2d_xstart(a), jas_seq2d_ystart(a)), jas_seq2d_xstart(a), + jas_seq2d_ystart(a), jas_seq2d_width(a), jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; } @@ -174,6 +166,14 @@ int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, return 0; } +int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *a) +{ + return (tsfb->numlvls > 0) ? jpc_tsfb_synthesize2(tsfb, + jas_seq2d_getref(a, jas_seq2d_xstart(a), jas_seq2d_ystart(a)), + jas_seq2d_xstart(a), jas_seq2d_ystart(a), jas_seq2d_width(a), + jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; +} + int jpc_tsfb_getbands(jpc_tsfb_t *tsfb, uint_fast32_t xstart, uint_fast32_t ystart, uint_fast32_t xend, uint_fast32_t yend, jpc_tsfb_band_t *bands) diff --git a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c b/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c index 7367b01..3b1e7f5 100644 --- a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c +++ b/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c @@ -65,6 +65,7 @@ #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_tvp.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h" diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c b/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c index 14dd035..c996640 100644 --- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c +++ b/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c @@ -76,6 +76,7 @@ #include <stdlib.h> #include <assert.h> +#include "jasper/jas_debug.h" #include "jasper/jas_types.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h" diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 62feea7..54b0622 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -16,4 +16,4 @@ winrt { tga } -winrt|android: SUBDIRS -= webp +winrt|android|ios: SUBDIRS -= webp |