potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-03-15 17:53:18 +00:00
parent 17ad33c919 2c3f02c83f
commit 26087e28ad
14 changed files with 203 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/test/test_grfmt.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ TEST_P(Imgcodecs_FileMode, regression)
const string all_images[] =
{
#ifdef HAVE_JASPER
#if defined(HAVE_JASPER) && defined(OPENCV_IMGCODECS_ENABLE_JASPER_TESTS)
"readwrite/Rome.jp2",
"readwrite/Bretagne2.jp2",
"readwrite/Bretagne2.jp2",
modules/imgcodecs/test/test_read_write.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ const string exts[] = {
#ifdef HAVE_JPEG
"jpg",
#endif
#ifdef HAVE_JASPER
#if defined(HAVE_JASPER) && defined(OPENCV_IMGCODECS_ENABLE_JASPER_TESTS)
"jp2",
#endif
#if 0 /*defined HAVE_OPENEXR && !defined __APPLE__*/