diff --git a/doc/tutorials/contrib/retina_model/retina_model.rst b/doc/tutorials/contrib/retina_model/retina_model.rst
index 9d0bd65cb..6e548771f 100644
--- a/doc/tutorials/contrib/retina_model/retina_model.rst
+++ b/doc/tutorials/contrib/retina_model/retina_model.rst
@@ -328,19 +328,19 @@ Once done open the configuration file *RetinaDefaultParameters.xml* generated by
1
1
- 7.0e-01
- 5.0e-01
- 5.3e-01
- 0.
- 1.
+ 7.5e-01
+ 9.0e-01
+ 5.7e-01
+ 0.01
+ 0.5
7.
- 7.0e-01
+ 7.5e-01
1
0.
0.
7.
- 1.2e+00
+ 2.0e+00
9.5e-01
0.
7.
diff --git a/doc/tutorials/definitions/tocDefinitions.rst b/doc/tutorials/definitions/tocDefinitions.rst
index ead0837e1..f728e47db 100644
--- a/doc/tutorials/definitions/tocDefinitions.rst
+++ b/doc/tutorials/definitions/tocDefinitions.rst
@@ -7,6 +7,6 @@
.. |Author_ArtemM| unicode:: Artem U+0020 Myagkov
.. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a
.. |Author_EduardF| unicode:: Eduard U+0020 Feicho
-.. |Author_AlexB| unicode:: Alexandre U+0020 Benoit
+.. |Author_AlexB| unicode:: Alexandre U+0020 Benoit
diff --git a/modules/contrib/doc/retina/index.rst b/modules/contrib/doc/retina/index.rst
index 0f46ad47a..cacc38439 100644
--- a/modules/contrib/doc/retina/index.rst
+++ b/modules/contrib/doc/retina/index.rst
@@ -367,7 +367,7 @@ Parameters structure for better clarity, check explenations on the comments of m
{};// default setup
bool normaliseOutput;
float parasolCells_beta, parasolCells_tau, parasolCells_k, amacrinCellsTemporalCutFrequency, V0CompressionParameter, localAdaptintegration_tau, localAdaptintegration_k;
- };
+ };
struct OPLandIplParvoParameters OPLandIplParvo;
struct IplMagnoParameters IplMagno;
};
diff --git a/modules/contrib/include/opencv2/contrib/retina.hpp b/modules/contrib/include/opencv2/contrib/retina.hpp
index 5c5a2d9af..4dd9075fb 100644
--- a/modules/contrib/include/opencv2/contrib/retina.hpp
+++ b/modules/contrib/include/opencv2/contrib/retina.hpp
@@ -119,13 +119,13 @@ public:
struct OPLandIplParvoParameters{ // Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters
OPLandIplParvoParameters():colorMode(true),
normaliseOutput(true),
- photoreceptorsLocalAdaptationSensitivity(0.7f),
- photoreceptorsTemporalConstant(0.5f),
- photoreceptorsSpatialConstant(0.53f),
- horizontalCellsGain(0.0f),
- hcellsTemporalConstant(1.f),
+ photoreceptorsLocalAdaptationSensitivity(0.75f),
+ photoreceptorsTemporalConstant(0.9f),
+ photoreceptorsSpatialConstant(0.57f),
+ horizontalCellsGain(0.01f),
+ hcellsTemporalConstant(0.5f),
hcellsSpatialConstant(7.f),
- ganglionCellsSensitivity(0.7f){};// default setup
+ ganglionCellsSensitivity(0.75f){};// default setup
bool colorMode, normaliseOutput;
float photoreceptorsLocalAdaptationSensitivity, photoreceptorsTemporalConstant, photoreceptorsSpatialConstant, horizontalCellsGain, hcellsTemporalConstant, hcellsSpatialConstant, ganglionCellsSensitivity;
};
@@ -135,7 +135,7 @@ public:
parasolCells_beta(0.f),
parasolCells_tau(0.f),
parasolCells_k(7.f),
- amacrinCellsTemporalCutFrequency(1.2f),
+ amacrinCellsTemporalCutFrequency(2.0f),
V0CompressionParameter(0.95f),
localAdaptintegration_tau(0.f),
localAdaptintegration_k(7.f){};// default setup
diff --git a/modules/contrib/src/retina.cpp b/modules/contrib/src/retina.cpp
index 7785fed79..7a5f6dfc9 100644
--- a/modules/contrib/src/retina.cpp
+++ b/modules/contrib/src/retina.cpp
@@ -408,7 +408,6 @@ void RetinaImpl::setup(cv::Retina::RetinaParameters newConfiguration)
setupOPLandIPLParvoChannel(_retinaParameters.OPLandIplParvo.colorMode, _retinaParameters.OPLandIplParvo.normaliseOutput, _retinaParameters.OPLandIplParvo.photoreceptorsLocalAdaptationSensitivity, _retinaParameters.OPLandIplParvo.photoreceptorsTemporalConstant, _retinaParameters.OPLandIplParvo.photoreceptorsSpatialConstant, _retinaParameters.OPLandIplParvo.horizontalCellsGain, _retinaParameters.OPLandIplParvo.hcellsTemporalConstant, _retinaParameters.OPLandIplParvo.hcellsSpatialConstant, _retinaParameters.OPLandIplParvo.ganglionCellsSensitivity);
setupIPLMagnoChannel(_retinaParameters.IplMagno.normaliseOutput, _retinaParameters.IplMagno.parasolCells_beta, _retinaParameters.IplMagno.parasolCells_tau, _retinaParameters.IplMagno.parasolCells_k, _retinaParameters.IplMagno.amacrinCellsTemporalCutFrequency,_retinaParameters.IplMagno.V0CompressionParameter, _retinaParameters.IplMagno.localAdaptintegration_tau, _retinaParameters.IplMagno.localAdaptintegration_k);
-
}
const std::string RetinaImpl::printSetup()
diff --git a/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp b/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
index c0cd5f42f..2447a16ef 100644
--- a/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
+++ b/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
@@ -136,7 +136,7 @@ int main(int argc, char* argv[]) {
}
}catch(cv::Exception e)
{
- std::cerr<<"Error using Retina : "<