Unverified Commit af626634 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Update geos to 3.11.1 (#5266) 

* Update geos to 3.11.1

* Fixed failing test
parent 01bbe16a

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ dependencies: 
  - eigen < 3.4

  - embree>=2.17,<3

  - ffmpeg

  - geos>=3.9,<3.10

  - geos =3.11.1

  - geotiff

  - gmp

  - graphviz

isis/src/base/objs/LimitPolygonSeeder/LimitPolygonSeeder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ namespace Isis { 
        geos::geom::Point *centroid = gridSquarePolygon->getCentroid().release();



        delete gridSquarePolygon;

        if(centroid == NULL) continue;

        if(centroid->isEmpty()) continue;



        double gridCenterX = centroid->getX();

        double gridCenterY = centroid->getY();

recipe/meta.yaml

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ requirements: 
   - eigen<3.4

   - embree>=2.17,<3

   - ffmpeg

   - geos>=3.9,<3.10

   - geos =3.11.1

   - geotiff

   - gmp

   - graphviz
@@ -154,6 +154,7 @@ requirements: 
  - {{ pin_compatible('opencv', max_pin='x.x') }}

  - {{ pin_compatible('openssl', min_pin='x', max_pin='x.x') }}

  - pcl

  - {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('protobuf', max_pin='x.x') }}

  - qhull

  - {{ pin_compatible('qt', max_pin='x.x') }}