Skip to content

Commit 7e934bf

Browse files
Auron-XAuron-X
committed
Warnings Fix #1 
1 parent d82f20a commit 7e934bf

File tree

5 files changed

+50
-42
lines changed

5 files changed

+50
-42
lines changed

‎modules/tracking/include/opencv2/tracking/tracker.hpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,11 +1251,16 @@ class CV_EXPORTS_W MultiTracker
12511251
{
12521252
public:
12531253

1254+
MultiTracker()
1255+
{
1256+
targetNum = 0;
1257+
}
1258+
12541259
bool addTarget(const Mat& image, const Rect2d& boundingBox, char* tracker_algorithm_name);
12551260

12561261
bool update(const Mat& image);
12571262

1258-
int targetNum = 0;
1263+
int targetNum;
12591264
std::vector <Ptr<Tracker> > trackers;
12601265
std::vector <Rect2d> boundingBoxes;
12611266
std::vector<Scalar> colors;

‎modules/tracking/samples/multiTracker_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int main()
9898
//
9999
// "MIL", "BOOSTING", "MEDIANFLOW", "TLD"
100100
//
101-
char* tracker_algorithm_name = "TLD";
101+
const char* tracker_algorithm_name = "TLD";
102102

103103
Mat frame;
104104
paused = false;

‎modules/tracking/src/multiTracker.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace cv
7676
bool MultiTracker::update(const Mat& image)
7777
{
7878
printf("Naive-Loop MO-TLD Update....\n");
79-
for (int i = 0; i < trackers.size(); i++)
79+
for (int i = 0; i < (int)trackers.size(); i++)
8080
if (!trackers[i]->update(image, boundingBoxes[i]))
8181
return false;
8282

@@ -132,11 +132,11 @@ namespace cv
132132
for (int k = 0; k < targetNum; k++)
133133
{
134134
//TLD Tracker data extraction
135-
Tracker* trackerPtr = trackers[k];
136-
tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
135+
trackerPtr = trackers[k];
136+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
137137
//TLD Model Extraction
138-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
139-
Ptr<tld::Data> data = tracker->data;
138+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
139+
data = tracker->data;
140140

141141
data->frameNum++;
142142

@@ -254,7 +254,7 @@ namespace cv
254254
//Debug display candidates after Variance Filter
255255
////////////////////////////////////////////////
256256
Mat tmpImg = image;
257-
for (int i = 0; i < debugStack[0].size(); i++)
257+
for (int i = 0; i < (int)debugStack[0].size(); i++)
258258
//rectangle(tmpImg, debugStack[0][i], Scalar(255, 255, 255), 1, 1, 0);
259259
debugStack[0].clear();
260260
tmpImg.copyTo(image);
@@ -272,7 +272,7 @@ namespace cv
272272
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
273273
Size initSize = tldModel->getMinSize();
274274

275-
for (int k = 0; k < trackers.size(); k++)
275+
for (int k = 0; k < (int)trackers.size(); k++)
276276
patches[k].clear();
277277

278278
Mat_<uchar> standardPatch(tld::STANDARD_PATCH_SIZE, tld::STANDARD_PATCH_SIZE);
@@ -331,13 +331,13 @@ namespace cv
331331
double windowVar = p2 - p * p;
332332

333333
//Loop for on all objects
334-
for (int k=0; k < trackers.size(); k++)
334+
for (int k = 0; k < (int)trackers.size(); k++)
335335
{
336336
//TLD Tracker data extraction
337-
Tracker* trackerPtr = trackers[k];
338-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
337+
trackerPtr = trackers[k];
338+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
339339
//TLD Model Extraction
340-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
340+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
341341

342342
//Optimized variance calculation
343343
bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr);
@@ -373,13 +373,13 @@ namespace cv
373373

374374
//Encsemble classification
375375
//e1 = getTickCount();
376-
for (int k = 0; k < trackers.size(); k++)
376+
for (int k = 0; k < (int)trackers.size(); k++)
377377
{
378378
//TLD Tracker data extraction
379-
Tracker* trackerPtr = trackers[k];
380-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
379+
trackerPtr = trackers[k];
380+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
381381
//TLD Model Extraction
382-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
382+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
383383

384384

385385
for (int i = 0; i < (int)varBuffer[k].size(); i++)
@@ -435,13 +435,13 @@ namespace cv
435435

436436
//NN classification
437437
//e1 = getTickCount();
438-
for (int k = 0; k < trackers.size(); k++)
438+
for (int k = 0; k < (int)trackers.size(); k++)
439439
{
440440
//TLD Tracker data extraction
441-
Tracker* trackerPtr = trackers[k];
442-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
441+
trackerPtr = trackers[k];
442+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
443443
//TLD Model Extraction
444-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
444+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
445445

446446
npos = 0;
447447
nneg = 0;
@@ -508,7 +508,7 @@ namespace cv
508508
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
509509
Size initSize = tldModel->getMinSize();
510510

511-
for (int k = 0; k < trackers.size(); k++)
511+
for (int k = 0; k < (int)trackers.size(); k++)
512512
patches[k].clear();
513513

514514
Mat_<uchar> standardPatch(tld::STANDARD_PATCH_SIZE, tld::STANDARD_PATCH_SIZE);
@@ -567,13 +567,13 @@ namespace cv
567567
double windowVar = p2 - p * p;
568568

569569
//Loop for on all objects
570-
for (int k = 0; k < trackers.size(); k++)
570+
for (int k = 0; k < (int)trackers.size(); k++)
571571
{
572572
//TLD Tracker data extraction
573-
Tracker* trackerPtr = trackers[k];
574-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
573+
trackerPtr = trackers[k];
574+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
575575
//TLD Model Extraction
576-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
576+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
577577

578578
//Optimized variance calculation
579579
bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr);
@@ -609,13 +609,13 @@ namespace cv
609609

610610
//Encsemble classification
611611
//e1 = getTickCount();
612-
for (int k = 0; k < trackers.size(); k++)
612+
for (int k = 0; k < (int)trackers.size(); k++)
613613
{
614614
//TLD Tracker data extraction
615-
Tracker* trackerPtr = trackers[k];
616-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
615+
trackerPtr = trackers[k];
616+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
617617
//TLD Model Extraction
618-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
618+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
619619

620620

621621
for (int i = 0; i < (int)varBuffer[k].size(); i++)
@@ -670,13 +670,13 @@ namespace cv
670670

671671
//NN classification
672672
//e1 = getTickCount();
673-
for (int k = 0; k < trackers.size(); k++)
673+
for (int k = 0; k < (int)trackers.size(); k++)
674674
{
675675
//TLD Tracker data extraction
676-
Tracker* trackerPtr = trackers[k];
677-
cv::tld::TrackerTLDImpl* tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
676+
trackerPtr = trackers[k];
677+
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
678678
//TLD Model Extraction
679-
tld::TrackerTLDModel* tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
679+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
680680
//Size InitSize = tldModel->getMinSize();
681681
npos = 0;
682682
nneg = 0;

‎modules/tracking/src/tldDataset.cpp‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace cv
5151
bool flagVOT = false;
5252

5353
//TLD Dataset Parameters
54-
char* tldFolderName[10] = {
54+
const char* tldFolderName[10] = {
5555
"01_david",
5656
"02_jumping",
5757
"03_pedestrian1",
@@ -63,7 +63,7 @@ namespace cv
6363
"09_carchase",
6464
"10_panda"
6565
};
66-
char* votFolderName[60] = {
66+
const char* votFolderName[60] = {
6767
"bag", "ball1", "ball2", "basketball", "birds1", "birds2", "blanket", "bmx", "bolt1", "bolt2",
6868
"book", "butterfly", "car1", "car2", "crossing", "dinosaur", "fernando", "fish1", "fish2", "fish3",
6969
"fish4", "girl", "glove", "godfather", "graduate", "gymnastics1", "gymnastics2 ", "gymnastics3", "gymnastics4", "hand",
@@ -72,11 +72,11 @@ namespace cv
7272
"singer2", "singer3", "soccer1", "soccer2", "soldier", "sphere", "tiger", "traffic", "tunnel", "wiper"
7373
};
7474

75-
Rect2d tldInitBB[10] = {
75+
const Rect2d tldInitBB[10] = {
7676
Rect2d(165, 93, 51, 54), Rect2d(147, 110, 33, 32), Rect2d(47, 51, 21, 36), Rect2d(130, 134, 21, 53), Rect2d(154, 102, 24, 52),
7777
Rect2d(142, 125, 90, 39), Rect2d(290, 43, 23, 40), Rect2d(273, 77, 27, 25), Rect2d(337, 219, 54, 37), Rect2d(58, 100, 27, 22)
7878
};
79-
Rect2d votInitBB[60] = {
79+
const Rect2d votInitBB[60] = {
8080
Rect2d(142, 125, 90, 39), Rect2d(490, 400, 40, 40), Rect2d(273, 77, 27, 25), Rect2d(145, 84, 54, 37), Rect2d(58, 100, 27, 22),
8181
Rect2d(450, 380, 60, 60), Rect2d(290, 43, 23, 40), Rect2d(273, 77, 27, 25), Rect2d(225, 175, 50, 50), Rect2d(58, 100, 27, 22),
8282

@@ -118,7 +118,10 @@ namespace cv
118118
cv::Rect2d tld_InitDataset(int videoInd, const char* rootPath, int datasetInd)
119119
{
120120
char* folderName = (char *)"";
121-
int x, y, w, h;
121+
int x = 0,
122+
y = 0,
123+
w = 0,
124+
h = 0;
122125

123126
//Index range
124127
// 1-10 TLD Dataset
@@ -127,7 +130,7 @@ namespace cv
127130

128131
if (datasetInd == 0)
129132
{
130-
folderName = tldFolderName[id];
133+
folderName = (char*)tldFolderName[id];
131134
x = tldInitBB[id].x;
132135
y = tldInitBB[id].y;
133136
w = tldInitBB[id].width;
@@ -138,7 +141,7 @@ namespace cv
138141
}
139142
if (datasetInd == 1)
140143
{
141-
folderName = votFolderName[id];
144+
folderName = (char*)votFolderName[id];
142145
x = votInitBB[id].x;
143146
y = votInitBB[id].y;
144147
w = votInitBB[id].width;

‎modules/tracking/src/tldTracker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
238238
//Debug display candidates after Variance Filter
239239
////////////////////////////////////////////////
240240
Mat tmpImg = image;
241-
for (int i = 0; i < tldModel->detector->debugStack[0].size(); i++)
241+
for (int i = 0; i < (int)tldModel->detector->debugStack[0].size(); i++)
242242
//rectangle(tmpImg, tldModel->detector->debugStack[0][i], Scalar(255, 255, 255), 1, 1, 0);
243243
tldModel->detector->debugStack[0].clear();
244244
tmpImg.copyTo(image);

0 commit comments

Comments
 (0)