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;
 }

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"
 

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"

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"

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)

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"

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"

src/plugins/imageformats/imageformats.pro

@@ -16,4 +16,4 @@ winrt {
                tga
 }
 
-winrt|android: SUBDIRS -= webp
+winrt|android|ios: SUBDIRS -= webp