diff --git a/modules/imgproc/src/color_lab.cpp b/modules/imgproc/src/color_lab.cpp index fdf797808a..dbca43c8cd 100644 --- a/modules/imgproc/src/color_lab.cpp +++ b/modules/imgproc/src/color_lab.cpp @@ -962,7 +962,11 @@ static ushort LabCbrtTab_b[LAB_CBRT_TAB_SIZE_B]; static const bool enableBitExactness = true; static const bool enableRGB2LabInterpolation = true; + +#if CV_SIMD static const bool enablePackedLab = true; +#endif + enum { lab_lut_shift = 5, @@ -979,8 +983,12 @@ static const int minABvalue = -8145; static const int *abToXZ_b; // Luv constants static const bool enableRGB2LuvInterpolation = true; + +#if CV_SIMD static const bool enablePackedRGB2Luv = true; static const bool enablePackedLuv2RGB = true; +#endif + static const softfloat uLow(-134), uHigh(220), uRange(uHigh-uLow); static const softfloat vLow(-140), vHigh(122), vRange(vHigh-vLow); @@ -1381,7 +1389,7 @@ static inline void trilinearInterpolate(int cx, int cy, int cz, const int16_t* L c = CV_DESCALE(c, trilinear_shift*3); } -#if CV_SIMD_WIDTH == 16 +#if (CV_SIMD && CV_SIMD_WIDTH == 16) // 8 inValues are in [0; LAB_BASE] static inline void trilinearPackedInterpolate(const v_uint16x8& inX, const v_uint16x8& inY, const v_uint16x8& inZ, diff --git a/platforms/js/build_js.py b/platforms/js/build_js.py index 792191b292..0eb0a946c0 100644 --- a/platforms/js/build_js.py +++ b/platforms/js/build_js.py @@ -98,10 +98,12 @@ class Builder: "-DWITH_GTK=OFF", "-DWITH_GTK_2_X=OFF", "-DWITH_IPP=OFF", + "-DWITH_AVIF=OFF", "-DWITH_JASPER=OFF", "-DWITH_JPEG=OFF", "-DWITH_WEBP=OFF", "-DWITH_OPENEXR=OFF", + "-DWITH_OPENJPEG=OFF", "-DWITH_OPENGL=OFF", "-DWITH_OPENVX=OFF", "-DWITH_OPENNI=OFF",