Skip to content

Commit dea0d97

Browse files
bradhbradh
authored
HEIF: add tile reading (OSGeo#10982)
libheif recently added tiling support (https://github.com/strukturag/libheif/wiki/Read-and-Writing-Tiled-Images) as part of the OGC TB-20 activities. This provides detection of the new API (not yet released) and use of it where available.
1 parent 39b11b9 commit dea0d97

File tree

6 files changed

+380
-1
lines changed

6 files changed

+380
-1
lines changed

‎.github/workflows/ubuntu_24.04/Dockerfile.ci

+10-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUN apt-get update && \
3232
libgif-dev \
3333
libhdf4-alt-dev \
3434
libhdf5-serial-dev \
35-
libheif-dev \
3635
libjpeg-dev \
3736
libjxl-dev \
3837
libkml-dev \
@@ -74,6 +73,16 @@ RUN apt-get update && \
7473
wget \
7574
zip
7675

76+
# temporary libheif build
77+
RUN apt-get install -y --allow-unauthenticated libaom-dev libbrotli-dev libde265-dev libx265-dev
78+
RUN git clone --depth 1 https://github.com/strukturag/libheif.git libheif-git && \
79+
cd libheif-git && \
80+
mkdir build && \
81+
cd build && \
82+
cmake --preset=develop .. && \
83+
make -j$(nproc) && \
84+
make install
85+
7786
# MSSQL: client side
7887
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
7988
RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/msprod.list

‎autotest/gdrivers/data/heif/uncompressed_comp_RGB_tiled.heif

2.15 KB
Binary file not shown.

‎autotest/gdrivers/heif.py

+243
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,249 @@ def test_heif_rgba_16bit():
117117
assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
118118

119119

120+
def _has_tiling_support():
121+
drv = gdal.GetDriverByName("HEIF")
122+
return drv and drv.GetMetadataItem("HEIF_SUPPORTS_TILES")
123+
124+
125+
def test_heif_tiled():
126+
if not _has_tiling_support():
127+
pytest.skip()
128+
129+
ds = gdal.Open("data/heif/uncompressed_comp_RGB_tiled.heif")
130+
assert ds
131+
assert ds.RasterXSize == 30
132+
assert ds.RasterYSize == 20
133+
assert ds.RasterCount == 3
134+
assert ds.GetRasterBand(1).DataType == gdal.GDT_Byte
135+
assert ds.GetRasterBand(1).GetBlockSize() == [15, 5]
136+
assert ds.GetRasterBand(2).GetBlockSize() == [15, 5]
137+
assert ds.GetRasterBand(3).GetBlockSize() == [15, 5]
138+
pytest.importorskip("osgeo.gdal_array")
139+
assert (
140+
ds.GetRasterBand(1).ReadAsArray(0, 0, 30, 1)
141+
== [
142+
[
143+
255,
144+
255,
145+
255,
146+
255,
147+
0,
148+
0,
149+
0,
150+
0,
151+
0,
152+
0,
153+
0,
154+
0,
155+
255,
156+
255,
157+
255,
158+
255,
159+
0,
160+
0,
161+
0,
162+
0,
163+
255,
164+
255,
165+
255,
166+
255,
167+
0,
168+
0,
169+
0,
170+
0,
171+
128,
172+
128,
173+
]
174+
]
175+
).all()
176+
assert (
177+
ds.GetRasterBand(1).ReadAsArray(0, 19, 30, 1)
178+
== [
179+
[
180+
0,
181+
0,
182+
0,
183+
0,
184+
255,
185+
255,
186+
255,
187+
255,
188+
0,
189+
0,
190+
0,
191+
0,
192+
128,
193+
128,
194+
128,
195+
128,
196+
255,
197+
255,
198+
255,
199+
255,
200+
238,
201+
238,
202+
238,
203+
238,
204+
255,
205+
255,
206+
255,
207+
255,
208+
0,
209+
0,
210+
]
211+
]
212+
).all()
213+
assert (
214+
ds.GetRasterBand(2).ReadAsArray(0, 0, 30, 1)
215+
== [
216+
[
217+
0,
218+
0,
219+
0,
220+
0,
221+
128,
222+
128,
223+
128,
224+
128,
225+
0,
226+
0,
227+
0,
228+
0,
229+
255,
230+
255,
231+
255,
232+
255,
233+
0,
234+
0,
235+
0,
236+
0,
237+
255,
238+
255,
239+
255,
240+
255,
241+
255,
242+
255,
243+
255,
244+
255,
245+
128,
246+
128,
247+
]
248+
]
249+
).all()
250+
assert (
251+
ds.GetRasterBand(2).ReadAsArray(0, 19, 30, 1)
252+
== [
253+
[
254+
0,
255+
0,
256+
0,
257+
0,
258+
255,
259+
255,
260+
255,
261+
255,
262+
255,
263+
255,
264+
255,
265+
255,
266+
128,
267+
128,
268+
128,
269+
128,
270+
165,
271+
165,
272+
165,
273+
165,
274+
130,
275+
130,
276+
130,
277+
130,
278+
0,
279+
0,
280+
0,
281+
0,
282+
128,
283+
128,
284+
]
285+
]
286+
).all()
287+
assert (
288+
ds.GetRasterBand(3).ReadAsArray(0, 0, 30, 1)
289+
== [
290+
[
291+
0,
292+
0,
293+
0,
294+
0,
295+
0,
296+
0,
297+
0,
298+
0,
299+
255,
300+
255,
301+
255,
302+
255,
303+
255,
304+
255,
305+
255,
306+
255,
307+
0,
308+
0,
309+
0,
310+
0,
311+
0,
312+
0,
313+
0,
314+
0,
315+
255,
316+
255,
317+
255,
318+
255,
319+
128,
320+
128,
321+
]
322+
]
323+
).all()
324+
assert (
325+
ds.GetRasterBand(3).ReadAsArray(0, 19, 30, 1)
326+
== [
327+
[
328+
0,
329+
0,
330+
0,
331+
0,
332+
0,
333+
0,
334+
0,
335+
0,
336+
255,
337+
255,
338+
255,
339+
255,
340+
128,
341+
128,
342+
128,
343+
128,
344+
0,
345+
0,
346+
0,
347+
0,
348+
238,
349+
238,
350+
238,
351+
238,
352+
0,
353+
0,
354+
0,
355+
0,
356+
0,
357+
0,
358+
]
359+
]
360+
).all()
361+
362+
120363
def test_heif_subdatasets(tmp_path):
121364

122365
filename = str(tmp_path / "out.heic")

‎cmake/helpers/CheckDependentLibraries.cmake

+16
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,22 @@ gdal_check_package(MONGOCXX "Enable MongoDBV3 driver" CAN_DISABLE)
449449
define_find_package2(HEIF libheif/heif.h heif PKGCONFIG_NAME libheif)
450450
gdal_check_package(HEIF "HEIF >= 1.1" CAN_DISABLE)
451451

452+
include(CheckCXXSourceCompiles)
453+
check_cxx_source_compiles(
454+
"
455+
#include <libheif/heif.h>
456+
int main()
457+
{
458+
struct heif_image_tiling tiling;
459+
return 0;
460+
}
461+
"
462+
LIBHEIF_SUPPORTS_TILES
463+
)
464+
if (LIBHEIF_SUPPORTS_TILES)
465+
set_property(TARGET HEIF::HEIF APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "LIBHEIF_SUPPORTS_TILES")
466+
endif ()
467+
452468
include(CheckDependentLibrariesAVIF)
453469

454470
include(CheckDependentLibrariesOpenJPEG)

0 commit comments

Comments
 (0)