mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[colmap] fix missing cassert issue (#48931)
Co-authored-by: Kai Pastor <dg0yt@darc.de>
This commit is contained in:
13
ports/colmap/add-missing-cassert.patch
Normal file
13
ports/colmap/add-missing-cassert.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/colmap/sfm/observation_manager.cc b/src/colmap/sfm/observation_manager.cc
|
||||
index 22d076da..53412449 100644
|
||||
--- a/src/colmap/sfm/observation_manager.cc
|
||||
+++ b/src/colmap/sfm/observation_manager.cc
|
||||
@@ -36,6 +36,8 @@
|
||||
#include "colmap/util/logging.h"
|
||||
#include "colmap/util/misc.h"
|
||||
|
||||
+#include <cassert>
|
||||
+
|
||||
namespace colmap {
|
||||
|
||||
bool MergeAndFilterReconstructions(const double max_reproj_error,
|
||||
@@ -9,6 +9,7 @@ vcpkg_from_github(
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
no-glu.diff
|
||||
add-missing-cassert.patch
|
||||
)
|
||||
|
||||
if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "colmap",
|
||||
"version": "3.12.6",
|
||||
"port-version": 1,
|
||||
"description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
|
||||
"homepage": "https://colmap.github.io/",
|
||||
"license": "BSD-3-Clause",
|
||||
|
||||
@@ -1906,7 +1906,7 @@
|
||||
},
|
||||
"colmap": {
|
||||
"baseline": "3.12.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"color-console": {
|
||||
"baseline": "2022-03-20",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "868e9b94358a0830aad7c62adbc5beae1e52b6b7",
|
||||
"version": "3.12.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "360970f724ed81ffbfa522c23b6a5ff6366b718a",
|
||||
"version": "3.12.6",
|
||||
|
||||
Reference in New Issue
Block a user