Commit 3cf1a20f authored by Cédric Traizet's avatar Cédric Traizet

Merge branch 'ci_debian_opencv' into 'develop'

Fix GEOS errors from self intersecting polygons in and fix OPENCV path in debian CI build

See merge request orfeotoolbox/otb!624
parents 0ff5acb2 2b3cf51b
Pipeline #3093 passed with stage
in 8 minutes and 16 seconds
......@@ -21,7 +21,7 @@
# Configuration options for debian-unstable-gcc
set(site_option
"opencv_INCLUDE_DIR:PATH=/usr/include
"OpenCV_DIR:PATH=/usr
OTB_USE_MPI:BOOL=OFF
OTB_USE_SHARK:BOOL=OFF
")
......@@ -21,9 +21,9 @@
set(OPENCV_SEARCH_PATH)
if(OpenCV_DIR)
get_filename_component(OPENCV_SEARCH_PATH "${OpenCV_DIR}" PATH)
get_filename_component(OPENCV_SEARCH_PATH "${OpenCV_DIR}" REALPATH)
if(OPENCV_SEARCH_PATH)
get_filename_component(OPENCV_SEARCH_PATH "${OPENCV_SEARCH_PATH}" PATH)
get_filename_component(OPENCV_SEARCH_PATH "${OPENCV_SEARCH_PATH}" REALPATH)
endif()
if(OPENCV_SEARCH_PATH)
find_path(
......
RESOLUTION: 0; DESC: Resolution: 0 (Image [w x h]: 2592x1944)
RESOLUTION: 1; DESC: Resolution: 1 (Image [w x h]: 1296x972)
RESOLUTION: 2; DESC: Resolution: 2 (Image [w x h]: 648x486)
RESOLUTION: 3; DESC: Resolution: 3 (Image [w x h]: 324x243)
RESOLUTION: 4; DESC: Resolution: 4 (Image [w x h]: 162x122)
RESOLUTION: 5; DESC: Resolution: 5 (Image [w x h]: 81x61)
......@@ -245,7 +245,7 @@ void OGRLayerStreamStitchingFilter<TInputImage>::ProcessStreamingLine(bool line,
{
FeatureStruct upper = upperStreamFeatureList[u];
FeatureStruct lower = lowerStreamFeatureList[l];
if (!(upper.feat == lower.feat))
if (!(upper.feat == lower.feat) && upper.feat.GetGeometry()->IsValid() && lower.feat.GetGeometry()->IsValid())
{
if (ogr::Intersects(*upper.feat.GetGeometry(), *lower.feat.GetGeometry()))
{
......
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