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

Merge pull request #20625 from alalek:fix_msvc_warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2021-08-28 21:24:02 +00:00
commit 1259a474ba
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/features2d/src/kaze/KAZEFeatures.cpp
View File

@ -311,7 +311,7 @@ private:
void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts) void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
{ {
int level = 0; int level = 0;
float dist = 0.0, smax = 3.0; float smax = 3.0;
int npoints = 0, id_repeated = 0; int npoints = 0, id_repeated = 0;
int left_x = 0, right_x = 0, up_y = 0, down_y = 0; int left_x = 0, right_x = 0, up_y = 0, down_y = 0;
bool is_extremum = false, is_repeated = false, is_out = false; bool is_extremum = false, is_repeated = false, is_out = false;
@ -338,17 +338,24 @@ void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
for (int j = 0; j < (int)kpts_par_[i].size(); j++) for (int j = 0; j < (int)kpts_par_[i].size(); j++)
{ {
level = i + 1; level = i + 1;
const TEvolution& evolution_level = evolution_[level];
is_extremum = true; is_extremum = true;
is_repeated = false; is_repeated = false;
is_out = false; is_out = false;
// Check in case we have the same point as maxima in previous evolution levels const KeyPoint& kpts_par_ij = kpts_par_[i][j];
for (int ik = 0; ik < (int)kpts.size(); ik++) {
if (kpts[ik].class_id == level || kpts[ik].class_id == level + 1 || kpts[ik].class_id == level - 1) {
dist = pow(kpts_par_[i][j].pt.x - kpts[ik].pt.x, 2) + pow(kpts_par_[i][j].pt.y - kpts[ik].pt.y, 2);
if (dist < evolution_[level].sigma_size*evolution_[level].sigma_size) { // Check in case we have the same point as maxima in previous evolution levels
if (kpts_par_[i][j].response > kpts[ik].response) { for (int ik = 0; ik < (int)kpts.size(); ik++)
{
const KeyPoint& kpts_ik = kpts[ik];
if (kpts_ik.class_id == level || kpts_ik.class_id == level + 1 || kpts_ik.class_id == level - 1) {
Point2f diff = kpts_par_ij.pt - kpts_ik.pt;
float dist = diff.dot(diff);
if (dist < evolution_level.sigma_size*evolution_level.sigma_size) {
if (kpts_par_ij.response > kpts_ik.response) {
id_repeated = ik; id_repeated = ik;
is_repeated = true; is_repeated = true;
} }
@ -363,23 +370,23 @@ void KAZEFeatures::Determinant_Hessian(std::vector<KeyPoint>& kpts)
if (is_extremum == true) { if (is_extremum == true) {
// Check that the point is under the image limits for the descriptor computation // Check that the point is under the image limits for the descriptor computation
left_x = cvRound(kpts_par_[i][j].pt.x - smax*kpts_par_[i][j].size); left_x = cvRound(kpts_par_ij.pt.x - smax*kpts_par_ij.size);
right_x = cvRound(kpts_par_[i][j].pt.x + smax*kpts_par_[i][j].size); right_x = cvRound(kpts_par_ij.pt.x + smax*kpts_par_ij.size);
up_y = cvRound(kpts_par_[i][j].pt.y - smax*kpts_par_[i][j].size); up_y = cvRound(kpts_par_ij.pt.y - smax*kpts_par_ij.size);
down_y = cvRound(kpts_par_[i][j].pt.y + smax*kpts_par_[i][j].size); down_y = cvRound(kpts_par_ij.pt.y + smax*kpts_par_ij.size);
if (left_x < 0 || right_x >= evolution_[level].Ldet.cols || if (left_x < 0 || right_x >= evolution_level.Ldet.cols ||
up_y < 0 || down_y >= evolution_[level].Ldet.rows) { up_y < 0 || down_y >= evolution_level.Ldet.rows) {
is_out = true; is_out = true;
} }
if (is_out == false) { if (is_out == false) {
if (is_repeated == false) { if (is_repeated == false) {
kpts.push_back(kpts_par_[i][j]); kpts.push_back(kpts_par_ij);
npoints++; npoints++;
} }
else { else {
kpts[id_repeated] = kpts_par_[i][j]; kpts[id_repeated] = kpts_par_ij;
} }
} }
} }
@ -513,16 +520,16 @@ public:
if (options_.upright) if (options_.upright)
{ {
kpts[i].angle = 0.0; kpts[i].angle = 0.0;
if (options_.extended) if (options_.extended)
Get_KAZE_Upright_Descriptor_128(kpts[i], desc.ptr<float>((int)i)); Get_KAZE_Upright_Descriptor_128(kpts[i], desc.ptr<float>((int)i));
else else
Get_KAZE_Upright_Descriptor_64(kpts[i], desc.ptr<float>((int)i)); Get_KAZE_Upright_Descriptor_64(kpts[i], desc.ptr<float>((int)i));
} }
else else
{ {
KAZEFeatures::Compute_Main_Orientation(kpts[i], evolution, options_); KAZEFeatures::Compute_Main_Orientation(kpts[i], evolution, options_);
if (options_.extended) if (options_.extended)
Get_KAZE_Descriptor_128(kpts[i], desc.ptr<float>((int)i)); Get_KAZE_Descriptor_128(kpts[i], desc.ptr<float>((int)i));
else else
Get_KAZE_Descriptor_64(kpts[i], desc.ptr<float>((int)i)); Get_KAZE_Descriptor_64(kpts[i], desc.ptr<float>((int)i));
@ -712,26 +719,26 @@ void KAZE_Descriptor_Invoker::Get_KAZE_Upright_Descriptor_64(const KeyPoint &kpt
y1 = (int)(sample_y - 0.5f); y1 = (int)(sample_y - 0.5f);
x1 = (int)(sample_x - 0.5f); x1 = (int)(sample_x - 0.5f);
checkDescriptorLimits(x1, y1, options_.img_width, options_.img_height); checkDescriptorLimits(x1, y1, options_.img_width, options_.img_height);
y2 = (int)(sample_y + 0.5f); y2 = (int)(sample_y + 0.5f);
x2 = (int)(sample_x + 0.5f); x2 = (int)(sample_x + 0.5f);
checkDescriptorLimits(x2, y2, options_.img_width, options_.img_height); checkDescriptorLimits(x2, y2, options_.img_width, options_.img_height);
fx = sample_x - x1; fx = sample_x - x1;
fy = sample_y - y1; fy = sample_y - y1;
res1 = *(evolution[level].Lx.ptr<float>(y1)+x1); res1 = *(evolution[level].Lx.ptr<float>(y1)+x1);
res2 = *(evolution[level].Lx.ptr<float>(y1)+x2); res2 = *(evolution[level].Lx.ptr<float>(y1)+x2);
res3 = *(evolution[level].Lx.ptr<float>(y2)+x1); res3 = *(evolution[level].Lx.ptr<float>(y2)+x1);
res4 = *(evolution[level].Lx.ptr<float>(y2)+x2); res4 = *(evolution[level].Lx.ptr<float>(y2)+x2);
rx = (1.0f - fx)*(1.0f - fy)*res1 + fx*(1.0f - fy)*res2 + (1.0f - fx)*fy*res3 + fx*fy*res4; rx = (1.0f - fx)*(1.0f - fy)*res1 + fx*(1.0f - fy)*res2 + (1.0f - fx)*fy*res3 + fx*fy*res4;
res1 = *(evolution[level].Ly.ptr<float>(y1)+x1); res1 = *(evolution[level].Ly.ptr<float>(y1)+x1);
res2 = *(evolution[level].Ly.ptr<float>(y1)+x2); res2 = *(evolution[level].Ly.ptr<float>(y1)+x2);
res3 = *(evolution[level].Ly.ptr<float>(y2)+x1); res3 = *(evolution[level].Ly.ptr<float>(y2)+x1);
res4 = *(evolution[level].Ly.ptr<float>(y2)+x2); res4 = *(evolution[level].Ly.ptr<float>(y2)+x2);
ry = (1.0f - fx)*(1.0f - fy)*res1 + fx*(1.0f - fy)*res2 + (1.0f - fx)*fy*res3 + fx*fy*res4; ry = (1.0f - fx)*(1.0f - fy)*res1 + fx*(1.0f - fy)*res2 + (1.0f - fx)*fy*res3 + fx*fy*res4;
rx = gauss_s1*rx; rx = gauss_s1*rx;

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

@ -358,9 +358,9 @@ void Decolor::grayImContruct(vector <double> &wei, const Mat &img, Mat &Gray) co
{ {
for(int i = 0;i<h;i++) for(int i = 0;i<h;i++)
for(int j=0;j<w;j++) for(int j=0;j<w;j++)
Gray.at<float>(i,j)=Gray.at<float>(i,j) + Gray.at<float>(i,j)=static_cast<float>(Gray.at<float>(i,j) +
static_cast<float>(wei[kk])*pow(rgb_channel[2].at<float>(i,j),r)*pow(rgb_channel[1].at<float>(i,j),g)* static_cast<float>(wei[kk])*pow(rgb_channel[2].at<float>(i,j),r)*pow(rgb_channel[1].at<float>(i,j),g)*
pow(rgb_channel[0].at<float>(i,j),b); pow(rgb_channel[0].at<float>(i,j),b));
kk=kk+1; kk=kk+1;
} }

2
modules/superres/src/btv_l1.cpp
View File

@ -356,7 +356,7 @@ namespace
for (int m = 0, ind = 0; m <= ksize; ++m) for (int m = 0, ind = 0; m <= ksize; ++m)
{ {
for (int l = ksize; l + m >= 0; --l, ++ind) for (int l = ksize; l + m >= 0; --l, ++ind)
btvWeights[ind] = pow(alpha_f, std::abs(m) + std::abs(l)); btvWeights[ind] = static_cast<float>(pow(alpha_f, std::abs(m) + std::abs(l)));
} }
} }

2
samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp
View File

@ -62,7 +62,7 @@ int main( int argc, char** argv )
{ {
float lambda_1 = myHarris_dst.at<Vec6f>(i, j)[0]; float lambda_1 = myHarris_dst.at<Vec6f>(i, j)[0];
float lambda_2 = myHarris_dst.at<Vec6f>(i, j)[1]; float lambda_2 = myHarris_dst.at<Vec6f>(i, j)[1];
Mc.at<float>(i, j) = lambda_1*lambda_2 - 0.04f*pow( ( lambda_1 + lambda_2 ), 2 ); Mc.at<float>(i, j) = lambda_1*lambda_2 - 0.04f*((lambda_1 + lambda_2) * (lambda_1 + lambda_2));
} }
} }