Skip to content

Commit ed4c400

Browse files
authored
Fix libheif build on emscripten4 (emscripten-forge#4366)
Co-authored-by: Alexis Placet <2400067+Alex-PLACET@users.noreply.github.com>
1 parent 194139a commit ed4c400

2 files changed

Lines changed: 27 additions & 2 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/libheif/api/libheif/heif_emscripten.h b/libheif/api/libheif/heif_emscripten.h
2+
index 1234567..abcdefg 100644
3+
--- a/libheif/api/libheif/heif_emscripten.h
4+
+++ b/libheif/api/libheif/heif_emscripten.h
5+
@@ -335,15 +335,8 @@ emscripten::val heif_js_decode_image2(struct heif_image_handle* handle, heif_co
6+
if (err.code != heif_error_Ok) {
7+
return emscripten::val(err);
8+
}
9+
-
10+
-#if __EMSCRIPTEN_major__ > 4 || \
11+
- (__EMSCRIPTEN_major__ == 4 && \
12+
- (__EMSCRIPTEN_minor__ > 0 || __EMSCRIPTEN_tiny__ >= 9))
13+
- result.set("image", image, emscripten::allow_raw_pointers());
14+
-#else
15+
- result.set("image", image);
16+
-#endif
17+
-
18+
+
19+
+ result.set("image", emscripten::val(image, emscripten::allow_raw_pointers()));
20+
+
21+
int width = heif_image_handle_get_width(handle);
22+
result.set("width", width);
23+

recipes/recipes_emscripten/libheif/recipe.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
context:
22
name: libheif
3-
version: 1.20.2
3+
version: 1.21.2
44

55
package:
66
name: ${{ name }}
77
version: ${{ version }}
88

99
source:
1010
url: https://github.com/strukturag/libheif/releases/download/v${{ version }}/libheif-${{ version }}.tar.gz
11-
sha256: 68ac9084243004e0ef3633f184eeae85d615fe7e4444373a0a21cebccae9d12a
11+
sha256: 75f530b7154bc93e7ecf846edfc0416bf5f490612de8c45983c36385aa742b42
12+
patches:
13+
- fix-emscripten-val-set.patch # Fixes error: 'val_set' was not declared in this scope, to remove when https://github.com/strukturag/libheif/pull/1565 is merged
1214

1315
build:
1416
number: 0

0 commit comments

Comments
 (0)