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

12 years ago · e33a4f79f8
parent 85eb52b8af cb27740de4
commit e33a4f79f8
1 changed files with 1 additions and 1 deletions
--- a/modules/photo/test/test_hdr.cpp
+++ b/modules/photo/test/test_hdr.cpp
@ -79,7 +79,7 @@ void loadExposureSeq(String path, vector<Mat>& images, vector<float>& times = DE
 void loadResponseCSV(String path, Mat& response)
 {
 	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 c = 0; c < 3; c++) {
 			resp_file >> response.at<Vec3f>(i)[c];