Unverified Commit 085807ac authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

GEOS 3.9 Chip (#4443)

parent a6d94243

isis/src/base/objs/Chip/Chip.cpp

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ namespace Isis { 


    if (other.m_clipPolygon) {

      m_clipPolygon = PolygonTools::MakeMultiPolygon(

          other.m_clipPolygon->clone());

          other.m_clipPolygon->clone().release());

    }

    else {

      m_clipPolygon = NULL;
@@ -1044,7 +1044,7 @@ namespace Isis { 


    if (other.m_clipPolygon) {

      m_clipPolygon = PolygonTools::MakeMultiPolygon(

          other.m_clipPolygon->clone());

          other.m_clipPolygon->clone().release());

    }



    m_affine = other.m_affine;

isis/src/base/objs/Chip/unitTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int main() { 
  cout << "Test load chip from cube with rotation and clipping polygon " << endl;

  chip.TackCube(26.0, 25.0);



  geos::geom::CoordinateSequence *pts = new geos::geom::CoordinateArraySequence();

  geos::geom::CoordinateArraySequence *pts = new geos::geom::CoordinateArraySequence();

  pts->add(geos::geom::Coordinate(23.0, 22.0));

  pts->add(geos::geom::Coordinate(28.0, 22.0));

  pts->add(geos::geom::Coordinate(28.0, 27.0));
@@ -143,7 +143,7 @@ int main() { 
  vector<geos::geom::Geometry *> polys;

  geos::geom::GeometryFactory::Ptr gf = geos::geom::GeometryFactory::create();

  polys.push_back(gf->createPolygon(gf->createLinearRing(pts), NULL));

  geos::geom::MultiPolygon *mPolygon = gf->createMultiPolygon(polys);

  geos::geom::MultiPolygon *mPolygon = gf->createMultiPolygon(&polys);



  chip.SetClipPolygon(*mPolygon);

  chip.Load(junk, 45.0);