Just print errnum

microsoft · Feb 11, 2025 · d25d299 · d25d299
1 parent 38c1239
commit d25d299
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ports/colmap/glew-get-error-string.diff → ports/colmap/no-glu.diff b/ports/colmap/glew-get-error-string.diff → ports/colmap/no-glu.diff
@@ -1,13 +1,13 @@
 diff --git a/src/thirdparty/SiftGPU/GlobalUtil.cpp b/src/thirdparty/SiftGPU/GlobalUtil.cpp
-index e98ef6b..10fb19b 100644
+index e98ef6b..39435db 100644
 --- a/src/thirdparty/SiftGPU/GlobalUtil.cpp
 +++ b/src/thirdparty/SiftGPU/GlobalUtil.cpp
 @@ -137,7 +137,7 @@ void GlobalUtil::CheckErrorsGL(const char* location)
  	const char *errstr;
  	while (errnum = glGetError())
  	{
 -		errstr = (const char *)(gluErrorString(errnum));
-+		errstr = (const char *)(glewGetErrorString(errnum));
++		errstr = nullptr; // just print errnum
  		if(errstr) {
  			std::cerr << errstr;
  		}
diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
     SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48
     HEAD_REF main
     PATCHES
-        glew-get-error-string.diff
+        no-glu.diff
 )
 
 if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))

diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9e924da50379a927afa2980cf7c77efe0fc822ba",
+      "git-tree": "7deee951326bf2685951c8d5ff7cbc3618ec5567",
       "version": "3.11.1",
       "port-version": 2
     },