Merge branch 'devel' of https://github.com/f-morozov/opencv into devel

This commit is contained in:
Fedor Morozov 2013-09-05 14:49:18 +04:00
commit e33a4f79f8

View File

@ -79,7 +79,7 @@ void loadExposureSeq(String path, vector<Mat>& images, vector<float>& times = DE
void loadResponseCSV(String path, Mat& response) void loadResponseCSV(String path, Mat& response)
{ {
response = Mat(256, 1, CV_32FC3); response = Mat(256, 1, CV_32FC3);
ifstream resp_file(path); ifstream resp_file(path.c_str());
for(int i = 0; i < 256; i++) { for(int i = 0; i < 256; i++) {
for(int c = 0; c < 3; c++) { for(int c = 0; c < 3; c++) {
resp_file >> response.at<Vec3f>(i)[c]; resp_file >> response.at<Vec3f>(i)[c];