Merge pull request #22226 from ocpalo:libspng

author Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>

Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)

committer GitHub <noreply@github.com>

Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)
author Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)
committer GitHub <noreply@github.com>
Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)
diff --cc CMakeLists.txt
Simple merge
diff --cc modules/highgui/src/window_w32.cpp
Simple merge
author	Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com>
	Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)
committer	GitHub <noreply@github.com>
	Mon, 5 Sep 2022 10:25:41 +0000 (13:25 +0300)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_w32.cpp	patch \|	diff1 \|	diff2 \|	blob \| history