From 924f7ce3739d2ba6f7db8428bf34331cf09ca259 Mon Sep 17 00:00:00 2001
From: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Tue, 3 Sep 2013 14:05:14 +0400
Subject: [PATCH] small changes for compilation
---
modules/photo/test/test_hdr.cpp | 2 +-
modules/python/src2/cv2.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/photo/test/test_hdr.cpp b/modules/photo/test/test_hdr.cpp
index a3d69900b..8494e81ac 100644
--- 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];
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
index ec13c8eac..8a231ef5a 100644
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -138,6 +138,7 @@ typedef Ptr<TonemapDurand> Ptr_TonemapDurand;
typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
typedef Ptr<AlignMTB> Ptr_AlignMTB;
typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
+typedef Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
typedef Ptr<MergeDebevec> Ptr_MergeDebevec;
typedef Ptr<MergeMertens> Ptr_MergeMertens;