Commit a1b83a0f authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch '2197-CI_failing_on_debian_testing' into 'develop'

ENH: Update openCV version to 4.5.1 for the SuperBuild, update the baseline for GEOS

Closes #2197

See merge request !822
parents 519fd072 afcac4aa
Pipeline #7877 passed with stage
in 6 minutes and 30 seconds
......@@ -21,7 +21,7 @@ opencv_ml_rtrees:
cat_ofs: [ 0, 0, 0, 0, 0, 0, 0, 0 ]
class_labels: [ 1, 2, 3, 4 ]
missing_subst: [ 0., 0., 0., 0., 0. ]
oob_error: 4.6082949308755760e-03
oob_error: 7.0093457943925233e-03
ntrees: 1
trees:
-
......@@ -31,96 +31,54 @@ opencv_ml_rtrees:
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:7.5442163085937500e+02,
le:1.5328201293945312e+02 }
- { var:3, quality:9.0135681152343750e+02,
le:1.6233364868164062e+02 }
-
depth: 1
value: 1.
norm_class_idx: 0
splits:
- { var:1, quality:4.9118682861328125e+02,
le:2.7847836303710938e+02 }
-
depth: 2
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:54., le:1.7026905822753906e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:0, quality:6.0693487548828125e+02,
le:2.3812664794921875e+02 }
-
depth: 3
depth: 2
value: 3.
norm_class_idx: 2
-
depth: 2
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:5.1905541992187500e+02,
le:2.1241384887695312e+02 }
- { var:1, quality:5.1901708984375000e+02,
le:3.1056585693359375e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
splits:
- { var:2, quality:39., le:1.3915295410156250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 4
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 1.
norm_class_idx: 0
splits:
- { var:0, quality:4.8239999389648438e+02,
le:2.1394296264648438e+02 }
- { var:3, quality:117., le:2.9698010253906250e+02 }
-
depth: 4
value: 1.
norm_class_idx: 0
value: 2.
norm_class_idx: 1
-
depth: 4
value: 1.
norm_class_idx: 0
-
depth: 1
value: 3.
norm_class_idx: 2
splits:
- { var:3, quality:4.5026675415039062e+02,
le:3.0965036010742188e+02 }
-
depth: 2
value: 2.
norm_class_idx: 1
splits:
- { var:2, quality:97., le:1.6953280639648438e+02 }
-
depth: 3
value: 1.
norm_class_idx: 0
- { var:3, quality:174., le:3.3038479614257812e+02 }
-
depth: 3
value: 2.
norm_class_idx: 1
-
depth: 2
value: 3.
norm_class_idx: 2
splits:
- { var:1, quality:511., le:3.5593637084960938e+02 }
-
depth: 3
value: 3.
norm_class_idx: 2
-
depth: 3
value: 4.
......
PROJCS["WGS_1984_UTM_Zone_31N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",3],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
......@@ -30,7 +30,7 @@ endif()
ExternalProject_Add(FREETYPE
PREFIX FREETYPE
URL "http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz"
URL "https://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz"
URL_MD5 1d733ea6c1b7b3df38169fbdbec47d2b
BINARY_DIR ${FREETYPE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -34,8 +34,8 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY)
ExternalProject_Add(OPENCV
PREFIX OPENCV
URL "https://github.com/opencv/opencv/archive/4.1.1.tar.gz"
URL_MD5 d9d3138d12e52bb0684f4a5862f6a46c
URL "https://github.com/opencv/opencv/archive/4.5.1.tar.gz"
URL_MD5 2205d3169238ec1f184438a96de68513
BINARY_DIR ${OPENCV_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......
diff -burN opencv.orig/CMakeLists.txt opencv/CMakeLists.txt
--- opencv.orig/CMakeLists.txt 2019-09-17 09:33:13.196155000 +0200
+++ opencv/CMakeLists.txt 2019-09-17 09:39:18.076164185 +0200
@@ -531,7 +531,7 @@
diff -burN opencv.orig/cmake/OpenCVInstallLayout.cmake opencv/cmake/OpenCVInstallLayout.cmake
--- opencv.orig/cmake/OpenCVInstallLayout.cmake 2021-06-08 09:30:22.007336301 +0200
+++ opencv/cmake/OpenCVInstallLayout.cmake 2021-06-08 09:30:54.279376480 +0200
@@ -23,7 +23,7 @@
elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
- ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") #"${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
else()
message(STATUS "Can't detect runtime and/or arch")
ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment