Merge pull request #18014 from lpea:fix_build_with_aravis

11eff8ba · Alexander Alekhin · 27b20596 · 29976a04 · 11eff8ba
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

modules/videoio/src/cap_aravis.cpp modules/videoio/src/cap_aravis.cpp +2 -2

未找到文件。
--- a/modules/videoio/src/cap_aravis.cpp
+++ b/modules/videoio/src/cap_aravis.cpp
@@ -502,7 +502,7 @@ double CvCaptureCAM_Aravis::getProperty( int property_id ) const
            }
            break;

-        case CAP_PROP_ARAVIS_AUTOTRIGGER:
+        case cv::CAP_PROP_ARAVIS_AUTOTRIGGER:
        {
            return allowAutoTrigger ? 1. : 0.;
        }
@@ -591,7 +591,7 @@ bool CvCaptureCAM_Aravis::setProperty( int property_id, double value )
            }
            break;

-        case CAP_PROP_ARAVIS_AUTOTRIGGER:
+        case cv::CAP_PROP_ARAVIS_AUTOTRIGGER:
            {
                allowAutoTrigger = (bool) value;
            }