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
9c13b84e
Commit
9c13b84e
authored
Aug 19, 2012
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed unused warnings
parent
66eb96d7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
7 deletions
+15
-7
perf_core.cpp
modules/gpu/perf/perf_core.cpp
+3
-0
perf_core.cpp
modules/gpu/perf_cpu/perf_core.cpp
+3
-0
calib3d.cpp
modules/gpu/src/calib3d.cpp
+1
-0
cascadeclassifier.cpp
modules/gpu/src/cascadeclassifier.cpp
+4
-4
match_template.cpp
modules/gpu/src/match_template.cpp
+1
-0
split_merge.cpp
modules/gpu/src/split_merge.cpp
+0
-1
test_objdetect.cpp
modules/gpu/test/test_objdetect.cpp
+3
-2
No files found.
modules/gpu/perf/perf_core.cpp
View file @
9c13b84e
...
...
@@ -1607,6 +1607,7 @@ GPU_PERF_TEST(Norm, cv::gpu::DeviceInfo, cv::Size, MatDepth, NormType)
{
dst
=
cv
::
gpu
::
norm
(
src
,
normType
,
buf
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
Norm
,
testing
::
Combine
(
...
...
@@ -1642,6 +1643,7 @@ GPU_PERF_TEST(NormDiff, cv::gpu::DeviceInfo, cv::Size, NormType)
{
dst
=
cv
::
gpu
::
norm
(
src1
,
src2
,
normType
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
NormDiff
,
testing
::
Combine
(
...
...
@@ -1829,6 +1831,7 @@ GPU_PERF_TEST(CountNonZero, cv::gpu::DeviceInfo, cv::Size, MatDepth)
{
dst
=
cv
::
gpu
::
countNonZero
(
src
,
buf
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
CountNonZero
,
testing
::
Combine
(
...
...
modules/gpu/perf_cpu/perf_core.cpp
View file @
9c13b84e
...
...
@@ -1229,6 +1229,7 @@ GPU_PERF_TEST(Norm, cv::gpu::DeviceInfo, cv::Size, MatDepth, NormType)
{
dst
=
cv
::
norm
(
src
,
normType
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
Norm
,
testing
::
Combine
(
...
...
@@ -1259,6 +1260,7 @@ GPU_PERF_TEST(NormDiff, cv::gpu::DeviceInfo, cv::Size, NormType)
{
dst
=
cv
::
norm
(
src1
,
src2
,
normType
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
NormDiff
,
testing
::
Combine
(
...
...
@@ -1338,6 +1340,7 @@ GPU_PERF_TEST(CountNonZero, cv::gpu::DeviceInfo, cv::Size, MatDepth)
{
dst
=
cv
::
countNonZero
(
src
);
}
(
void
)
dst
;
}
INSTANTIATE_TEST_CASE_P
(
Core
,
CountNonZero
,
testing
::
Combine
(
...
...
modules/gpu/src/calib3d.cpp
View file @
9c13b84e
...
...
@@ -214,6 +214,7 @@ void cv::gpu::solvePnPRansac(const Mat& object, const Mat& image, const Mat& cam
int
num_iters
,
float
max_dist
,
int
min_inlier_count
,
vector
<
int
>*
inliers
)
{
(
void
)
min_inlier_count
;
CV_Assert
(
object
.
rows
==
1
&&
object
.
cols
>
0
&&
object
.
type
()
==
CV_32FC3
);
CV_Assert
(
image
.
rows
==
1
&&
image
.
cols
>
0
&&
image
.
type
()
==
CV_32FC2
);
CV_Assert
(
object
.
cols
==
image
.
cols
);
...
...
modules/gpu/src/cascadeclassifier.cpp
View file @
9c13b84e
...
...
@@ -143,7 +143,7 @@ public:
}
unsigned
int
process
(
const
GpuMat
&
image
,
GpuMat
&
objectsBuf
,
float
scaleFactor
,
int
minNeighbors
,
bool
findLargestObject
,
bool
visualizeInPlace
,
cv
::
Size
minSize
,
cv
::
Size
maxObjectSize
)
bool
findLargestObject
,
bool
visualizeInPlace
,
cv
::
Size
minSize
,
cv
::
Size
/*maxObjectSize*/
)
{
CV_Assert
(
scaleFactor
>
1
&&
image
.
depth
()
==
CV_8U
);
...
...
@@ -380,12 +380,12 @@ public:
LbpCascade
(){}
virtual
~
LbpCascade
(){}
virtual
unsigned
int
process
(
const
GpuMat
&
image
,
GpuMat
&
objects
,
float
scaleFactor
,
int
groupThreshold
,
bool
findLargestObject
,
bool
visualizeInPlace
,
cv
::
Size
minObjectSize
,
cv
::
Size
maxObjectSize
)
virtual
unsigned
int
process
(
const
GpuMat
&
image
,
GpuMat
&
objects
,
float
scaleFactor
,
int
groupThreshold
,
bool
/*findLargestObject*/
,
bool
/*visualizeInPlace*/
,
cv
::
Size
minObjectSize
,
cv
::
Size
maxObjectSize
)
{
CV_Assert
(
scaleFactor
>
1
&&
image
.
depth
()
==
CV_8U
);
const
int
defaultObjSearchNum
=
100
;
//
const int defaultObjSearchNum = 100;
const
float
grouping_eps
=
0.2
f
;
if
(
!
objects
.
empty
()
&&
objects
.
depth
()
==
CV_32S
)
...
...
modules/gpu/src/match_template.cpp
View file @
9c13b84e
...
...
@@ -227,6 +227,7 @@ namespace
void
matchTemplate_SQDIFF_32F
(
const
GpuMat
&
image
,
const
GpuMat
&
templ
,
GpuMat
&
result
,
MatchTemplateBuf
&
buf
,
Stream
&
stream
)
{
(
void
)
buf
;
result
.
create
(
image
.
rows
-
templ
.
rows
+
1
,
image
.
cols
-
templ
.
cols
+
1
,
CV_32F
);
matchTemplateNaive_SQDIFF_32F
(
image
,
templ
,
result
,
image
.
channels
(),
StreamAccessor
::
getStream
(
stream
));
}
...
...
modules/gpu/src/split_merge.cpp
View file @
9c13b84e
...
...
@@ -119,7 +119,6 @@ namespace
int
depth
=
src
.
depth
();
int
num_channels
=
src
.
channels
();
Size
size
=
src
.
size
();
if
(
depth
==
CV_64F
)
{
...
...
modules/gpu/test/test_objdetect.cpp
View file @
9c13b84e
...
...
@@ -351,21 +351,22 @@ TEST_P(LBP_classify, Accuracy)
cv
::
gpu
::
GpuMat
tested
(
grey
);
int
count
=
gpuClassifier
.
detectMultiScale
(
tested
,
gpu_rects
);
#if defined (LOG_CASCADE_STATISTIC)
cv
::
Mat
downloaded
(
gpu_rects
);
const
cv
::
Rect
*
faces
=
downloaded
.
ptr
<
cv
::
Rect
>
();
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
cv
::
Rect
r
=
faces
[
i
];
#if defined (LOG_CASCADE_STATISTIC)
std
::
cout
<<
r
.
x
<<
" "
<<
r
.
y
<<
" "
<<
r
.
width
<<
" "
<<
r
.
height
<<
std
::
endl
;
cv
::
rectangle
(
markedImage
,
r
,
CV_RGB
(
255
,
0
,
0
));
#endif
}
#endif
#if defined (LOG_CASCADE_STATISTIC)
cv
::
imshow
(
"Res"
,
markedImage
);
cv
::
waitKey
();
#endif
(
void
)
count
;
}
INSTANTIATE_TEST_CASE_P
(
GPU_ObjDetect
,
LBP_classify
,
...
...
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