Unverified Commit 6b07e29b authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Address compile warnings on ubuntu (#5050) 

* Addressed compiler warnings

* Added missing iterator declaration

* Initialize outputpoint

* Updated changelog
parent e5b0fbd7

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ release. 


- Fixed bugs in downloadIsisData script [#5024](https://github.com/USGS-Astrogeology/ISIS3/issues/5024) 

- Fixed shadow shifting image by 2 pixels to the upper left corner. [#5035](https://github.com/USGS-Astrogeology/ISIS3/issues/5035)

- Fixed compiler warnings on ubuntu [#4911](https://github.com/USGS-Astrogeology/ISIS3/issues/4911)



## [7.1.0] - 2022-07-27

isis/src/base/apps/isisimport/CassiniImportUtils.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ namespace Isis { 
       */

      CassiniIssFixDnFunctor(PvlKeyword &stretchPairs, QString dataConversionType, int validMax) {

        m_stretch = Stretch();

        for (size_t i = 0; i < stretchPairs.size(); i+=2) {

        for (size_t i = 0; i < (size_t)stretchPairs.size(); i+=2) {

          m_stretch.AddPair(toDouble(stretchPairs[i]),

                             toDouble(stretchPairs[i + 1]));

        }
@@ -192,7 +192,7 @@ namespace Isis { 
    //Adjust Table-encoded values from 8 bit back to 12 bit.

    PvlKeyword stretchPairs = translation["stretchPairs"];

    Stretch stretch;

    for (size_t i = 0; i < stretchPairs.size(); i+=2) {

    for (size_t i = 0; i < (size_t)stretchPairs.size(); i+=2) {

      stretch.AddPair(toDouble(stretchPairs[i]),

                         toDouble(stretchPairs[i + 1]));

    }

isis/src/mgs/apps/mocuncompress/image_io.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void image_open(char *filename, struct image_header *header, char *mode) 
    header->bpe = hdr_buf[3];

    if(header->bpe == 0)

      header->bpe = 8;

    text_ptr = (char *) malloc(strlen(((char *)hdr_buf) + IMAGE_LABEL_OFFSET));

    text_ptr = (char *) malloc(strlen(((char *)hdr_buf) + IMAGE_LABEL_OFFSET)+1);

    strcpy(text_ptr, (char *)(((char *)hdr_buf) + IMAGE_LABEL_OFFSET));

    header->label = text_ptr;

    header->fd = fd;

isis/src/mro/apps/hical/hical.cpp

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ namespace Isis { 
              zdr.Dump(hiconf.getMatrixSource("DumpModuleFile",hiprof));

            }

          }

          catch(IException e){

          catch(IException &e){

            if (hiprof.exists("Fallback") && IsTrueValue(hiprof, "Fallback")){

                zdrFallback = true;

                calVars->add(hiconf.getProfileName(), HiVector(nsamps, 0.0));

isis/tests/FunctionalTestsCkwriter.cpp

+4 −4
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ TEST_F(DefaultCube, FunctionalTestCkwriterDefault) { 


  ASSERT_EQ(newKernelRotation->cacheSize(), originalRotation->cacheSize());



  for (int i = 0; i < newKernelRotation->TimeBasedMatrix().size(); i++) {

  for (size_t i = 0; i < newKernelRotation->TimeBasedMatrix().size(); i++) {

    ASSERT_DOUBLE_EQ(newKernelRotation->TimeBasedMatrix()[i],

                     originalRotation->TimeBasedMatrix()[i]);

  }



  for (int i = 0; i < newKernelRotation->AngularVelocity().size(); i++) {

  for (size_t i = 0; i < newKernelRotation->AngularVelocity().size(); i++) {

    ASSERT_DOUBLE_EQ(newKernelRotation->AngularVelocity()[i],

                     originalRotation->AngularVelocity()[i]);

  }
@@ -138,12 +138,12 @@ TEST_F(DefaultCube, FunctionalTestCkwriterFromlist) { 


  ASSERT_EQ(newKernelRotation->cacheSize(), originalRotation->cacheSize());



  for (int i = 0; i < newKernelRotation->TimeBasedMatrix().size(); i++) {

  for (size_t i = 0; i < newKernelRotation->TimeBasedMatrix().size(); i++) {

    ASSERT_DOUBLE_EQ(newKernelRotation->TimeBasedMatrix()[i],

                     originalRotation->TimeBasedMatrix()[i]);

  }



  for (int i = 0; i < newKernelRotation->AngularVelocity().size(); i++) {

  for (size_t i = 0; i < newKernelRotation->AngularVelocity().size(); i++) {

    ASSERT_DOUBLE_EQ(newKernelRotation->AngularVelocity()[i],

                     originalRotation->AngularVelocity()[i]);

  }