Unverified Commit f97a967d authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #414 from kberryUSGS/osx_warnings 

Fix build warnings on osx in cmake
parents 03437a84 4d6c52b8

isis/src/hayabusa2/apps/hyb2onccal/hyb2onccal.cpp

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ static AlphaCube *alpha(0); 


QString g_filter = "";

static QString g_target ="";

static const int g_Hayabusa2NaifCode = -130;

static Pvl g_configFile;



//Bias calculation variables

isis/src/mro/apps/hical/GainChannelNormalize.h

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


        double bin = ToDouble(prof("Summing"));

        double tdi = ToDouble(prof("Tdi"));

        double _normalizer = 128.0 / tdi / (bin*bin);

        _normalizer = 128.0 / tdi / (bin*bin);

        _history.add("ModeNormalizer["+ToString(_normalizer)+"]");



        HiVector z = loadCsv("Gains", conf, prof, 0);

isis/src/mro/apps/hical/ZeroDark.h

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ namespace Isis { 
    private:

      int _tdi;

      int _bin;

      int _ccd;

      int _channel;



      HiVector _BM;

      HiVector _slope;

isis/src/voyager/apps/voy2isis/voy2isis.cpp

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ QByteArray fixLabels(QString fileName, History *hist){ 
  // Check if image id is valid

  int imageIdIndex = labels.indexOf(QByteArray("IMAGE_ID"));

  int i = imageIdIndex;

  char c;

  char c = 0;

  bool replaceImageId = false;

  while (c != '\n' && i != -1) {

    c = labels[i];