diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-02-11 08:16:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-02-11 08:16:12 +0000 |
| commit | 0d2a2751d4fd801c7ddcafb42133b6ad4a102e49 (patch) | |
| tree | b9be6ebed2515b5b1e78b62a65ed70c831716b63 /graphics/colmap | |
| parent | 6cf98c73816fe159e484f5deafe1a007f33ff346 (diff) | |
| download | ports-0d2a2751d4fd801c7ddcafb42133b6ad4a102e49.tar.gz ports-0d2a2751d4fd801c7ddcafb42133b6ad4a102e49.zip | |
graphics/colmap: unbreak OPENMP=off after r446135
src/ext/PBA/SparseBundleCPU.cpp:1208:7: error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'int' in initializer list [-Wc++11-narrowing]
RUN_THREAD(ComputeProjection, threads[i], last - first, camera, point,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:933:3: note: expanded from macro 'RUN_THREAD'
DECLEAR_THREAD_DATA(X, __VA_ARGS__); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:908:30: note: expanded from macro 'DECLEAR_THREAD_DATA'
X##_STRUCT<Float> tdata = {i, __VA_ARGS__}; \
^
src/ext/PBA/SparseBundleCPU.cpp:1537:68: error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'int' in initializer list [-Wc++11-narrowing]
intrinsic_fixed, radial_distortion, shuffle, jct, first);
^~~~~
src/ext/PBA/SparseBundleCPU.cpp:933:26: note: expanded from macro 'RUN_THREAD'
DECLEAR_THREAD_DATA(X, __VA_ARGS__); \
^~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:908:33: note: expanded from macro 'DECLEAR_THREAD_DATA'
X##_STRUCT<Float> tdata = {i, __VA_ARGS__}; \
^~~~~~~~~~~
src/ext/PBA/SparseBundleCPU.cpp:1537:68: note: insert an explicit cast to silence this issue
intrinsic_fixed, radial_distortion, shuffle, jct, first);
^~~~~
static_cast<int>(
Notes
Notes:
svn path=/head/; revision=461466
Diffstat (limited to 'graphics/colmap')
| -rw-r--r-- | graphics/colmap/files/patch-no-sse | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/graphics/colmap/files/patch-no-sse b/graphics/colmap/files/patch-no-sse index f2f935c596cf..6255f0ee4fca 100644 --- a/graphics/colmap/files/patch-no-sse +++ b/graphics/colmap/files/patch-no-sse @@ -2,14 +2,13 @@ build: don't force SSE on i386 --- src/ext/PBA/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC +++ src/ext/PBA/CMakeLists.txt -@@ -1,7 +1,3 @@ --if(NOT IS_MSVC) +@@ -1,5 +1,5 @@ + if(NOT IS_MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -pthread -march=core2 -mfpmath=sse -Wno-c++11-narrowing") --endif() -- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing") + endif() + if(CUDA_ENABLED) - # Fix for Ubuntu 16.04. - add_definitions("-D_FORCE_INLINES") --- src/ext/PBA/SparseBundleCPU.cpp.orig 2017-06-15 14:32:01 UTC +++ src/ext/PBA/SparseBundleCPU.cpp @@ -52,15 +52,16 @@ using std::max; |