diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c b/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c index d1a6733cb708089f7840ed6eaebd1b0afe903dec..6b65a30389cbbb7bf8da01fbe6427063eb8f93c2 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 a37966d90f907ce8cfb9beb381dd8870a120b2ee..b1ff065d7d613cbf46983e898361e18fd848c543 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 ac5e0e404e70a1a60fb5fe0ad12d8e0503e61d83..7c854075ddefc411cd9f79253ca0ca62c118bde0 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 f20a7ea1f099637355a8ce97d26383bc15c1f740..54854af1f2ee4fcfa3c9f48c1e9b364eddd5ca25 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 7367b0190af1477b555a4efec55a8cd6f6244260..3b1e7f5a1df48ead2749847dcc5f2b46c0e913b7 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 14dd035563d098d6573535a2e843a8d53100f8aa..c9966400e5091c7c0498101e4f07ee8f356b7eff 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 62feea78577a3b8e2e6dce0c97fefb7bc0331b51..54b0622325c0d6efafc2f6c29568bceafec231a2 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