diff --git a/.github/workflows/PR-5.x.yaml b/.github/workflows/PR-5.x.yaml index 505078a325..96511e765e 100644 --- a/.github/workflows/PR-5.x.yaml +++ b/.github/workflows/PR-5.x.yaml @@ -25,6 +25,9 @@ jobs: Windows10-x64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10.yaml@main + Windows10-ARM64: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10-ARM64.yaml@main + # Vulkan configuration disabled as Vulkan backend for DNN does not support int/int64 for now # Details: https://github.com/opencv/opencv/issues/25110 # Windows10-x64-Vulkan: diff --git a/modules/3d/src/rgbd/color_tsdf_functions.cpp b/modules/3d/src/rgbd/color_tsdf_functions.cpp index 747a813717..1c4cb2aff1 100644 --- a/modules/3d/src/rgbd/color_tsdf_functions.cpp +++ b/modules/3d/src/rgbd/color_tsdf_functions.cpp @@ -274,8 +274,8 @@ void integrateColorTsdfVolumeUnit(const VolumeSettings& settings, const Matx44f& if (v == 0) { continue; } - int _u = projected.x; - int _v = projected.y; + int _u = (int)projected.x; + int _v = (int)projected.y; if (!(_u >= 0 && _u < depth.cols && _v >= 0 && _v < depth.rows)) continue; @@ -309,7 +309,7 @@ void integrateColorTsdfVolumeUnit(const VolumeSettings& settings, const Matx44f& // update TSDF value = floatToTsdf((tsdfToFloat(value) * weight + tsdfToFloat(tsdf)) / (weight + 1)); - weight = min(int(weight + 1), int(maxWeight)); + weight = (WeightType)min(weight + 1, maxWeight); } } } diff --git a/modules/3d/src/rgbd/tsdf_functions.cpp b/modules/3d/src/rgbd/tsdf_functions.cpp index 3fdb481dda..dec2cf3a47 100644 --- a/modules/3d/src/rgbd/tsdf_functions.cpp +++ b/modules/3d/src/rgbd/tsdf_functions.cpp @@ -296,8 +296,8 @@ void integrateTsdfVolumeUnit(const VolumeSettings& settings, const Matx44f& volu if (v == 0) { continue; } - int _u = projected.x; - int _v = projected.y; + int _u = (int)projected.x; + int _v = (int)projected.y; if (!(_u >= 0 && _u < depth.cols && _v >= 0 && _v < depth.rows)) continue; @@ -317,7 +317,7 @@ void integrateTsdfVolumeUnit(const VolumeSettings& settings, const Matx44f& volu // update TSDF value = floatToTsdf((tsdfToFloat(value) * weight + tsdfToFloat(tsdf)) / (weight + 1)); - weight = min(int(weight + 1), int(maxWeight)); + weight = (WeightType)min(weight + 1, maxWeight); } } }