Skip to content

Commit 65d4112

Browse files
authored
Merge pull request opencv#26512 from sturkmen72:fix_build_js_warnings
Fix for build_js warnings
2 parents 7095cb6 + 1358af1 commit 65d4112

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

modules/imgproc/src/color_lab.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,11 @@ static ushort LabCbrtTab_b[LAB_CBRT_TAB_SIZE_B];
962962

963963
static const bool enableBitExactness = true;
964964
static const bool enableRGB2LabInterpolation = true;
965+
966+
#if CV_SIMD
965967
static const bool enablePackedLab = true;
968+
#endif
969+
966970
enum
967971
{
968972
lab_lut_shift = 5,
@@ -979,8 +983,12 @@ static const int minABvalue = -8145;
979983
static const int *abToXZ_b;
980984
// Luv constants
981985
static const bool enableRGB2LuvInterpolation = true;
986+
987+
#if CV_SIMD
982988
static const bool enablePackedRGB2Luv = true;
983989
static const bool enablePackedLuv2RGB = true;
990+
#endif
991+
984992
static const softfloat uLow(-134), uHigh(220), uRange(uHigh-uLow);
985993
static const softfloat vLow(-140), vHigh(122), vRange(vHigh-vLow);
986994

@@ -1381,7 +1389,7 @@ static inline void trilinearInterpolate(int cx, int cy, int cz, const int16_t* L
13811389
c = CV_DESCALE(c, trilinear_shift*3);
13821390
}
13831391

1384-
#if CV_SIMD_WIDTH == 16
1392+
#if (CV_SIMD && CV_SIMD_WIDTH == 16)
13851393

13861394
// 8 inValues are in [0; LAB_BASE]
13871395
static inline void trilinearPackedInterpolate(const v_uint16x8& inX, const v_uint16x8& inY, const v_uint16x8& inZ,

platforms/js/build_js.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,12 @@ def get_cmake_cmd(self):
9898
"-DWITH_GTK=OFF",
9999
"-DWITH_GTK_2_X=OFF",
100100
"-DWITH_IPP=OFF",
101+
"-DWITH_AVIF=OFF",
101102
"-DWITH_JASPER=OFF",
102103
"-DWITH_JPEG=OFF",
103104
"-DWITH_WEBP=OFF",
104105
"-DWITH_OPENEXR=OFF",
106+
"-DWITH_OPENJPEG=OFF",
105107
"-DWITH_OPENGL=OFF",
106108
"-DWITH_OPENVX=OFF",
107109
"-DWITH_OPENNI=OFF",

0 commit comments

Comments
 (0)