diff --git a/modules/core/include/opencv2/core/hal/intrin_wasm.hpp b/modules/core/include/opencv2/core/hal/intrin_wasm.hpp index f5e5f05beb..e5c89c94b6 100644 --- a/modules/core/include/opencv2/core/hal/intrin_wasm.hpp +++ b/modules/core/include/opencv2/core/hal/intrin_wasm.hpp @@ -8,9 +8,18 @@ #include #include #include -#include #include "opencv2/core/saturate.hpp" + +// Emscripten v2.0.13 (latest officially supported, as of 07/30/2024): +// __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__ and __EMSCRIPTEN_tiny__ are defined via commandline in +// https://github.com/emscripten-core/emscripten/blob/1690a5802cd1241adc9714fb7fa2f633d38860dc/tools/shared.py#L506-L515 +// +// See https://github.com/opencv/opencv/pull/25909 +#ifndef __EMSCRIPTEN_major__ +#include +#endif + #define CV_SIMD128 1 #define CV_SIMD128_64F 0 // Now all implementation of f64 use fallback, so disable it. #define CV_SIMD128_FP16 0 diff --git a/modules/js/perf/package.json b/modules/js/perf/package.json index 04607ddffe..06094794cf 100644 --- a/modules/js/perf/package.json +++ b/modules/js/perf/package.json @@ -2,18 +2,18 @@ "name": "opencv_js_perf", "description": "Perfermance tests for opencv js bindings", "version": "1.0.0", - "dependencies" : { - "benchmark" : "latest" + "dependencies": { + "benchmark": "latest" }, "repository": { - "type": "git", - "url": "https://github.com/opencv/opencv.git" + "type": "git", + "url": "https://github.com/opencv/opencv.git" }, "keywords": [], "author": "", "license": "Apache 2.0 License", "bugs": { - "url": "https://github.com/opencv/opencv/issues" + "url": "https://github.com/opencv/opencv/issues" }, "homepage": "https://github.com/opencv/opencv" - } \ No newline at end of file +}