From 09dd13d02e06e15653822928ffabf39ba8f1a185 Mon Sep 17 00:00:00 2001 From: Alexander Shishkov Date: Sun, 30 Oct 2011 15:08:44 +0000 Subject: [PATCH] fixed compilation problems after rev. 6925 --- .../OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp | 5 ++++- samples/cpp/retinaDemo.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp index 8377c21dba..536d4cdfb7 100644 --- a/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp +++ b/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp @@ -210,7 +210,10 @@ void drawPlot(const cv::Mat curve, const std::string figureTitle, const int lowe * -> if the last parameter is 'log', then activate log sampling (favour foveal vision and subsamples peripheral vision) */ if (useLogSampling) - retina = new cv::Retina(inputImage.size(), "retinaDefaultParameters_saveFile.xml", true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0); + { + retina = new cv::Retina(inputImage.size(),true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0); + retina->setup("retinaDefaultParameters_saveFile.xml"); + } else// -> else allocate "classical" retina : retina = new cv::Retina(inputImage.size(), "retinaDefaultParameters_saveFile.xml"); diff --git a/samples/cpp/retinaDemo.cpp b/samples/cpp/retinaDemo.cpp index 207c97f612..034fa3e048 100644 --- a/samples/cpp/retinaDemo.cpp +++ b/samples/cpp/retinaDemo.cpp @@ -107,7 +107,10 @@ int main(int argc, char* argv[]) { // if the last parameter is 'log', then activate log sampling (favour foveal vision and subsamples peripheral vision) if (useLogSampling) - myRetina = new cv::Retina(inputFrame.size(), "retinaDefaultParameters_saveFile.xml", true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0); + { + myRetina = new cv::Retina(inputFrame.size(), true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0); + myRetina->setup("retinaDefaultParameters_saveFile.xml"); + } else// -> else allocate "classical" retina : myRetina = new cv::Retina(inputFrame.size(), "retinaDefaultParameters_saveFile.xml");