Merge remote-tracking branch 'origin/master' into merge-2.4

Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~

samples/cpp/lsd_lines.cpp

@@ -30,9 +30,9 @@ int main(int argc, char** argv)
 
     // Create and LSD detector with standard or no refinement.
 #if 1
-    Ptr<LineSegmentDetector> ls = createLineSegmentDetectorPtr(LSD_REFINE_STD);
+    Ptr<LineSegmentDetector> ls = createLineSegmentDetector(LSD_REFINE_STD);
 #else
-    Ptr<LineSegmentDetector> ls = createLineSegmentDetectorPtr(LSD_REFINE_NONE);
+    Ptr<LineSegmentDetector> ls = createLineSegmentDetector(LSD_REFINE_NONE);
 #endif
 
     double start = double(getTickCount());

samples/cpp/tutorial_code/photo/hdr_imaging/hdr_imaging.cpp

@@ -0,0 +1,53 @@
+#include <opencv2/photo.hpp>
+#include <opencv2/highgui.hpp>
+#include <vector>
+#include <iostream>
+#include <fstream>
+
+using namespace cv;
+using namespace std;
+
+void loadExposureSeq(String, vector<Mat>&, vector<float>&);
+
+int main(int, char**argv)
+{
+    vector<Mat> images;
+    vector<float> times;
+    loadExposureSeq(argv[1], images, times);
+
+    Mat response;
+    Ptr<CalibrateDebevec> calibrate = createCalibrateDebevec();
+    calibrate->process(images, response, times);
+
+    Mat hdr;
+    Ptr<MergeDebevec> merge_debevec = createMergeDebevec();
+    merge_debevec->process(images, hdr, times, response);
+
+    Mat ldr;
+    Ptr<TonemapDurand> tonemap = createTonemapDurand(2.2f);
+    tonemap->process(hdr, ldr);
+
+    Mat fusion;
+    Ptr<MergeMertens> merge_mertens = createMergeMertens();
+    merge_mertens->process(images, fusion);
+
+    imwrite("fusion.png", fusion * 255);
+    imwrite("ldr.png", ldr * 255);
+    imwrite("hdr.hdr", hdr);
+
+    return 0;
+}
+
+void loadExposureSeq(String path, vector<Mat>& images, vector<float>& times)
+{
+    path = path + std::string("/");
+    ifstream list_file((path + "list.txt").c_str());
+    string name;
+    float val;
+    while(list_file >> name >> val) {
+        Mat img = imread(path + name);
+        images.push_back(img);
+        times.push_back(1 / val);
+    }
+    list_file.close();
+}