Skip to content

Commit 70a2bca

Browse files
lluisgomezlluisgomez
committed
fix warnings from MSVC
1 parent b56353a commit 70a2bca

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎modules/text/src/erfilter.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,14 +2786,14 @@ bool guo_hall_thinning(const Mat1b & img, Mat& skeleton)
27862786
if (*skeleton_ptr++ == 255)
27872787
{
27882788
bool p2, p3, p4, p5, p6, p7, p8, p9;
2789-
p2 = (bool)(skeleton.data[(row-1) * skeleton.cols + col]);
2790-
p3 = (bool)(skeleton.data[(row-1) * skeleton.cols + col+1]);
2791-
p4 = (bool)(skeleton.data[row * skeleton.cols + col+1]);
2792-
p5 = (bool)(skeleton.data[(row+1) * skeleton.cols + col+1]);
2793-
p6 = (bool)(skeleton.data[(row+1) * skeleton.cols + col]);
2794-
p7 = (bool)(skeleton.data[(row+1) * skeleton.cols + col-1]);
2795-
p8 = (bool)(skeleton.data[row * skeleton.cols + col-1]);
2796-
p9 = (bool)(skeleton.data[(row-1) * skeleton.cols + col-1]);
2789+
p2 = (skeleton.data[(row-1) * skeleton.cols + col]) > 0;
2790+
p3 = (skeleton.data[(row-1) * skeleton.cols + col+1]) > 0;
2791+
p4 = (skeleton.data[row * skeleton.cols + col+1]) > 0;
2792+
p5 = (skeleton.data[(row+1) * skeleton.cols + col+1]) > 0;
2793+
p6 = (skeleton.data[(row+1) * skeleton.cols + col]) > 0;
2794+
p7 = (skeleton.data[(row+1) * skeleton.cols + col-1]) > 0;
2795+
p8 = (skeleton.data[row * skeleton.cols + col-1]) > 0;
2796+
p9 = (skeleton.data[(row-1) * skeleton.cols + col-1]) > 0;
27972797

27982798
int C = (!p2 & (p3 | p4)) + (!p4 & (p5 | p6)) +
27992799
(!p6 & (p7 | p8)) + (!p8 & (p9 | p2));
@@ -2816,7 +2816,7 @@ bool guo_hall_thinning(const Mat1b & img, Mat& skeleton)
28162816
for (unsigned int pt_idx = 0; pt_idx < rows_to_set_size; ++pt_idx)
28172817
{
28182818
if (!changed)
2819-
changed = (bool)(skeleton.data[rows_to_set[pt_idx] * skeleton.cols + cols_to_set[pt_idx]]);
2819+
changed = (skeleton.data[rows_to_set[pt_idx] * skeleton.cols + cols_to_set[pt_idx]]) > 0;
28202820

28212821
int key = rows_to_set[pt_idx] * skeleton.cols + cols_to_set[pt_idx];
28222822
skeleton.data[key] = 0;
@@ -3938,21 +3938,21 @@ void erGroupingNM(InputArray _img, InputArrayOfArrays _src, vector< vector<ERSta
39383938
regions[c].push_back(aux_regions[r]);
39393939
for (size_t j=0; j<valid_sequences[i].triplets.size(); j++)
39403940
{
3941-
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].a, Vec2i(c,(int)regions[c].size()-1)))
3941+
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].a, Vec2i((int)c,(int)(regions[c].size())-1)))
39423942
{
39433943
if (regions[valid_sequences[i].triplets[j].a[0]][valid_sequences[i].triplets[j].a[1]].rect.x > aux_regions[r].rect.x)
39443944
right_couples.push_back(Vec3i(regions[valid_sequences[i].triplets[j].a[0]][valid_sequences[i].triplets[j].a[1]].rect.x - aux_regions[r].rect.x, valid_sequences[i].triplets[j].a[0],valid_sequences[i].triplets[j].a[1]));
39453945
else
39463946
left_couples.push_back(Vec3i(aux_regions[r].rect.x - regions[valid_sequences[i].triplets[j].a[0]][valid_sequences[i].triplets[j].a[1]].rect.x, valid_sequences[i].triplets[j].a[0],valid_sequences[i].triplets[j].a[1]));
39473947
}
3948-
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].b, Vec2i(c,(int)regions[c].size()-1)))
3948+
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].b, Vec2i((int)c,(int)(regions[c].size())-1)))
39493949
{
39503950
if (regions[valid_sequences[i].triplets[j].b[0]][valid_sequences[i].triplets[j].b[1]].rect.x > aux_regions[r].rect.x)
39513951
right_couples.push_back(Vec3i(regions[valid_sequences[i].triplets[j].b[0]][valid_sequences[i].triplets[j].b[1]].rect.x - aux_regions[r].rect.x, valid_sequences[i].triplets[j].b[0],valid_sequences[i].triplets[j].b[1]));
39523952
else
39533953
left_couples.push_back(Vec3i(aux_regions[r].rect.x - regions[valid_sequences[i].triplets[j].b[0]][valid_sequences[i].triplets[j].b[1]].rect.x, valid_sequences[i].triplets[j].b[0],valid_sequences[i].triplets[j].b[1]));
39543954
}
3955-
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].c, Vec2i(c,(int)regions[c].size()-1)))
3955+
if (isValidPair(grey, lab, mask, src, regions, valid_sequences[i].triplets[j].c, Vec2i((int)c,(int)(regions[c].size())-1)))
39563956
{
39573957
if (regions[valid_sequences[i].triplets[j].c[0]][valid_sequences[i].triplets[j].c[1]].rect.x > aux_regions[r].rect.x)
39583958
right_couples.push_back(Vec3i(regions[valid_sequences[i].triplets[j].c[0]][valid_sequences[i].triplets[j].c[1]].rect.x - aux_regions[r].rect.x, valid_sequences[i].triplets[j].c[0],valid_sequences[i].triplets[j].c[1]));
@@ -3967,8 +3967,8 @@ void erGroupingNM(InputArray _img, InputArrayOfArrays _src, vector< vector<ERSta
39673967
{
39683968
sort(left_couples.begin(), left_couples.end(), sort_couples);
39693969
sort(right_couples.begin(), right_couples.end(), sort_couples);
3970-
region_pair pair1(Vec2i(left_couples[0][1],left_couples[0][2]),Vec2i(c,(int)regions[c].size()-1));
3971-
region_pair pair2(Vec2i(c,(int)regions[c].size()-1), Vec2i(right_couples[0][1],right_couples[0][2]));
3970+
region_pair pair1(Vec2i(left_couples[0][1],left_couples[0][2]),Vec2i((int)c,(int)(regions[c].size())-1));
3971+
region_pair pair2(Vec2i((int)c,(int)(regions[c].size())-1), Vec2i(right_couples[0][1],right_couples[0][2]));
39723972
region_triplet triplet(Vec2i(0,0),Vec2i(0,0),Vec2i(0,0));
39733973
if (isValidTriplet(regions, pair1, pair2, triplet))
39743974
{
@@ -3978,7 +3978,7 @@ void erGroupingNM(InputArray _img, InputArrayOfArrays _src, vector< vector<ERSta
39783978
else if (right_couples.size() >= 2)
39793979
{
39803980
sort(right_couples.begin(), right_couples.end(), sort_couples);
3981-
region_pair pair1(Vec2i(c,(int)regions[c].size()-1), Vec2i(right_couples[0][1],right_couples[0][2]));
3981+
region_pair pair1(Vec2i((int)c,(int)(regions[c].size())-1), Vec2i(right_couples[0][1],right_couples[0][2]));
39823982
region_pair pair2(Vec2i(right_couples[0][1],right_couples[0][2]), Vec2i(right_couples[1][1],right_couples[1][2]));
39833983
region_triplet triplet(Vec2i(0,0),Vec2i(0,0),Vec2i(0,0));
39843984
if (isValidTriplet(regions, pair1, pair2, triplet))
@@ -3990,7 +3990,7 @@ void erGroupingNM(InputArray _img, InputArrayOfArrays _src, vector< vector<ERSta
39903990
{
39913991
sort(left_couples.begin(), left_couples.end(), sort_couples);
39923992
region_pair pair1(Vec2i(left_couples[1][1],left_couples[1][2]), Vec2i(left_couples[0][1],left_couples[0][2]));
3993-
region_pair pair2(Vec2i(left_couples[0][1],left_couples[0][2]),Vec2i(c,(int)regions[c].size()-1));
3993+
region_pair pair2(Vec2i(left_couples[0][1],left_couples[0][2]),Vec2i((int)c,(int)(regions[c].size())-1));
39943994
region_triplet triplet(Vec2i(0,0),Vec2i(0,0),Vec2i(0,0));
39953995
if (isValidTriplet(regions, pair1, pair2, triplet))
39963996
{

0 commit comments

Comments
 (0)