Skip to content

Commit

Permalink
Merge pull request opencv#1491 from terfendail:resize_float_linear
Browse files Browse the repository at this point in the history
  • Loading branch information
vpisarev committed Dec 22, 2017
2 parents 53986aa + 08481a7 commit a6a2903
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion modules/ccalib/src/randpattern.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ void RandomPatternGenerator::generatePattern()

Mat r = Mat(n, m, CV_32F);
cv::randn(r, Scalar::all(0), Scalar::all(1));
cv::resize(r, r, Size(_imageWidth ,_imageHeight), 0, 0, INTER_LINEAR_EXACT);
cv::resize(r, r, Size(_imageWidth ,_imageHeight));
double min_r, max_r;
minMaxLoc(r, &min_r, &max_r);

Expand Down
4 changes: 2 additions & 2 deletions modules/dpm/src/dpm_feature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void Feature::computeFeaturePyramid(const Mat &imageM, vector< Mat > &pyramid)
{
const double scale = (double)(1.0f/pow(params.sfactor, i));
Mat imScaled;
resize(imageM, imScaled, imSize * scale, 0, 0, INTER_LINEAR_EXACT);
resize(imageM, imScaled, imSize * scale);
// First octave at twice the image resolution
computeHOG32D(imScaled, pyramid[i], params.binSize/2,
params.padx + 1, params.pady + 1);
Expand All @@ -106,7 +106,7 @@ void Feature::computeFeaturePyramid(const Mat &imageM, vector< Mat > &pyramid)
{
Mat imScaled2;
Size_<double> imScaledSize = imScaled.size();
resize(imScaled, imScaled2, imScaledSize*0.5, 0, 0, INTER_LINEAR_EXACT);
resize(imScaled, imScaled2, imScaledSize*0.5);
imScaled = imScaled2;
computeHOG32D(imScaled2, pyramid[j+params.interval],
params.binSize, params.padx + 1, params.pady + 1);
Expand Down

0 comments on commit a6a2903

Please sign in to comment.