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
918645d1
Commit
918645d1
authored
Aug 22, 2016
by
Bleach
Committed by
Maksim Shabunin
Aug 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix vs2010 build error
parent
503a1dcb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
dis_flow.cpp
modules/optflow/src/dis_flow.cpp
+1
-1
pcaflow.cpp
modules/optflow/src/pcaflow.cpp
+2
-2
learning_based_color_balance.cpp
modules/xphoto/src/learning_based_color_balance.cpp
+1
-1
No files found.
modules/optflow/src/dis_flow.cpp
View file @
918645d1
...
...
@@ -1066,7 +1066,7 @@ void DISOpticalFlowImpl::calc(InputArray I0, InputArray I1, InputOutputArray flo
Mat
uxy
[]
=
{
Ux
[
finest_scale
],
Uy
[
finest_scale
]};
merge
(
uxy
,
2
,
U
);
resize
(
U
,
flowMat
,
flowMat
.
size
());
flowMat
*=
pow
(
2
,
finest_scale
)
;
flowMat
*=
1
<<
finest_scale
;
}
void
DISOpticalFlowImpl
::
collectGarbage
()
...
...
modules/optflow/src/pcaflow.cpp
View file @
918645d1
...
...
@@ -226,7 +226,7 @@ void reduceToFlow( const Mat &w1, const Mat &w2, Mat &flow, const Size &basisSiz
Mat
flowX
(
size
,
CV_32F
,
0.0
f
);
Mat
flowY
(
size
,
CV_32F
,
0.0
f
);
const
float
mult
=
sqrt
(
s
ize
.
area
(
)
)
*
0.5
;
const
float
mult
=
sqrt
(
s
tatic_cast
<
float
>
(
size
.
area
()
)
)
*
0.5
;
for
(
int
i
=
0
;
i
<
basisSize
.
width
;
++
i
)
for
(
int
j
=
0
;
j
<
basisSize
.
height
;
++
j
)
...
...
@@ -296,7 +296,7 @@ void OpticalFlowPCAFlow::removeOcclusions( UMat &from, UMat &to, std::vector<Poi
calcOpticalFlowPyrLK
(
to
,
from
,
predictedFeatures
,
backwardFeatures
,
predictedStatus
,
predictedError
);
size_t
j
=
0
;
const
float
threshold
=
occlusionsThreshold
*
sqrt
(
from
.
size
().
area
(
)
);
const
float
threshold
=
occlusionsThreshold
*
sqrt
(
static_cast
<
float
>
(
from
.
size
().
area
()
)
);
for
(
size_t
i
=
0
;
i
<
predictedFeatures
.
size
();
++
i
)
{
if
(
predictedStatus
[
i
]
)
...
...
modules/xphoto/src/learning_based_color_balance.cpp
View file @
918645d1
...
...
@@ -547,7 +547,7 @@ Vec2f LearningBasedWBImpl::predictIlluminant(vector<Vec2f> features)
int
local_model_size
=
num_features
*
feature_model_size
;
int
feature_model_size_leaf
=
2
*
num_tree_nodes
;
int
local_model_size_leaf
=
num_features
*
feature_model_size_leaf
;
tree_depth
=
(
int
)
round
(
log
(
num_tree_nodes
)
/
log
(
2
)
);
tree_depth
=
cvRound
(
(
log
(
static_cast
<
float
>
(
num_tree_nodes
))
/
log
(
2.0
f
))
);
vector
<
float
>
consensus_r
,
consensus_g
;
vector
<
float
>
all_r
,
all_g
;
...
...
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