Skip to content

Commit c743244

Browse files
Auron-XAuron-X
committed
Warnings Fix #1 
1 parent 36f8dc2 commit c743244

File tree

4 files changed

+33
-17
lines changed

4 files changed

+33
-17
lines changed

‎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: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ namespace cv
7575

7676
bool MultiTracker::update(const Mat& image)
7777
{
78+
printf("Naive-Loop MO-TLD Update....\n");
7879
for (int i = 0; i < (int)trackers.size(); i++)
7980
if (!trackers[i]->update(image, boundingBoxes[i]))
8081
return false;
@@ -130,7 +131,7 @@ namespace cv
130131
trackerPtr = trackers[k];
131132
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
132133
//TLD Model Extraction
133-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
134+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
134135
data = tracker->data;
135136

136137
data->frameNum++;
@@ -236,7 +237,14 @@ namespace cv
236237

237238

238239
}
239-
240+
//Debug display candidates after Variance Filter
241+
////////////////////////////////////////////////
242+
Mat tmpImg = image;
243+
for (int i = 0; i < (int)debugStack[0].size(); i++)
244+
//rectangle(tmpImg, debugStack[0][i], Scalar(255, 255, 255), 1, 1, 0);
245+
debugStack[0].clear();
246+
tmpImg.copyTo(image);
247+
////////////////////////////////////////////////
240248
return true;
241249
}
242250

@@ -311,7 +319,7 @@ namespace cv
311319
trackerPtr = trackers[k];
312320
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
313321
//TLD Model Extraction
314-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
322+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
315323

316324
//Optimized variance calculation
317325
bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr);
@@ -334,13 +342,14 @@ namespace cv
334342
} while (size.width >= initSize.width && size.height >= initSize.height);
335343

336344
//Encsemble classification
345+
//e1 = getTickCount();
337346
for (int k = 0; k < (int)trackers.size(); k++)
338347
{
339348
//TLD Tracker data extraction
340349
trackerPtr = trackers[k];
341350
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
342351
//TLD Model Extraction
343-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
352+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
344353

345354

346355
for (int i = 0; i < (int)varBuffer[k].size(); i++)
@@ -376,13 +385,14 @@ namespace cv
376385
}
377386

378387
//NN classification
388+
//e1 = getTickCount();
379389
for (int k = 0; k < (int)trackers.size(); k++)
380390
{
381391
//TLD Tracker data extraction
382392
trackerPtr = trackers[k];
383393
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
384394
//TLD Model Extraction
385-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
395+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
386396

387397
npos = 0;
388398
nneg = 0;
@@ -505,7 +515,7 @@ namespace cv
505515
trackerPtr = trackers[k];
506516
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
507517
//TLD Model Extraction
508-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
518+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
509519

510520
//Optimized variance calculation
511521
bool varPass = (windowVar > tld::VARIANCE_THRESHOLD * *tldModel->detector->originalVariancePtr);
@@ -528,13 +538,14 @@ namespace cv
528538
} while (size.width >= initSize.width && size.height >= initSize.height);
529539

530540
//Encsemble classification
541+
//e1 = getTickCount();
531542
for (int k = 0; k < (int)trackers.size(); k++)
532543
{
533544
//TLD Tracker data extraction
534545
trackerPtr = trackers[k];
535546
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
536547
//TLD Model Extraction
537-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
548+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
538549

539550

540551
for (int i = 0; i < (int)varBuffer[k].size(); i++)
@@ -570,13 +581,15 @@ namespace cv
570581
}
571582

572583
//NN classification
584+
//e1 = getTickCount();
573585
for (int k = 0; k < (int)trackers.size(); k++)
574586
{
575587
//TLD Tracker data extraction
576588
trackerPtr = trackers[k];
577589
tracker = static_cast<tld::TrackerTLDImpl*>(trackerPtr);
578590
//TLD Model Extraction
579-
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->getModel()));
591+
tldModel = ((tld::TrackerTLDModel*)static_cast<TrackerModel*>(tracker->model));
592+
//Size InitSize = tldModel->getMinSize();
580593
npos = 0;
581594
nneg = 0;
582595
maxSc = -5.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)