Merge pull request opencv#26634 from FantasqueX:fix-test-exif-1

asmorkalov · web-flow · commit 7ddc02907e72 · 2024-12-17T22:36:42.000+03:00
Fix test_exif compilation when none of JPEG, PNG, AVIF is enabled
diff --git a/modules/imgcodecs/test/test_exif.cpp b/modules/imgcodecs/test/test_exif.cpp
@@ -2,6 +2,9 @@
 // It is subject to the license terms in the LICENSE file found in the top-level
 // directory of this distribution and at http://opencv.org/license.html
 
+#include <string>
+#include <vector>
+
 #include "test_precomp.hpp"
 
 namespace opencv_test { namespace {
@@ -110,7 +113,7 @@ TEST_P(Exif, exif_orientation)
     }
 }
 
-const string exif_files[] =
+const std::vector<std::string> exif_files
 {
 #ifdef HAVE_JPEG
     "readwrite/testExifOrientation_1.jpg",

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`	`// It is subject to the license terms in the LICENSE file found in the top-level`
`3`	`3`	`// directory of this distribution and at http://opencv.org/license.html`
`4`	`4`
	`5`	`+#include <string>`
	`6`	`+#include <vector>`
	`7`	`+`
`5`	`8`	`#include "test_precomp.hpp"`
`6`	`9`
`7`	`10`	`namespace opencv_test { namespace {`
`@@ -110,7 +113,7 @@ TEST_P(Exif, exif_orientation)`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`
`113`		`-const string exif_files[] =`
	`116`	`+const std::vector<std::string> exif_files`
`114`	`117`	`{`
`115`	`118`	`#ifdef HAVE_JPEG`
`116`	`119`	`"readwrite/testExifOrientation_1.jpg",`