Merge pull request opencv#10401 from terfendail:resize_linear_revert

alalek · alalek · commit 9148a3762478 · 2017-12-22T16:18:50.000Z
diff --git a/modules/photo/src/contrast_preserve.hpp b/modules/photo/src/contrast_preserve.hpp
@@ -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;
diff --git a/modules/video/src/optflowgf.cpp b/modules/video/src/optflowgf.cpp
@@ -767,7 +767,7 @@ class FarnebackOpticalFlowImpl : public FarnebackOpticalFlow
                 {
                     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_ );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ void Decolor::weak_order(Mat img, vector <double> &alf)`
`233`	`233`	`if((h + w) > 800)`
`234`	`234`	`{`
`235`	`235`	`sizefactor = (double)800/(h+w);`
`236`		`- resize(img,img,Size(round_num(hsizefactor),round_num(wsizefactor)), 0, 0, INTER_LINEAR_EXACT);`
	`236`	`+ resize(img,img,Size(round_num(hsizefactor),round_num(wsizefactor)));`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`Mat curIm = Mat(img.size(),CV_32FC1);`
`@@ -309,7 +309,7 @@ void Decolor::grad_system(Mat img, vector < vector < double > > &polyGrad,`
`309`	`309`	`if((h + w) > 800)`
`310`	`310`	`{`
`311`	`311`	`sizefactor = (double)800/(h+w);`
`312`		`- resize(img,img,Size(round_num(hsizefactor),round_num(wsizefactor)), 0, 0, INTER_LINEAR_EXACT);`
	`312`	`+ resize(img,img,Size(round_num(hsizefactor),round_num(wsizefactor)));`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`h = img.size().height;`
Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,7 @@ class FarnebackOpticalFlowImpl : public FarnebackOpticalFlow`
`767`	`767`	`{`
`768`	`768`	`if (!gaussianBlurOcl(frames_[i], smoothSize/2, blurredFrame[i]))`
`769`	`769`	`return false;`
`770`		`- resize(blurredFrame[i], pyrLevel[i], Size(width, height), INTER_LINEAR_EXACT);`
	`770`	`+ resize(blurredFrame[i], pyrLevel[i], Size(width, height), INTER_LINEAR);`
`771`	`771`	`if (!polynomialExpansionOcl(pyrLevel[i], R[i]))`
`772`	`772`	`return false;`
`773`	`773`	`}`
`@@ -1153,7 +1153,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,`
`1153`	`1153`	`}`
`1154`	`1154`	`else`
`1155`	`1155`	`{`
`1156`		`- resize( prevFlow, flow, Size(width, height), 0, 0, INTER_LINEAR);`
	`1156`	`+ resize( prevFlow, flow, Size(width, height), 0, 0, INTER_LINEAR );`
`1157`	`1157`	`flow *= 1./pyrScale_;`
`1158`	`1158`	`}`
`1159`	`1159`
`@@ -1162,7 +1162,7 @@ void FarnebackOpticalFlowImpl::calc(InputArray _prev0, InputArray _next0,`
`1162`	`1162`	`{`
`1163`	`1163`	`img[i]->convertTo(fimg, CV_32F);`
`1164`	`1164`	`GaussianBlur(fimg, fimg, Size(smooth_sz, smooth_sz), sigma, sigma);`
`1165`		`- resize( fimg, I, Size(width, height), INTER_LINEAR);`
	`1165`	`+ resize( fimg, I, Size(width, height), INTER_LINEAR );`
`1166`	`1166`	`FarnebackPolyExp( I, R[i], polyN_, polySigma_ );`
`1167`	`1167`	`}`
`1168`	`1168`