mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

small changes for compilation

Browse Source
This commit is contained in:
Alexander Shishkov 2013-09-03 14:05:14 +04:00
parent 9f9873017c
commit 924f7ce373
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/photo/test/test_hdr.cpp
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];

1
modules/python/src2/cv2.cpp
View File

@ -138,6 +138,7 @@ typedef Ptr<TonemapDurand> Ptr_TonemapDurand;
typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk; typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
typedef Ptr<AlignMTB> Ptr_AlignMTB; typedef Ptr<AlignMTB> Ptr_AlignMTB;
typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec; typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
typedef Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
typedef Ptr<MergeDebevec> Ptr_MergeDebevec; typedef Ptr<MergeDebevec> Ptr_MergeDebevec;
typedef Ptr<MergeMertens> Ptr_MergeMertens; typedef Ptr<MergeMertens> Ptr_MergeMertens;