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
e5313246
Commit
e5313246
authored
Dec 22, 2017
by
Vitaly Tuzov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reverted calls to linear resize back to generic version for floating point matrices
parent
1bc1f3d3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
contrast_preserve.hpp
modules/photo/src/contrast_preserve.hpp
+2
-2
optflowgf.cpp
modules/video/src/optflowgf.cpp
+3
-3
No files found.
modules/photo/src/contrast_preserve.hpp
View file @
e5313246
...
...
@@ -233,7 +233,7 @@ void Decolor::weak_order(Mat img, vector <double> &alf)
if
((
h
+
w
)
>
800
)
{
sizefactor
=
(
double
)
800
/
(
h
+
w
);
resize
(
img
,
img
,
Size
(
round_num
(
h
*
sizefactor
),
round_num
(
w
*
sizefactor
))
,
0
,
0
,
INTER_LINEAR_EXACT
);
resize
(
img
,
img
,
Size
(
round_num
(
h
*
sizefactor
),
round_num
(
w
*
sizefactor
)));
}
Mat
curIm
=
Mat
(
img
.
size
(),
CV_32FC1
);
...
...
@@ -309,7 +309,7 @@ void Decolor::grad_system(Mat img, vector < vector < double > > &polyGrad,
if
((
h
+
w
)
>
800
)
{
sizefactor
=
(
double
)
800
/
(
h
+
w
);
resize
(
img
,
img
,
Size
(
round_num
(
h
*
sizefactor
),
round_num
(
w
*
sizefactor
))
,
0
,
0
,
INTER_LINEAR_EXACT
);
resize
(
img
,
img
,
Size
(
round_num
(
h
*
sizefactor
),
round_num
(
w
*
sizefactor
)));
}
h
=
img
.
size
().
height
;
...
...
modules/video/src/optflowgf.cpp
View file @
e5313246
...
...
@@ -767,7 +767,7 @@ private:
{
if
(
!
gaussianBlurOcl
(
frames_
[
i
],
smoothSize
/
2
,
blurredFrame
[
i
]))
return
false
;
resize
(
blurredFrame
[
i
],
pyrLevel
[
i
],
Size
(
width
,
height
),
INTER_LINEAR
_EXACT
);
resize
(
blurredFrame
[
i
],
pyrLevel
[
i
],
Size
(
width
,
height
),
INTER_LINEAR
);
if
(
!
polynomialExpansionOcl
(
pyrLevel
[
i
],
R
[
i
]))
return
false
;
}
...
...
@@ -1153,7 +1153,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,
}
else
{
resize
(
prevFlow
,
flow
,
Size
(
width
,
height
),
0
,
0
,
INTER_LINEAR
);
resize
(
prevFlow
,
flow
,
Size
(
width
,
height
),
0
,
0
,
INTER_LINEAR
);
flow
*=
1.
/
pyrScale_
;
}
...
...
@@ -1162,7 +1162,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,
{
img
[
i
]
->
convertTo
(
fimg
,
CV_32F
);
GaussianBlur
(
fimg
,
fimg
,
Size
(
smooth_sz
,
smooth_sz
),
sigma
,
sigma
);
resize
(
fimg
,
I
,
Size
(
width
,
height
),
INTER_LINEAR
);
resize
(
fimg
,
I
,
Size
(
width
,
height
),
INTER_LINEAR
);
FarnebackPolyExp
(
I
,
R
[
i
],
polyN_
,
polySigma_
);
}
...
...
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