Skip to content

Commit 93c2d7f

Browse files
Merge pull request #146 from DarthGandalf/cc
Fix build with gcc 15
2 parents 5969b82 + b06d01b commit 93c2d7f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

applications/radon/inverse_radon.c.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static int linogram_grid(int T, int S, NFFT_R *x, NFFT_R *w)
111111
* on the grid given by gridfcn() with T angles and R offsets
112112
* by a NFFT-based CG-type algorithm
113113
*/
114-
static int inverse_radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *Rf, int NN, NFFT_R *f,
114+
static int inverse_radon_trafo(int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w), int T, int S, NFFT_R *Rf, int NN, NFFT_R *f,
115115
int max_i)
116116
{
117117
int j, k; /**< index for nodes and freqencies */
@@ -237,7 +237,7 @@ static int inverse_radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *Rf, int N
237237
*/
238238
int main(int argc, char **argv)
239239
{
240-
int (*gridfcn)(); /**< grid generating function */
240+
int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w); /**< grid generating function */
241241
int T, S; /**< number of directions/offsets */
242242
FILE *fp;
243243
int N; /**< image size */

applications/radon/radon.c.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static int linogram_grid(int T, int S, NFFT_R *x, NFFT_R *w)
111111
/** computes the NFFT-based discrete Radon transform of f
112112
* on the grid given by gridfcn() with T angles and R offsets
113113
*/
114-
static int Radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *f, int NN, NFFT_R *Rf)
114+
static int Radon_trafo(int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w), int T, int S, NFFT_R *f, int NN, NFFT_R *Rf)
115115
{
116116
int j, k; /**< index for nodes and freqencies */
117117
NFFT(plan) my_nfft_plan; /**< plan for the nfft-2D */
@@ -205,7 +205,7 @@ static int Radon_trafo(int (*gridfcn)(), int T, int S, NFFT_R *f, int NN, NFFT_R
205205
*/
206206
int main(int argc, char **argv)
207207
{
208-
int (*gridfcn)(); /**< grid generating function */
208+
int (*gridfcn)(int T, int S, NFFT_R *x, NFFT_R *w); /**< grid generating function */
209209
int T, S; /**< number of directions/offsets */
210210
FILE *fp;
211211
int N; /**< image size */

0 commit comments

Comments
 (0)