From 954fa54a88cff31a7fc869a49d17474ab1da8459 Mon Sep 17 00:00:00 2001 From: aavit Date: Fri, 14 Nov 2014 10:26:53 +0100 Subject: Avoid implicit function declaration compile errors in libjasper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compilation for macx-ios-clang_OSX_10.9 would fail since the jas_eprintf function was used undeclared. Fix by #including jas_debug.h before4 use of that function. Also restructure some code in jpc_tsfb.c to prevent the same issue for jpc_tsfb_synthesize2 and jpc_tsfb_analyze2. Change-Id: Ib5b444873af6aa756d1c77145acdd863eaca0bd2 Reviewed-by: Tor Arne Vestbø --- .../jasper/src/libjasper/base/jas_getopt.c | 1 + src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c | 1 + src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c | 1 + src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c | 24 +++++++++++----------- src/3rdparty/jasper/src/libjasper/mif/mif_cod.c | 1 + src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c | 1 + 6 files changed, 17 insertions(+), 12 deletions(-) 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 #include +#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 +#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 #include +#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 +#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 #include +#include "jasper/jas_debug.h" #include "jasper/jas_types.h" #include "jasper/jas_stream.h" #include "jasper/jas_image.h" -- cgit v1.2.3