Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
2a163885
Commit
2a163885
authored
6 years ago
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove noexcept (doesn't actually work and breaks VS 2013)
parent
11ec46e1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
5 deletions
+15
-5
CMakeLists.txt
CMakeLists.txt
+3
-0
FindOpenCV.cmake
cmake/FindOpenCV.cmake
+4
-1
device.cpp
discovery/src/device.cpp
+4
-0
audio.hpp
lib/include/libvideostitch/audio.hpp
+2
-2
audio.cpp
lib/src/audio/audio.cpp
+2
-2
No files found.
CMakeLists.txt
View file @
2a163885
...
...
@@ -125,6 +125,7 @@ if(WIN32)
libpng/1.6.37@bincrafters/stable
glew/2.1.0@bincrafters/stable
glfw/3.3@bincrafters/stable
opencv/3.4.5@conan/stable
# ceres-solver/1.12.0@jmdaly/testing
BUILD missing
)
...
...
@@ -133,9 +134,11 @@ if(WIN32)
message
(
STATUS
"CONAN_LIBS_LIBPNG:
${
CONAN_LIBS_LIBPNG
}
"
)
message
(
STATUS
"CONAN_LIBS_GLEW:
${
CONAN_LIBS_GLEW
}
"
)
message
(
STATUS
"CONAN_LIBS_GLFW:
${
CONAN_LIBS_GLFW
}
"
)
message
(
STATUS
"CONAN_LIBS_OPENCV:
${
CONAN_LIBS_OPENCV
}
"
)
message
(
STATUS
"CONAN_INCLUDE_DIRS:
${
CONAN_INCLUDE_DIRS
}
"
)
message
(
STATUS
"CONAN_INCLUDE_DIRS_EIGEN:
${
CONAN_INCLUDE_DIRS_EIGEN
}
"
)
message
(
STATUS
"CONAN_INCLUDE_DIRS_OPENCV:
${
CONAN_INCLUDE_DIRS_OPENCV
}
"
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
cmake/FindOpenCV.cmake
View file @
2a163885
if
(
WINDOWS
)
if
(
WIN_CHOCO
)
find_package
(
OpenCV REQUIRED core calib3d features2d imgproc flann video PATHS C:/tools/opencv/build NO_DEFAULT_PATH
)
#find_package(OpenCV REQUIRED core calib3d features2d imgproc flann video PATHS C:/tools/opencv/build NO_DEFAULT_PATH)
#find_package(OpenCV REQUIRED core calib3d features2d imgproc flann video PATHS ${CMAKE_BUILD_PATH})
set
(
OpenCV_LIBRARIES
${
CONAN_LIBS_OPENCV
}
)
set
(
OpenCV_INCLUDE_DIRS
${
CONAN_INCLUDE_DIRS_OPENCV
}
)
else
()
find_debug_and_optimized_library
(
OpenCV_CORE_LIBS
"opencv2/Debug"
"opencv_core310d"
"opencv2/Release"
"opencv_core310"
)
find_debug_and_optimized_library
(
OpenCV_CALIB_LIBS
"opencv2/Debug"
"opencv_calib3d310d"
"opencv2/Release"
"opencv_calib3d310"
)
...
...
This diff is collapsed.
Click to expand it.
discovery/src/device.cpp
View file @
2a163885
...
...
@@ -233,8 +233,10 @@ FrameworkStatus DevicesInfo::getFrameworkStatus(Framework framework) const {
DevicesInfo
::
DevicesInfo
()
{
#ifdef _MSC_VER
#if _MSC_VER < 1910
PfnDliHook
currentFailHook
=
__pfnDliFailureHook2
;
__pfnDliFailureHook2
=
failDelayHook
;
#endif
try
{
collectOpenCLDeviceInfo
();
}
catch
(
std
::
exception
&
e
)
{
...
...
@@ -244,7 +246,9 @@ DevicesInfo::DevicesInfo() {
openCLStatus
=
FrameworkStatus
::
MissingDriver
;
std
::
cerr
<<
"Failed to detect OpenCL devices!"
<<
std
::
endl
;
}
#if _MSC_VER < 1910
__pfnDliFailureHook2
=
currentFailHook
;
#endif
#else
collectOpenCLDeviceInfo
();
#endif
...
...
This diff is collapsed.
Click to expand it.
lib/include/libvideostitch/audio.hpp
View file @
2a163885
...
...
@@ -327,7 +327,7 @@ class VS_EXPORT Samples {
* @brief Copy constructor with move semantics
* @param s The object to copy
*/
Samples
(
Samples
&&
s
)
noexcept
;
Samples
(
Samples
&&
s
);
/**
* @brief Copying audio samples is undefined
...
...
@@ -343,7 +343,7 @@ class VS_EXPORT Samples {
* @brief Assign operator with move semantics
* @param s The object to assign
*/
Samples
&
operator
=
(
Samples
&&
s
);
Samples
&
operator
=
(
Samples
&&
s
)
;
/**
* @brief Assign operator with move semantics
...
...
This diff is collapsed.
Click to expand it.
lib/src/audio/audio.cpp
View file @
2a163885
...
...
@@ -16,7 +16,7 @@ using namespace VideoStitch::Plugin;
namespace
VideoStitch
{
namespace
Audio
{
Samples
::
Samples
()
Samples
::
Samples
()
:
samples
{},
nbSamples
(
0
),
timestamp
(
-
1
),
...
...
@@ -53,7 +53,7 @@ Samples::Samples(const SamplingRate r, const SamplingDepth d, const ChannelLayou
Samples
::~
Samples
()
{
delete_
(
samples
);
}
Samples
::
Samples
(
Samples
&&
o
)
noexcept
:
depth
(
o
.
depth
),
rate
(
o
.
rate
),
layout
(
o
.
layout
)
{
Samples
::
Samples
(
Samples
&&
o
)
:
depth
(
o
.
depth
),
rate
(
o
.
rate
),
layout
(
o
.
layout
)
{
// steal that music
nbSamples
=
o
.
nbSamples
;
timestamp
=
o
.
timestamp
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment