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
238ea7f0
Commit
238ea7f0
authored
Mar 18, 2013
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warnings under win.
parent
1ad7af3c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
cuda_invoker.hpp
modules/softcascade/src/cuda_invoker.hpp
+4
-4
detector_cuda.cpp
modules/softcascade/src/detector_cuda.cpp
+9
-5
No files found.
modules/softcascade/src/cuda_invoker.hpp
View file @
238ea7f0
...
...
@@ -63,14 +63,14 @@ typedef unsigned short ushort;
struct
Octave
{
float
scale
;
ushort2
size
;
ushort
index
;
ushort
stages
;
ushort
shrinkage
;
ushort2
size
;
float
scale
;
Octave
(
const
ushort
i
,
const
ushort
s
,
const
ushort
sh
,
const
ushort2
sz
,
const
float
sc
)
:
index
(
i
),
stages
(
s
),
shrinkage
(
sh
),
size
(
sz
),
scale
(
sc
)
{}
:
scale
(
sc
),
size
(
sz
),
index
(
i
),
stages
(
s
),
shrinkage
(
sh
)
{}
};
struct
Level
...
...
@@ -111,7 +111,7 @@ struct Detection
Detection
(){}
__device_inline__
Detection
(
int
_x
,
int
_y
,
uchar
_w
,
uchar
_h
,
float
c
)
:
x
(
_x
),
y
(
_y
),
w
(
_w
),
h
(
_h
),
confidence
(
c
),
kind
(
0
)
{};
:
x
(
static_cast
<
ushort
>
(
_x
)),
y
(
static_cast
<
ushort
>
(
_y
)
),
w
(
_w
),
h
(
_h
),
confidence
(
c
),
kind
(
0
)
{};
};
struct
GK107PolicyX4
...
...
modules/softcascade/src/detector_cuda.cpp
View file @
238ea7f0
...
...
@@ -80,8 +80,8 @@ namespace
cv
::
softcascade
::
device
::
Level
::
Level
(
int
idx
,
const
Octave
&
oct
,
const
float
scale
,
const
int
w
,
const
int
h
)
:
octave
(
idx
),
step
(
oct
.
stages
),
relScale
(
scale
/
oct
.
scale
)
{
workRect
.
x
=
cvRound
(
w
/
(
float
)
oct
.
shrinkage
);
workRect
.
y
=
cvRound
(
h
/
(
float
)
oct
.
shrinkage
);
workRect
.
x
=
(
unsigned
char
)
cvRound
(
w
/
(
float
)
oct
.
shrinkage
);
workRect
.
y
=
(
unsigned
char
)
cvRound
(
h
/
(
float
)
oct
.
shrinkage
);
objSize
.
x
=
cv
::
saturate_cast
<
uchar
>
(
oct
.
size
.
x
*
relScale
);
objSize
.
y
=
cv
::
saturate_cast
<
uchar
>
(
oct
.
size
.
y
*
relScale
);
...
...
@@ -168,8 +168,8 @@ struct cv::softcascade::SCascade::Fields
ushort
nweaks
=
saturate_cast
<
ushort
>
((
int
)
fns
[
SC_OCT_WEAKS
]);
ushort2
size
;
size
.
x
=
cvRound
(
origWidth
*
scale
);
size
.
y
=
cvRound
(
origHeight
*
scale
);
size
.
x
=
(
unsigned
short
)
cvRound
(
origWidth
*
scale
);
size
.
y
=
(
unsigned
short
)
cvRound
(
origHeight
*
scale
);
device
::
Octave
octave
(
octIndex
,
nweaks
,
shrinkage
,
size
,
scale
);
CV_Assert
(
octave
.
stages
>
0
);
...
...
@@ -274,7 +274,7 @@ struct cv::softcascade::SCascade::Fields
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
;
maxScale
=
maxScale
;
...
...
@@ -463,6 +463,9 @@ public:
DEFAULT_FRAME_HEIGHT
=
480
,
HOG_LUV_BINS
=
10
};
private
:
cv
::
softcascade
::
SCascade
::
Fields
&
operator
=
(
const
cv
::
softcascade
::
SCascade
::
Fields
&
);
};
cv
::
softcascade
::
SCascade
::
SCascade
(
const
double
mins
,
const
double
maxs
,
const
int
sc
,
const
int
fl
)
...
...
@@ -619,6 +622,7 @@ private:
cv
::
gpu
::
GpuMat
bgr
;
cv
::
gpu
::
GpuMat
gray
;
cv
::
gpu
::
GpuMat
channels
;
SeparablePreprocessor
&
operator
=
(
const
SeparablePreprocessor
&
);
};
}
...
...
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