Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
00cbb894
Commit
00cbb894
authored
6 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
parent
a0f86479
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
CMakeLists.txt
modules/core/CMakeLists.txt
+0
-4
test_features2d.cpp
modules/cudafeatures2d/test/test_features2d.cpp
+1
-1
No files found.
modules/core/CMakeLists.txt
View file @
00cbb894
...
...
@@ -77,10 +77,6 @@ ocv_target_link_libraries(${the_module} LINK_PRIVATE
"
${
OPENCV_HAL_LINKER_LIBS
}
"
)
if
(
HAVE_CUDA
)
ocv_target_compile_definitions
(
${
the_module
}
PUBLIC OPENCV_TRAITS_ENABLE_DEPRECATED
)
endif
()
ocv_add_accuracy_tests
()
ocv_add_perf_tests
()
...
...
This diff is collapsed.
Click to expand it.
modules/cudafeatures2d/test/test_features2d.cpp
View file @
00cbb894
...
...
@@ -222,7 +222,7 @@ CUDA_TEST_P(ORB, Accuracy)
{
std
::
vector
<
cv
::
KeyPoint
>
keypoints
;
cv
::
cuda
::
GpuMat
descriptors
;
orb
->
detectAndComputeAsync
(
loadMat
(
image
),
loadMat
(
mask
),
keypoints
,
descriptors
);
orb
->
detectAndComputeAsync
(
loadMat
(
image
),
loadMat
(
mask
),
rawOut
(
keypoints
)
,
descriptors
);
}
catch
(
const
cv
::
Exception
&
e
)
{
...
...
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