From b5ffdd467329856bffc2607e20b15373cdf399c4 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:56:08 +0300
Subject: [PATCH] Merge pull request #25428 from asmorkalov:as/win32_arm_ci_5.x

CI pipeline with Windows 10 ARM64 for 5.x #25428

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
---
 .github/workflows/PR-5.x.yaml                | 3 +++
 modules/3d/src/rgbd/color_tsdf_functions.cpp | 6 +++---
 modules/3d/src/rgbd/tsdf_functions.cpp       | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

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);
                     }
                 }
             }