1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From: Victor Seva <vseva@debian.org>
Date: Fri, 12 Sep 2025 09:36:37 +0200
Subject: fix gcc15 build
---
canon.c | 2 +-
makers.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/canon.c b/canon.c
index b69cf56..067f3af 100644
--- a/canon.c
+++ b/canon.c
@@ -1104,7 +1104,7 @@ canon_propA0(struct exifprop *aprop, struct exifprop *prop,
*/
static int
canon_subval(struct exifprop *prop, struct exiftags *t,
- struct exiftag *subtags, int (*valfun)())
+ struct exiftag *subtags, int (*valfun)(struct exifprop *, struct exifprop *, unsigned char *, struct exiftags *))
{
int i, j;
u_int16_t v;
diff --git a/makers.h b/makers.h
index 04f9d3b..75e0134 100644
--- a/makers.h
+++ b/makers.h
@@ -52,8 +52,8 @@
struct makerfun {
int val;
const char *name;
- void (*propfun)(); /* Function to parse properties. */
- struct ifd *(*ifdfun)(); /* Function to read IFD. */
+ void (*propfun)(struct exifprop *, struct exiftags *); /* Function to parse properties. */
+ struct ifd *(*ifdfun)(u_int32_t, struct tiffmeta *); /* Function to read IFD. */
};
extern struct makerfun makers[];
|
