mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25428 from asmorkalov:as/win32_arm_ci_5.x

Browse Source 
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
This commit is contained in:
Alexander Smorkalov 2024-04-22 15:56:08 +03:00 committed by GitHub
parent ac37f337d0
commit b5ffdd4673
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/PR-5.x.yaml vendored
View File

@ -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:

6
modules/3d/src/rgbd/color_tsdf_functions.cpp
View File

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

6
modules/3d/src/rgbd/tsdf_functions.cpp
View File

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