Skip to content

Fixing incompatible pointer assignment that causes build on RHEL 10 t… #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing incompatible pointer assignment that causes build on RHEL 10 t… #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_qmfb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
\******************************************************************************/

#include "jasper/jas_seq.h"
#include "jpc_fix.h"

/******************************************************************************\
* Constants.
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions supportApp/GraphicsMagickSrc/jp2/src/libjasper/jpc/jpc_tsfb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down