Skip to content

Commit f1bdc02

Browse files
committed
Warnings fixes opencv#1
1 parent e563256 commit f1bdc02

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

modules/tracking/src/gtrTracker.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,25 +132,24 @@ namespace cv
132132
Rect2d prevBB = ((TrackerGOTURNModel*)static_cast<TrackerModel*>(model))->getBoundingBox();
133133
Rect2d curBB;
134134

135-
float padTarget = 2.0;
136-
float padSearch = 2.0;
135+
float padTargetPatch = 2.0;
137136
Rect2f searchPatchRect, targetPatchRect;
138137
Point2f currCenter, prevCenter;
139138
Mat prevFramePadded, curFramePadded;
140139
Mat searchPatch, targetPatch;
141140

142-
prevCenter.x = prevBB.x + prevBB.width / 2;
143-
prevCenter.y = prevBB.y + prevBB.height / 2;
141+
prevCenter.x = (float)(prevBB.x + prevBB.width / 2);
142+
prevCenter.y = (float)(prevBB.y + prevBB.height / 2);
144143

145-
targetPatchRect.width = (float)(prevBB.width*padTarget);
146-
targetPatchRect.height = (float)(prevBB.height*padTarget);
147-
targetPatchRect.x = (float)(prevCenter.x - prevBB.width*padTarget / 2.0 + targetPatchRect.width);
148-
targetPatchRect.y = (float)(prevCenter.y - prevBB.height*padTarget / 2.0 + targetPatchRect.height);
144+
targetPatchRect.width = (float)(prevBB.width*padTargetPatch);
145+
targetPatchRect.height = (float)(prevBB.height*padTargetPatch);
146+
targetPatchRect.x = (float)(prevCenter.x - prevBB.width*padTargetPatch / 2.0 + targetPatchRect.width);
147+
targetPatchRect.y = (float)(prevCenter.y - prevBB.height*padTargetPatch / 2.0 + targetPatchRect.height);
149148

150-
copyMakeBorder(prevFrame, prevFramePadded, targetPatchRect.height, targetPatchRect.height, targetPatchRect.width, targetPatchRect.width, BORDER_REPLICATE);
149+
copyMakeBorder(prevFrame, prevFramePadded, (int)targetPatchRect.height, (int)targetPatchRect.height, (int)targetPatchRect.width, (int)targetPatchRect.width, BORDER_REPLICATE);
151150
targetPatch = prevFramePadded(targetPatchRect).clone();
152151

153-
copyMakeBorder(curFrame, curFramePadded, targetPatchRect.height, targetPatchRect.height, targetPatchRect.width, targetPatchRect.width, BORDER_REPLICATE);
152+
copyMakeBorder(curFrame, curFramePadded, (int)targetPatchRect.height, (int)targetPatchRect.height, (int)targetPatchRect.width, (int)targetPatchRect.width, BORDER_REPLICATE);
154153
searchPatch = curFramePadded(targetPatchRect).clone();
155154

156155
resize(targetPatch, targetPatch, Size(INPUT_SIZE, INPUT_SIZE));

modules/tracking/src/gtrUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace cv
9292
targetPatchRect.x = (float)(prevCenter.x - prevBB.width*padTarget / 2.0 + targetPatchRect.width);
9393
targetPatchRect.y = (float)(prevCenter.y - prevBB.height*padTarget / 2.0 + targetPatchRect.height);
9494

95-
copyMakeBorder(prevFrame, prevFramePadded, targetPatchRect.height, targetPatchRect.height, targetPatchRect.width, targetPatchRect.width, BORDER_REPLICATE);
95+
copyMakeBorder(prevFrame, prevFramePadded, (int)targetPatchRect.height, (int)targetPatchRect.height, (int)targetPatchRect.width, (int)targetPatchRect.width, BORDER_REPLICATE);
9696

9797
targetPatch = prevFramePadded(targetPatchRect);
9898

@@ -123,7 +123,7 @@ namespace cv
123123
searchPatchRect.height =(float)(prevBB.height*padSearch*ds);
124124
searchPatchRect.x = (float)(currCenter.x + dx - searchPatchRect.width / 2.0 + searchPatchRect.width);
125125
searchPatchRect.y = (float)(currCenter.y + dy - searchPatchRect.height / 2.0 + searchPatchRect.height);
126-
copyMakeBorder(currFrame, currFramePadded, searchPatchRect.height, searchPatchRect.height, searchPatchRect.width, searchPatchRect.width, BORDER_REPLICATE);
126+
copyMakeBorder(currFrame, currFramePadded, (int)searchPatchRect.height, (int)searchPatchRect.height, (int)searchPatchRect.width, (int)searchPatchRect.width, BORDER_REPLICATE);
127127
searchPatch = currFramePadded(searchPatchRect);
128128

129129
//Calculate Relative GTBB in search patch

0 commit comments

Comments
 (0)