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
1dccf574
Commit
1dccf574
authored
Jun 25, 2013
by
Roman Donchenko
Committed by
OpenCV Buildbot
Jun 25, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1024 from jet47:fix-gpuarithm-compilation
parents
eff6dccb
4b983679
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
arithm.cpp
modules/gpuarithm/src/arithm.cpp
+4
-4
No files found.
modules/gpuarithm/src/arithm.cpp
View file @
1dccf574
...
...
@@ -173,7 +173,7 @@ void cv::gpu::gemm(InputArray _src1, InputArray _src2, double alpha, InputArray
(
void
)
_dst
;
(
void
)
flags
;
(
void
)
stream
;
CV_Error
(
:
Error
::
StsNotImplemented
,
"The library was build without CUBLAS"
);
CV_Error
(
Error
::
StsNotImplemented
,
"The library was build without CUBLAS"
);
#else
// CUBLAS works with column-major matrices
...
...
@@ -624,10 +624,10 @@ namespace
Ptr
<
Convolution
>
cv
::
gpu
::
createConvolution
(
Size
user_block_size
)
{
#ifndef HAVE_CU
BLAS
#ifndef HAVE_CU
FFT
(
void
)
user_block_size
;
CV_Error
(
cv
::
Error
::
StsNotImplemented
,
"The library was build without CUFFT"
);
return
Ptr
<
BLAS
>
();
CV_Error
(
Error
::
StsNotImplemented
,
"The library was build without CUFFT"
);
return
Ptr
<
Convolution
>
();
#else
return
new
ConvolutionImpl
(
user_block_size
);
#endif
...
...
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