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
|
From 9c4efd24fe851f4ae1f894cb91c7110ae11f53ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 9 Mar 2023 08:50:42 +0100
Subject: [PATCH] restore library symbol versioning to fix ABI break
---
MagickCore/libMagickCore.map | 2 +-
MagickCore/pixel.h | 8 ++++----
MagickWand/libMagickWand.map | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
index 852f433043..7437b0499a 100644
--- a/MagickCore/libMagickCore.map
+++ b/MagickCore/libMagickCore.map
@@ -1,4 +1,4 @@
- VERS_10.1 {
+ VERS_10.0 {
global:
*;
};
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 6574072a1a..fd5239b5cd 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -49,8 +49,8 @@ typedef enum
IndexChannel = 0x0020, /* Color Index Table? */
ReadMaskChannel = 0x0040, /* Pixel is Not Readable? */
WriteMaskChannel = 0x0080, /* Pixel is Write Protected? */
- CompositeMaskChannel = 0x0100, /* SVG mask */
- MetaChannel = 0x0200, /* not used */
+ MetaChannel = 0x0100, /* not used */
+ CompositeMaskChannel = 0x0200, /* SVG mask */
CompositeChannels = 0x001F,
AllChannels = 0x7ffffff,
/*
@@ -89,8 +89,8 @@ typedef enum
IndexPixelChannel = 5,
ReadMaskPixelChannel = 6,
WriteMaskPixelChannel = 7,
- CompositeMaskPixelChannel = 8,
- MetaPixelChannel = 9,
+ MetaPixelChannel = 8,
+ CompositeMaskPixelChannel = 9,
MetaPixelChannels = 10,
IntensityPixelChannel = MaxPixelChannels, /* ???? */
CompositePixelChannel = MaxPixelChannels, /* ???? */
diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
index 852f433043..7437b0499a 100644
--- a/MagickWand/libMagickWand.map
+++ b/MagickWand/libMagickWand.map
@@ -1,4 +1,4 @@
- VERS_10.1 {
+ VERS_10.0 {
global:
*;
};
|
