mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10401 from terfendail:resize_linear_revert

Browse Source
This commit is contained in:
Alexander Alekhin 2017-12-22 16:18:50 +00:00
commit 9148a37624
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/photo/src/contrast_preserve.hpp
View File

@ -233,7 +233,7 @@ void Decolor::weak_order(Mat img, vector <double> &alf)
if((h + w) > 800) if((h + w) > 800)
{ {
sizefactor = (double)800/(h+w); 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); 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) if((h + w) > 800)
{ {
sizefactor = (double)800/(h+w); 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; h = img.size().height;

6
modules/video/src/optflowgf.cpp
View File

@ -767,7 +767,7 @@ private:
{ {
if (!gaussianBlurOcl(frames_[i], smoothSize/2, blurredFrame[i])) if (!gaussianBlurOcl(frames_[i], smoothSize/2, blurredFrame[i]))
return false; 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])) if (!polynomialExpansionOcl(pyrLevel[i], R[i]))
return false; return false;
} }
@ -1153,7 +1153,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,
} }
else else
{ {
resize( prevFlow, flow, Size(width, height), 0, 0, INTER_LINEAR); resize( prevFlow, flow, Size(width, height), 0, 0, INTER_LINEAR );
flow *= 1./pyrScale_; flow *= 1./pyrScale_;
} }
@ -1162,7 +1162,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,
{ {
img[i]->convertTo(fimg, CV_32F); img[i]->convertTo(fimg, CV_32F);
GaussianBlur(fimg, fimg, Size(smooth_sz, smooth_sz), sigma, sigma); 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_ ); FarnebackPolyExp( I, R[i], polyN_, polySigma_ );
} }