opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00
Code Issues Releases Wiki Activity

Fixed Warnings #1

Browse Source
This commit is contained in:
Vladimir
2015-06-09 11:31:10 +09:00
parent 303c1c507e
commit 603fb880e5
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/tracking/include/opencv2/tracking/tldDataset.hpp
View File

@@ -48,7 +48,7 @@ namespace cv
{
namespace tld
{
CV_EXPORTS cv::Rect2d tld_InitDataset(int datasetInd, char* rootPath = "TLD_dataset");
CV_EXPORTS cv::Rect2d tld_InitDataset(int datasetInd, const char* rootPath = "TLD_dataset");
CV_EXPORTS cv::Mat tld_getNextDatasetFrame();
}
}

18
modules/tracking/samples/tld_test.cpp
View File

@@ -93,7 +93,7 @@ static void onMouse(int event, int x, int y, int, void*)
}
}
int main(int argc, char** argv)
int main()
{
//
// "MIL", "BOOSTING", "MEDIANFLOW", "TLD"
@@ -152,12 +152,12 @@ int main(int argc, char** argv)
int frameCounter = 0;
//Time measurment
float e3 = getTickCount();
int64 e3 = getTickCount();
for (;;)
{
//Time measurment
float e1 = getTickCount();
int64 e1 = getTickCount();
//Frame num
frameCounter++;
if (frameCounter == NUM_TEST_FRAMES) break;
@@ -208,18 +208,18 @@ int main(int argc, char** argv)
//Time measurment
float e2 = getTickCount();
float t1 = (e2 - e1) / getTickFrequency();
cout << frameCounter << "\tframe : " << t1 * 1000 << "ms" << endl;
int64 e2 = getTickCount();
double t1 = (e2 - e1) / getTickFrequency();
cout << frameCounter << "\tframe : " << t1 * 1000.0 << "ms" << endl;
//waitKey(0);
}
}
//Time measurment
float e4 = getTickCount();
float t2 = (e4 - e3) / getTickFrequency();
cout << "Average Time for Frame: " << t2 * 1000 / frameCounter << "ms" << endl;
int64 e4 = getTickCount();
double t2 = (e4 - e3) / getTickFrequency();
cout << "Average Time for Frame: " << t2 * 1000.0 / frameCounter << "ms" << endl;
cout << "Average FPS: " << 1.0 / t2*frameCounter << endl;

2
modules/tracking/src/tldDataset.cpp
View File

@@ -49,7 +49,7 @@ namespace cv
int frameNum = 0;
bool flagPNG = false;
cv::Rect2d tld_InitDataset(int datasetInd, char* rootPath)
cv::Rect2d tld_InitDataset(int datasetInd,const char* rootPath)
{
char* folderName = "";
int x, y, w, h;

8
modules/tracking/src/tldModel.cpp
View File

@@ -263,11 +263,11 @@ namespace cv
(*proxyN)++;
}
void TrackerTLDModel::printme(FILE* port)
void TrackerTLDModel::printme(FILE* port)
{
//dfprintf((port, "TrackerTLDModel:\n"));
//dfprintf((port, "\tpositiveExamples.size() = %d\n", (int)positiveExamples.size()));
//dfprintf((port, "\tnegativeExamples.size() = %d\n", (int)negativeExamples.size()));
dfprintf((port, "TrackerTLDModel:\n"));
dfprintf((port, "\tpositiveExamples.size() = %d\n", (int)positiveExamples.size()));
dfprintf((port, "\tnegativeExamples.size() = %d\n", (int)negativeExamples.size()));
}

4
modules/tracking/src/tldTracker.cpp
View File

@@ -89,9 +89,7 @@ bool TrackerTLDImpl::initImpl(const Mat& image, const Rect2d& boundingBox)
myBoundingBox.width *= scale;
myBoundingBox.height *= scale;
}
model = Ptr<TrackerTLDModel>(new TrackerTLDModel(params, image_gray, myBoundingBox, data->getMinSize()));
TrackerTLDModel* tldModel = ((TrackerTLDModel*)static_cast<TrackerModel*>(model));
model = Ptr<TrackerTLDModel>(new TrackerTLDModel(params, image_gray, myBoundingBox, data->getMinSize()));
data->confident = false;
data->failedLastTime = false;