Merge branch 'develop' into feature/Stereo

BCOM\nduong · BCOM\nduong · commit 89aad8d29f04 · 2021-09-07T14:30:35.000+02:00
diff --git a/packagedependencies-android.txt b/packagedependencies-android.txt
@@ -1 +1 @@
-opencv|4.4.0|opencv|conan-solar@conan|conan-solar|default|gapi=False#tiff=False
+opencv|4.5.2|opencv|conan-solar@conan|conan-solar|default|dnn=False#world=True
diff --git a/packagedependencies-linux.txt b/packagedependencies-linux.txt
@@ -1,4 +1,4 @@
-libgtk-3-dev||gtk+-3.0|apt-get@system|apt-get
+libgtk2.0-dev||libgtk2.0-dev|apt-get@system|apt-get
 libva-dev||libva-dev|apt-get@system|apt-get
 libvdpau-dev||libvdpau-dev|apt-get@system|apt-get
-opencv|4.4.0|opencv|conan-solar@conan|conan-solar|default|gapi=False#gtk=3#ffmpeg=True
+opencv|4.5.2|opencv|conan-solar@conan|conan-solar|default|with_gtk=True#gtk_version=system#with_ffmpeg=True
diff --git a/packagedependencies-mac.txt b/packagedependencies-mac.txt
@@ -1,2 +1,2 @@
-opencv|4.4.0|opencv|conan-solar@conan|conan-solar
+opencv|4.5.2|opencv|conan-solar@conan|conan-solar
 
diff --git a/packagedependencies-win.txt b/packagedependencies-win.txt
@@ -1 +1 @@
-opencv|4.4.0|opencv|conan-solar@conan|conan-solar
+opencv|4.5.2|opencv|conan-solar@conan|conan-solar
diff --git a/tests/SolARTest_ModuleOpenCV_CameraCalibration/packagedependencies.txt b/tests/SolARTest_ModuleOpenCV_CameraCalibration/packagedependencies.txt
@@ -1 +1 @@
-SolARFramework|0.10.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download
+SolARFramework|0.10.0|SolARFramework|SolARBuild@github|https://github.com/SolarFramework/SolarFramework/releases/download

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-opencv\|4.4.0\|opencv\|conan-solar@conan\|conan-solar\|default\|gapi=False#tiff=False`
	`1`	`+opencv\|4.5.2\|opencv\|conan-solar@conan\|conan-solar\|default\|dnn=False#world=True`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-opencv\|4.4.0\|opencv\|conan-solar@conan\|conan-solar`
	`1`	`+opencv\|4.5.2\|opencv\|conan-solar@conan\|conan-solar`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SolARFramework\|0.10.0\|SolARFramework\|SolARBuild@github\|https://github.com/SolarFramework/SolarFramework/releases/download`
	`1`	`+SolARFramework\|0.10.0\|SolARFramework\|SolARBuild@github\|https://github.com/SolarFramework/SolarFramework/releases/download`