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
55cb2655
Commit
55cb2655
authored
Aug 02, 2013
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use NPP version for Fermi
parent
a28cb99e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
hist.cu
modules/gpu/src/cuda/hist.cu
+1
-1
imgproc.cpp
modules/gpu/src/imgproc.cpp
+8
-2
No files found.
modules/gpu/src/cuda/hist.cu
View file @
55cb2655
...
...
@@ -120,7 +120,7 @@ namespace hist
}
}
__global__ void histEven8u(const uchar* src, const size_t step, const int rows, const int cols,
__global__ void histEven8u(const uchar* src, const size_t step, const int rows, const int cols,
int* hist, const int binCount, const int binSize, const int lowerLevel, const int upperLevel)
{
extern __shared__ int shist[];
...
...
modules/gpu/src/imgproc.cpp
View file @
55cb2655
...
...
@@ -896,7 +896,7 @@ namespace hist
namespace
{
void
histEven8u
(
const
GpuMat
&
src
,
GpuMat
&
hist
,
GpuMat
&
,
int
histSize
,
int
lowerLevel
,
int
upperLevel
,
cudaStream_t
stream
)
void
histEven8u
(
const
GpuMat
&
src
,
GpuMat
&
hist
,
int
histSize
,
int
lowerLevel
,
int
upperLevel
,
cudaStream_t
stream
)
{
hist
.
create
(
1
,
histSize
,
CV_32S
);
cudaSafeCall
(
cudaMemsetAsync
(
hist
.
data
,
0
,
histSize
*
sizeof
(
int
),
stream
)
);
...
...
@@ -911,12 +911,18 @@ void cv::gpu::histEven(const GpuMat& src, GpuMat& hist, GpuMat& buf, int histSiz
typedef
void
(
*
hist_t
)(
const
GpuMat
&
src
,
GpuMat
&
hist
,
GpuMat
&
buf
,
int
levels
,
int
lowerLevel
,
int
upperLevel
,
cudaStream_t
stream
);
static
const
hist_t
hist_callers
[]
=
{
histEven8u
,
NppHistogramEvenC1
<
CV_8U
,
nppiHistogramEven_8u_C1R
,
nppiHistogramEvenGetBufferSize_8u_C1R
>::
hist
,
0
,
NppHistogramEvenC1
<
CV_16U
,
nppiHistogramEven_16u_C1R
,
nppiHistogramEvenGetBufferSize_16u_C1R
>::
hist
,
NppHistogramEvenC1
<
CV_16S
,
nppiHistogramEven_16s_C1R
,
nppiHistogramEvenGetBufferSize_16s_C1R
>::
hist
};
if
(
src
.
depth
()
==
CV_8U
&&
deviceSupports
(
FEATURE_SET_COMPUTE_30
))
{
histEven8u
(
src
,
hist
,
histSize
,
lowerLevel
,
upperLevel
,
StreamAccessor
::
getStream
(
stream
));
return
;
}
hist_callers
[
src
.
depth
()](
src
,
hist
,
buf
,
histSize
,
lowerLevel
,
upperLevel
,
StreamAccessor
::
getStream
(
stream
));
}
...
...
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