diff --git a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c index 00d406d9..8886a3d2 100644 --- a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c +++ b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c @@ -96,7 +96,7 @@ int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride); -int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height, +int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride); int jpc_ns_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height, @@ -1592,7 +1592,7 @@ int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height, } -int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height, +int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride) { int numrows = height; diff --git a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h index 75611fe9..7bef848e 100644 --- a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h +++ b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h @@ -75,6 +75,7 @@ \******************************************************************************/ #include "jasper/jas_seq.h" +#include "jpc_fix.h" /******************************************************************************\ * Constants. @@ -101,8 +102,8 @@ any particular platform. Hopefully, it is not too unreasonable, however. */ #endif typedef struct { - int (*analyze)(int *, int, int, int, int, int); - int (*synthesize)(int *, int, int, int, int, int); + int (*analyze)(jpc_fix_t *, int, int, int, int, int); + int (*synthesize)(jpc_fix_t *, int, int, int, int, int); double *lpenergywts; double *hpenergywts; } jpc_qmfb2d_t; diff --git a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c index baf9af08..b5901e85 100644 --- a/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c +++ b/supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c @@ -82,10 +82,10 @@ #include "jpc_util.h" #include "jpc_math.h" -int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, +int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride, int numlvls); -int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, +int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride, int numlvls); void jpc_tsfb_getbands2(jpc_tsfb_t *tsfb, int locxstart, int locystart, @@ -133,7 +133,7 @@ int jpc_tsfb_analyze(jpc_tsfb_t *tsfb, jas_seq2d_t *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 jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride, int numlvls) { if (width > 0 && height > 0) { @@ -160,7 +160,7 @@ int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *a) jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0; } -int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart, +int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride, int numlvls) { if (numlvls > 0) {