Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10404 from alalek:build_fix_msvs2010

Browse Source
pull/10424/head
Alexander Alekhin 7 years ago
parent 047764f476 adf43e7d2a
commit a8844de7b5
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/dnn/src/layers/prior_box_layer.cpp

4
modules/dnn/src/layers/prior_box_layer.cpp
Unescape View File

@ -308,7 +308,7 @@ public:
aspectRatios.copyTo(umat_aspectRatios); aspectRatios.copyTo(umat_aspectRatios);
variance.copyTo(umat_variance); variance.copyTo(umat_variance);
int real_numPriors = _numPriors / pow(2, _offsetsX.size() - 1); int real_numPriors = _numPriors >> (_offsetsX.size() - 1);
umat_scales = UMat(1, &real_numPriors, CV_32F, 1.0f); umat_scales = UMat(1, &real_numPriors, CV_32F, 1.0f);
} }
@ -383,7 +383,7 @@ public:
CV_Assert(inputs.size() == 2); CV_Assert(inputs.size() == 2);
size_t real_numPriors = _numPriors / pow(2, _offsetsX.size() - 1); size_t real_numPriors = _numPriors >> (_offsetsX.size() - 1);
if (_scales.empty()) if (_scales.empty())
_scales.resize(real_numPriors, 1.0f); _scales.resize(real_numPriors, 1.0f);
else else

Write Preview
Loading…
Cancel
Save