Unverified Commit 01513dab authored by Tim Giroux's avatar Tim Giroux Committed by GitHub
Browse files

large commit to get geos compiling (#4460)

parent 1e0945f9

isis/src/base/objs/UniversalGroundMap/UniversalGroundMap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -337,10 +337,10 @@ namespace Isis { 
      if (cube) {

        ImagePolygon poly = cube->readFootprint();

        geos::geom::MultiPolygon *footprint = PolygonTools::MakeMultiPolygon(

            poly.Polys()->clone());

            poly.Polys()->clone().release());



        geos::geom::Geometry *envelope = footprint->getEnvelope();

        geos::geom::CoordinateSequence *coords = envelope->getCoordinates();

        geos::geom::Geometry *envelope = footprint->getEnvelope().release();

        geos::geom::CoordinateSequence *coords = envelope->getCoordinates().release();



        for (unsigned int i = 0; i < coords->getSize(); i++) {

          const geos::geom::Coordinate &coord = coords->getAt(i);

isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ namespace Isis { 
    }



    foreach (QString sn, cnetSerials) {

      geos::geom::CoordinateSequence * ptCoordinates =

      geos::geom::CoordinateArraySequence * ptCoordinates =

          new geos::geom::CoordinateArraySequence();



      // setup vector for number of image properties and init to 0
@@ -288,7 +288,7 @@ namespace Isis { 
        //   because it self-intersects many many times, it still correctly does a convex hull

        //   calculation on the points in the polygon.

        geos::geom::Geometry * convexHull = geosFactory->createPolygon(

          geosFactory->createLinearRing(ptCoordinates), 0)->convexHull();

          geosFactory->createLinearRing(ptCoordinates), 0)->convexHull().release();



        // Calculate the area of the convex hull

        imgStats[imgConvexHullArea] = convexHull->getArea();

isis/src/qisis/objs/HistogramTool/HistogramTool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ namespace Isis { 


      if(rubberBandTool()->currentMode() == RubberBandTool::CircleMode) {

        geos::geom::Geometry *p = rubberBandTool()->geometry();

        geos::geom::CoordinateSequence *c = p->getCoordinates();

        geos::geom::CoordinateSequence *c = p->getCoordinates().release();

        for(int i = 0; i < (int)c->getSize(); i++) {

          QPoint point((int)(c->getX(i) + 0.5), (int)(c->getY(i) + 0.5));

          vertices.append(point);

isis/src/qisis/objs/Image/Image.cpp

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ namespace Isis { 
        _FILEINFO_);

    e.print();



    return PolygonTools::MakeMultiPolygon(imgPoly.Polys()->clone());

    return PolygonTools::MakeMultiPolygon(imgPoly.Polys()->clone().release());

  }
@@ -816,7 +816,7 @@ namespace Isis { 
   */

  void Image::initQuickFootprint() {

    ImagePolygon poly = cube()->readFootprint();

    m_footprint = PolygonTools::MakeMultiPolygon(poly.Polys()->clone());

    m_footprint = PolygonTools::MakeMultiPolygon(poly.Polys()->clone().release());

  }
@@ -965,7 +965,7 @@ namespace Isis { 
    if (localName == "footprint" && !m_characters.isEmpty()) {

      geos::io::WKTReader wktReader(*globalFactory);

      m_image->m_footprint = PolygonTools::MakeMultiPolygon(

          wktReader.read(m_characters.toStdString()));

          wktReader.read(m_characters.toStdString()).release());

    }

    else if (localName == "image" && !m_image->m_footprint) {

      QMutex mutex;

isis/src/qisis/objs/MeasureTool/MeasureTool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ namespace Isis { 
      if (polygon != NULL) {

        // pix area = screenpix^2 / scale^2

        m_pixArea = polygon->getArea() / pow(cvp->scale(), 2);

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

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

        double line, sample;

        cvp->viewportToCube((int)center->getX(), (int)center->getY(), sample, line);