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
2661c2e2
Commit
2661c2e2
authored
Mar 28, 2013
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings
parent
76e748cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
surf_gpu.cpp
modules/nonfree/src/surf_gpu.cpp
+3
-0
icf-sc.cu
modules/softcascade/src/cuda/icf-sc.cu
+5
-5
detector_cuda.cpp
modules/softcascade/src/detector_cuda.cpp
+1
-1
No files found.
modules/nonfree/src/surf_gpu.cpp
View file @
2661c2e2
...
@@ -223,6 +223,9 @@ namespace
...
@@ -223,6 +223,9 @@ namespace
}
}
private
:
private
:
SURF_GPU_Invoker
(
const
SURF_GPU_Invoker
&
);
SURF_GPU_Invoker
&
operator
=
(
const
SURF_GPU_Invoker
&
);
SURF_GPU
&
surf_
;
SURF_GPU
&
surf_
;
int
img_cols
,
img_rows
;
int
img_cols
,
img_rows
;
...
...
modules/softcascade/src/cuda/icf-sc.cu
View file @
2661c2e2
...
@@ -82,8 +82,8 @@ typedef unsigned char uchar;
...
@@ -82,8 +82,8 @@ typedef unsigned char uchar;
}
}
template<int FACTOR>
template<int FACTOR>
__global__ void shrink(const uchar* __restrict__ hogluv, const
in
t inPitch,
__global__ void shrink(const uchar* __restrict__ hogluv, const
size_
t inPitch,
uchar* __restrict__ shrank, const
in
t outPitch )
uchar* __restrict__ shrank, const
size_
t outPitch )
{
{
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
...
@@ -127,7 +127,7 @@ typedef unsigned char uchar;
...
@@ -127,7 +127,7 @@ typedef unsigned char uchar;
__v = static_cast<uchar>((V + 140.f) * (255.f / (122.f + 140.f )));
__v = static_cast<uchar>((V + 140.f) * (255.f / (122.f + 140.f )));
}
}
__global__ void bgr2Luv_d(const uchar* rgb, const
int rgbPitch, uchar* luvg, const in
t luvgPitch)
__global__ void bgr2Luv_d(const uchar* rgb, const
size_t rgbPitch, uchar* luvg, const size_
t luvgPitch)
{
{
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
...
@@ -256,8 +256,8 @@ typedef unsigned char uchar;
...
@@ -256,8 +256,8 @@ typedef unsigned char uchar;
// ToDo: use textures or uncached load instruction.
// ToDo: use textures or uncached load instruction.
__global__ void magToHist(const uchar* __restrict__ mag,
__global__ void magToHist(const uchar* __restrict__ mag,
const float* __restrict__ angle, const
in
t angPitch,
const float* __restrict__ angle, const
size_
t angPitch,
uchar* __restrict__ hog, const
in
t hogPitch, const int fh)
uchar* __restrict__ hog, const
size_
t hogPitch, const int fh)
{
{
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
const int x = blockIdx.x * blockDim.x + threadIdx.x;
...
...
modules/softcascade/src/detector_cuda.cpp
View file @
2661c2e2
...
@@ -274,7 +274,7 @@ struct cv::softcascade::SCascade::Fields
...
@@ -274,7 +274,7 @@ struct cv::softcascade::SCascade::Fields
bool
check
(
float
mins
,
float
maxs
,
int
scales
)
bool
check
(
float
mins
,
float
maxs
,
int
scales
)
{
{
bool
updated
=
((
minScale
==
mins
)
||
(
maxScale
==
maxs
)
||
(
totals
=
scales
));
bool
updated
=
((
minScale
==
mins
)
||
(
maxScale
==
maxs
)
||
(
totals
=
=
scales
));
minScale
=
mins
;
minScale
=
mins
;
maxScale
=
maxScale
;
maxScale
=
maxScale
;
...
...
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