Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
16daec9c
Commit
16daec9c
authored
Aug 29, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
parents
5d3928e4
1f6d6f06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
sparse_matching_gpc.cpp
modules/optflow/src/sparse_matching_gpc.cpp
+1
-1
staticSaliency.cpp
modules/saliency/src/staticSaliency.cpp
+1
-0
staticSaliencyFineGrained.cpp
modules/saliency/src/staticSaliencyFineGrained.cpp
+1
-1
No files found.
modules/optflow/src/sparse_matching_gpc.cpp
View file @
16daec9c
...
...
@@ -278,7 +278,7 @@ bool ocl_getAllDCTDescriptorsForImage( const Mat *imgCh, std::vector< GPCPatchDe
(
int
)
globSize
[
0
],
(
int
)
globSize
[
1
],
(
int
)
patchRadius
)
.
run
(
2
,
globSize
,
0
,
true
)
==
false
)
return
false
;
Mat
cpuOut
=
out
.
getMat
(
0
);
Mat
cpuOut
=
out
.
getMat
(
ACCESS_READ
);
for
(
int
i
=
0
;
i
+
2
*
patchRadius
<
sz
.
height
;
++
i
)
for
(
int
j
=
0
;
j
+
2
*
patchRadius
<
sz
.
width
;
++
j
)
descr
.
push_back
(
*
cpuOut
.
ptr
<
GPCPatchDescriptor
>
(
i
*
globSize
[
1
]
+
j
)
);
...
...
modules/saliency/src/staticSaliency.cpp
View file @
16daec9c
...
...
@@ -53,6 +53,7 @@ namespace saliency
bool
StaticSaliency
::
computeBinaryMap
(
InputArray
_saliencyMap
,
OutputArray
_binaryMap
)
{
Mat
saliencyMap
=
_saliencyMap
.
getMat
();
CV_CheckTypeEQ
(
saliencyMap
.
type
(),
CV_32FC1
,
""
);
Mat
labels
=
Mat
::
zeros
(
saliencyMap
.
rows
*
saliencyMap
.
cols
,
1
,
1
);
Mat
samples
=
Mat_
<
float
>
(
saliencyMap
.
rows
*
saliencyMap
.
cols
,
1
);
Mat
centers
;
...
...
modules/saliency/src/staticSaliencyFineGrained.cpp
View file @
16daec9c
...
...
@@ -66,7 +66,7 @@ bool StaticSaliencyFineGrained::computeSaliencyImpl(InputArray image, OutputArra
{
Mat
dst
(
Size
(
image
.
getMat
().
cols
,
image
.
getMat
().
rows
),
CV_8UC1
);
calcIntensityChannel
(
image
.
getMat
(),
dst
);
dst
.
co
pyTo
(
saliencyMap
);
dst
.
co
nvertTo
(
saliencyMap
,
CV_32F
,
1.0
f
/
255.0
f
);
// values are in range [0; 1]
#ifdef SALIENCY_DEBUG
// visualize saliency map
...
...
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