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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
|
From f7d12c91fa8bb0313dfc9d5ca827674c49a7bc9d Mon Sep 17 00:00:00 2001
From: Martin Reboredo <39890836+YakoYakoYokuYoku@users.noreply.github.com>
Date: Tue, 16 Mar 2021 12:53:16 -0300
Subject: [PATCH] Permit compilation with libheif version 1.7.0 (#686)
libheif versions that came before 1.9.0 don't support changing the output image chroma.
I did not notice that and it resulted with tests failures across other OSes that don't have
a much newer libheif.
See #678. Supersedes #685.
---
src/gd_heif.c | 14 ++++++++------
tests/heif/heif_im2im.c | 3 +++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/gd_heif.c b/src/gd_heif.c
index 3b00a6c5..47ecd7ad 100644
--- a/src/gd_heif.c
+++ b/src/gd_heif.c
@@ -321,12 +321,14 @@ static int _gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, gdHeifC
return GD_FALSE;
}
- err = heif_encoder_set_parameter_string(heif_enc, "chroma", chroma);
- if (err.code != heif_error_Ok) {
- gd_error("gd-heif invalid chroma subsampling parameter\n");
- heif_encoder_release(heif_enc);
- heif_context_free(heif_ctx);
- return GD_FALSE;
+ if (heif_get_version_number_major() >= 1 && heif_get_version_number_minor() >= 9) {
+ err = heif_encoder_set_parameter_string(heif_enc, "chroma", chroma);
+ if (err.code != heif_error_Ok) {
+ gd_error("gd-heif invalid chroma subsampling parameter\n");
+ heif_encoder_release(heif_enc);
+ heif_context_free(heif_ctx);
+ return GD_FALSE;
+ }
}
err = heif_image_create(gdImageSX(im), gdImageSY(im), heif_colorspace_RGB, heif_chroma_interleaved_RGBA, &heif_im);
diff --git a/tests/heif/heif_im2im.c b/tests/heif/heif_im2im.c
index 202d6b3e..01abf021 100644
--- a/tests/heif/heif_im2im.c
+++ b/tests/heif/heif_im2im.c
@@ -17,6 +17,9 @@ int main()
int size = 0;
CuTestImageResult result = {0, 0};
+ if (!gdTestAssertMsg(heif_get_version_number_major() == 1 && heif_get_version_number_minor() >= 9, "changing chroma subsampling is not supported in this libheif version\n"))
+ return 77;
+
if (!gdTestAssertMsg(heif_have_decoder_for_format(heif_compression_HEVC) && heif_have_encoder_for_format(heif_compression_HEVC), "HEVC codec support missing from libheif\n"))
return 77;
From f6a111c632fcf76dd3a42d750f18d2ed7bf8a5f1 Mon Sep 17 00:00:00 2001
From: Ben Morss <morss@google.com>
Date: Tue, 16 Mar 2021 12:26:17 -0400
Subject: [PATCH] Fix for libavif v0.8.2 (#680)
Don't return AVIF_RESULT_TRUNCATED_DATA, as this is normal for libavif <= 0.8.2. In our tests,
this makes tests pass with libavif 0.8.2.
Plus, we did a few things to stop compiler warnings - and added a newline to error output.
thanks @wantehchang for the collaboration here!
This fixes #677.
---
src/gd_avif.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/gd_avif.c b/src/gd_avif.c
index cf94c70a..20906618 100644
--- a/src/gd_avif.c
+++ b/src/gd_avif.c
@@ -151,7 +151,7 @@ static avifBool isAvifSrgbImage(avifImage *avifIm) {
*/
static avifBool isAvifError(avifResult result, const char *msg) {
if (result != AVIF_RESULT_OK) {
- gd_error("avif error - %s: %s", msg, avifResultToString(result));
+ gd_error("avif error - %s: %s\n", msg, avifResultToString(result));
return AVIF_TRUE;
}
@@ -177,13 +177,18 @@ static avifResult readFromCtx(avifIO *io, uint32_t readFlags, uint64_t offset, s
void *dataBuf = NULL;
gdIOCtx *ctx = (gdIOCtx *) io->data;
+ // readFlags is unsupported
+ if (readFlags != 0) {
+ return AVIF_RESULT_IO_ERROR;
+ }
+
// TODO: if we set sizeHint, this will be more efficient.
- if (offset > LONG_MAX || size < 0)
+ if (offset > INT_MAX || size > INT_MAX)
return AVIF_RESULT_IO_ERROR;
// Try to seek offset bytes forward. If we pass the end of the buffer, throw an error.
- if (!ctx->seek(ctx, offset))
+ if (!ctx->seek(ctx, (int) offset))
return AVIF_RESULT_IO_ERROR;
dataBuf = gdMalloc(size);
@@ -194,7 +199,7 @@ static avifResult readFromCtx(avifIO *io, uint32_t readFlags, uint64_t offset, s
// Read the number of bytes requested.
// If getBuf() returns a negative value, that means there was an error.
- int charsRead = ctx->getBuf(ctx, dataBuf, size);
+ int charsRead = ctx->getBuf(ctx, dataBuf, (int) size);
if (charsRead < 0) {
gdFree(dataBuf);
return AVIF_RESULT_IO_ERROR;
@@ -202,7 +207,7 @@ static avifResult readFromCtx(avifIO *io, uint32_t readFlags, uint64_t offset, s
out->data = dataBuf;
out->size = charsRead;
- return charsRead == size ? AVIF_RESULT_OK : AVIF_RESULT_TRUNCATED_DATA;
+ return AVIF_RESULT_OK;
}
// avif.h says this is optional, but it seemed easy to implement.
@@ -339,7 +344,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromAvifPtr(int size, void *data)
*/
BGD_DECLARE(gdImagePtr) gdImageCreateFromAvifCtx (gdIOCtx *ctx)
{
- int x, y;
+ uint32_t x, y;
gdImage *im = NULL;
avifResult result;
avifIO *io;
@@ -482,7 +487,7 @@ static avifBool _gdImageAvifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, in
uint32_t val;
uint8_t *p;
- int x, y;
+ uint32_t x, y;
if (im == NULL)
return 1;
From d967ef78ffbb9f21090dcf058617b2b0677d9830 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Mar 2021 14:42:22 +0100
Subject: [PATCH] fix test when libraqm is used
---
tests/gdimagestringft/gdimagestringft_bbox.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tests/gdimagestringft/gdimagestringft_bbox.c b/tests/gdimagestringft/gdimagestringft_bbox.c
index 5d57bc7b..a4b83eb8 100644
--- a/tests/gdimagestringft/gdimagestringft_bbox.c
+++ b/tests/gdimagestringft/gdimagestringft_bbox.c
@@ -1,4 +1,5 @@
#include "gd.h"
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -11,19 +12,35 @@ static int EXPECT[16][8] = {
{500, 400, 628, 400, 628, 376, 500, 376},
{492, 362, 611, 312, 601, 290, 483, 339},
{470, 330, 561, 239, 544, 221, 453, 312},
+#ifdef HAVE_LIBRAQM
+ {437, 308, 486, 190, 464, 180, 414, 299},
+#else
{437, 308, 486, 189, 464, 180, 414, 299},
+#endif
{400, 301, 400, 173, 376, 173, 376, 301},
{363, 309, 313, 190, 291, 200, 340, 318},
{332, 331, 241, 240, 223, 257, 314, 348},
+#ifdef HAVE_LIBRAQM
+ {311, 363, 193, 314, 183, 336, 302, 386},
+#else
{311, 363, 192, 314, 183, 336, 302, 386},
+#endif
{304, 399, 176, 399, 176, 423, 304, 423},
{312, 435, 193, 485, 203, 507, 321, 458},
{333, 465, 242, 556, 259, 574, 350, 483},
+#ifdef HAVE_LIBRAQM
+ {364, 486, 315, 604, 337, 614, 387, 495},
+#else
{364, 486, 315, 605, 337, 614, 387, 495},
+#endif
{399, 492, 399, 620, 423, 620, 423, 492},
{434, 484, 484, 603, 506, 593, 457, 475},
{463, 464, 554, 555, 572, 538, 481, 447},
+#ifdef HAVE_LIBRAQM
+ {483, 434, 601, 483, 611, 461, 492, 411},
+#else
{483, 434, 602, 483, 611, 461, 492, 411},
+#endif
};
int main()
|
