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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
Upstream issue: "GIMP fails to build with libheif >= 1.13.0"
https://gitlab.gnome.org/GNOME/gimp/-/issues/8570
From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
Date: Sat, 3 Sep 2022 13:19:33 +0200
Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+
---
plug-ins/common/file-heif.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
index 76bc41f44d..36899bcf5f 100644
--- a/plug-ins/common/file-heif.c
+++ b/plug-ins/common/file-heif.c
@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
} HeifpluginExportFormat;
-typedef struct _Heif Heif;
-typedef struct _HeifClass HeifClass;
+typedef struct _GimpHeif GimpHeif;
+typedef struct _GimpHeifClass GimpHeifClass;
-struct _Heif
+struct _GimpHeif
{
GimpPlugIn parent_instance;
};
-struct _HeifClass
+struct _GimpHeifClass
{
GimpPlugInClass parent_class;
};
-#define HEIF_TYPE (heif_get_type ())
-#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
+#define GIMP_HEIF_TYPE (gimp_heif_get_type ())
+#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
-GType heif_get_type (void) G_GNUC_CONST;
+GType gimp_heif_get_type (void) G_GNUC_CONST;
static GList * heif_init_procedures (GimpPlugIn *plug_in);
static GimpProcedure * heif_create_procedure (GimpPlugIn *plug_in,
@@ -123,14 +123,14 @@ static gboolean save_dialog (GimpProcedure *procedure,
GimpImage *image);
-G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
+G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
-GIMP_MAIN (HEIF_TYPE)
+GIMP_MAIN (GIMP_HEIF_TYPE)
DEFINE_STD_SET_I18N
static void
-heif_class_init (HeifClass *klass)
+gimp_heif_class_init (GimpHeifClass *klass)
{
GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
}
static void
-heif_init (Heif *heif)
+gimp_heif_init (GimpHeif *heif)
{
}
--
GitLab
|
