Commit 80c24988 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Modied BundleAdjust and ImageList to fix memory leaks that caused jigsaw to... 

Modied BundleAdjust and ImageList to fix memory leaks that caused jigsaw to not work with large data sets. Fixes #4908.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7755 41f8697f-d340-4b68-9986-7bafba869bb8
parent e222d18e

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2578,6 +2578,7 @@ namespace Isis { 
        for (int i = 0; i < m_serialNumberList->size(); i++) {

          Image *image = new Image(m_serialNumberList->fileName(i));

          imgList->append(image);

          image->closeCube();

        }

        m_imageLists.append(imgList);

      }

isis/src/control/objs/BundleAdjust/BundleAdjust.h

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ namespace Isis { 
   *                           colums and rows. In ::errorPropagation method, call to get Q matrix

   *                           from BundleControlPoint was creating a copy instead of getting a

   *                           reference. References #4664.

   *   @history 2017-06-08 Makayla Shepherd - Modified imageLists() to close the image cube after

   *                           adding it to the image list. Fixes #4908.

   */

  class BundleAdjust : public QObject {

      Q_OBJECT

isis/src/qisis/objs/ImageList/ImageList.cpp

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ namespace Isis { 
      try {

        Image *image = new Image(fileName);

        append(image);

        image->closeCube();

      }

      catch (IException &) {

      }

isis/src/qisis/objs/ImageList/ImageList.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ namespace Isis { 
   *                         pointer. TODO:  Currently, serialNumberList created the list on the

   *                         fly.  For speed, this needs to change so that when the ImageList

   *                         changes, update the serial number list.

   * @history 2017-06-08 Makayla Shepherd - Modified ImageList(QStringList &) to close the image

   *                         cubes after adding them to the list. Fixes #4908.

   */

  class ImageList : public QObject, public QList<Image *> {

    Q_OBJECT