Commit 1e0945f9 authored by ssides's avatar ssides
Browse files

GEOS 3.9 camtools

parent 72ca2199

isis/src/base/apps/caminfo/CamTools.cpp

+4 −4
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ namespace Isis { 
        else {

          //  Construct composite (union) polygon

          geos::geom::Geometry *old(_combined);

          _combined = old->Union(multiP);

          _combined = old->Union(multiP).release();

          delete old;

        }
@@ -472,7 +472,7 @@ namespace Isis { 
    //  Get the centroid point of the union polygon

    double plon(Null), plat(Null);

    if(_combined != 0) {

      geos::geom::Point *center = _combined->getCentroid();

      geos::geom::Point *center = _combined->getCentroid().release();

      plon = center->getX();

      plat = center->getY();

      delete center;
@@ -604,7 +604,7 @@ namespace Isis { 


    TProjection *sinu = (TProjection *) ProjectionFactory::Create(sinuMap, true);

    geos::geom::MultiPolygon *sPoly = PolygonTools::LatLonToXY(*poly, sinu);

    geos::geom::Point *center = sPoly->getCentroid();

    geos::geom::Point *center = sPoly->getCentroid().release();



    sinu->SetCoordinate(center->getX(), center->getY());

    g.centroidLongitude = TProjection::To360Domain(sinu->UniversalLongitude());
@@ -734,7 +734,7 @@ namespace Isis { 
    vector<geos::geom::Geometry *> polys;

    polys.push_back(g);

    const geos::geom::GeometryFactory *gfactory = geos::geom::GeometryFactory::getDefaultInstance();

    return (gfactory->createMultiPolygon(polys));

    return (gfactory->createMultiPolygon(&polys));

  }