Skip to content

Commit 1727e73

Browse files
committed
Fix incompatible pointer assignment error on RH 10 in libjasper
1 parent b5d79d4 commit 1727e73

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
9898
int stride);
99-
int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
99+
int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height,
100100
int stride);
101101

102102
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,
15921592

15931593
}
15941594

1595-
int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
1595+
int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height,
15961596
int stride)
15971597
{
15981598
int numrows = height;

supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
\******************************************************************************/
7676

7777
#include "jasper/jas_seq.h"
78+
#include "jpc_fix.h"
7879

7980
/******************************************************************************\
8081
* Constants.
@@ -101,8 +102,8 @@ any particular platform. Hopefully, it is not too unreasonable, however. */
101102
#endif
102103

103104
typedef struct {
104-
int (*analyze)(int *, int, int, int, int, int);
105-
int (*synthesize)(int *, int, int, int, int, int);
105+
int (*analyze)(jpc_fix_t *, int, int, int, int, int);
106+
int (*synthesize)(jpc_fix_t *, int, int, int, int, int);
106107
double *lpenergywts;
107108
double *hpenergywts;
108109
} jpc_qmfb2d_t;

supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
#include "jpc_util.h"
8383
#include "jpc_math.h"
8484

85-
int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
85+
int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart,
8686
int width, int height, int stride, int numlvls);
8787

88-
int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
88+
int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart,
8989
int width, int height, int stride, int numlvls);
9090

9191
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)
133133
jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
134134
}
135135

136-
int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
136+
int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart,
137137
int width, int height, int stride, int numlvls)
138138
{
139139
if (width > 0 && height > 0) {
@@ -160,7 +160,7 @@ int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *a)
160160
jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
161161
}
162162

163-
int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
163+
int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jpc_fix_t *a, int xstart, int ystart,
164164
int width, int height, int stride, int numlvls)
165165
{
166166
if (numlvls > 0) {

0 commit comments

Comments
 (0)