Merge pull request #861 from albenoit:master

modules/contrib/src/retinacolor.cpp

@@ -338,8 +338,11 @@ void RetinaColor::runColorDemultiplexing(const std::valarray<float> &multiplexed
         }
 
         // compute the gradient of the luminance
+#ifdef MAKE_PARALLEL // call the TemplateBuffer TBB clipping method
+        cv::parallel_for_(cv::Range(2,_filterOutput.getNBrows()-2), Parallel_computeGradient(_filterOutput.getNBcolumns(), _filterOutput.getNBrows(), &(*_luminance)[0], &_imageGradient[0]));
+#else
         _computeGradient(&(*_luminance)[0]);
-
+#endif
         // adaptively filter the submosaics to get the adaptive densities, here the buffer _chrominance is used as a temp buffer
         _adaptiveSpatialLPfilter(&_RGBmosaic[0], &_chrominance[0]);
         _adaptiveSpatialLPfilter(&_RGBmosaic[0]+_filterOutput.getNBpixels(), &_chrominance[0]+_filterOutput.getNBpixels());

modules/contrib/src/retinacolor.hpp

@@ -333,6 +333,53 @@ namespace cv
                 }
             }
         };
+
+        class Parallel_computeGradient: public cv::ParallelLoopBody
+        {
+        private:
+            float *imageGradient;
+            const float *luminance;
+            unsigned int nbColumns, doubleNbColumns, nbRows, nbPixels;
+        public:
+            Parallel_computeGradient(const unsigned int nbCols, const unsigned int nbRws, const float *lum, float *imageGrad)
+            :imageGradient(imageGrad), luminance(lum), nbColumns(nbCols), doubleNbColumns(2*nbCols), nbRows(nbRws), nbPixels(nbRws*nbCols){};
+
+            virtual void operator()( const Range& r ) const {
+                for (int idLine=r.start;idLine!=r.end;++idLine)
+                {
+                    for (unsigned int idColumn=2;idColumn<nbColumns-2;++idColumn)
+                    {
+                        const unsigned int pixelIndex=idColumn+nbColumns*idLine;
+
+                        // horizontal and vertical local gradients
+                        const float verticalGrad=fabs(luminance[pixelIndex+nbColumns]-luminance[pixelIndex-nbColumns]);
+                        const float horizontalGrad=fabs(luminance[pixelIndex+1]-luminance[pixelIndex-1]);
+
+                        // neighborhood horizontal and vertical gradients
+                        const float verticalGrad_p=fabs(luminance[pixelIndex]-luminance[pixelIndex-doubleNbColumns]);
+                        const float horizontalGrad_p=fabs(luminance[pixelIndex]-luminance[pixelIndex-2]);
+                        const float verticalGrad_n=fabs(luminance[pixelIndex+doubleNbColumns]-luminance[pixelIndex]);
+                        const float horizontalGrad_n=fabs(luminance[pixelIndex+2]-luminance[pixelIndex]);
+
+                        const float horizontalGradient=0.5f*horizontalGrad+0.25f*(horizontalGrad_p+horizontalGrad_n);
+                        const float verticalGradient=0.5f*verticalGrad+0.25f*(verticalGrad_p+verticalGrad_n);
+
+                        // compare local gradient means and fill the appropriate filtering coefficient value that will be used in adaptative filters
+                        if (horizontalGradient<verticalGradient)
+                        {
+                            imageGradient[pixelIndex+nbPixels]=0.06f;
+                            imageGradient[pixelIndex]=0.57f;
+                        }
+                        else
+                        {
+                            imageGradient[pixelIndex+nbPixels]=0.57f;
+                            imageGradient[pixelIndex]=0.06f;
+                        }
+                    }
+                }
+            }
+        };
+
 #endif
     };
 }

samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp

@@ -211,10 +211,10 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i
           */
          if (useLogSampling)
                 {
-                     retina = new cv::Retina(inputImage.size(),true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
+                     retina = cv::createRetina(inputImage.size(),true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
                  }
          else// -> else allocate "classical" retina :
-             retina = new cv::Retina(inputImage.size());
+             retina = cv::createRetina(inputImage.size());
 
         // save default retina parameters file in order to let you see this and maybe modify it and reload using method "setup"
         retina->write("RetinaDefaultParameters.xml");

samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp

@@ -280,10 +280,10 @@ static void loadNewFrame(const std::string filenamePrototype, const int currentF
           */
          if (useLogSampling)
                 {
-                     retina = new cv::Retina(inputImage.size(),true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
+                     retina = cv::createRetina(inputImage.size(),true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
                  }
          else// -> else allocate "classical" retina :
-             retina = new cv::Retina(inputImage.size());
+             retina = cv::createRetina(inputImage.size());
 
         // save default retina parameters file in order to let you see this and maybe modify it and reload using method "setup"
         retina->write("RetinaDefaultParameters.xml");

samples/cpp/retinaDemo.cpp

@@ -111,10 +111,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(), true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
+                        myRetina = cv::createRetina(inputFrame.size(), true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
                 }
         else// -> else allocate "classical" retina :
-            myRetina = new cv::Retina(inputFrame.size());
+            myRetina = cv::createRetina(inputFrame.size());
 
         // save default retina parameters file in order to let you see this and maybe modify it and reload using method "setup"
         myRetina->write("RetinaDefaultParameters.xml");

samples/cpp/tutorial_code/contrib/retina_tutorial.cpp

@@ -39,7 +39,7 @@ int main(int argc, char* argv[]) {
     // welcome message
     std::cout<<"****************************************************"<<std::endl;
     std::cout<<"* Retina demonstration : demonstrates the use of is a wrapper class of the Gipsa/Listic Labs retina model."<<std::endl;
-    std::cout<<"* This demo will try to load the file 'RetinaSpecificParameters.xml' (if exists).\nTo create it, copy the autogenerated template 'RetinaDefaultParameters.xml'.\nThen twaek it with your own retina parameters."<<std::endl;
+    std::cout<<"* This demo will try to load the file 'RetinaSpecificParameters.xml' (if exists).\nTo create it, copy the autogenerated template 'RetinaDefaultParameters.xml'.\nThen tweak it with your own retina parameters."<<std::endl;
     // basic input arguments checking
     if (argc<2)
     {
@@ -100,10 +100,12 @@ 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(), true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
+            myRetina = cv::createRetina(inputFrame.size(), true, cv::RETINA_COLOR_BAYER, true, 2.0, 10.0);
         }
         else// -> else allocate "classical" retina :
-            myRetina = new cv::Retina(inputFrame.size());
+        {
+            myRetina = cv::createRetina(inputFrame.size());
+        }
 
         // save default retina parameters file in order to let you see this and maybe modify it and reload using method "setup"
         myRetina->write("RetinaDefaultParameters.xml");
@@ -137,7 +139,7 @@ int main(int argc, char* argv[]) {
         }
     }catch(cv::Exception e)
     {
-        std::cerr<<"Error using Retina : "<<e.what()<<std::endl;
+        std::cerr<<"Error using Retina or end of video sequence reached : "<<e.what()<<std::endl;
     }
 
     // Program end message