diff --git a/isis/src/base/apps/cubediff/WriteTabular.cpp b/isis/src/base/apps/cubediff/WriteTabular.cpp
index dd0173c9b46c193aa4a78fe3be120b2b942cdab9..cb0d9dbdd02348ff6b4f63bf2119c42afaf2342f 100644
--- a/isis/src/base/apps/cubediff/WriteTabular.cpp
+++ b/isis/src/base/apps/cubediff/WriteTabular.cpp
@@ -74,7 +74,6 @@ namespace Isis {
throw IException(IException::User, message, _FILEINFO_);
}
- int iteration = 0;
while((int)thisTitle.length() < (int)thisCol.Width()) {
if(thisCol.Alignment() == Column::Left) {
thisTitle += " ";
@@ -87,7 +86,6 @@ namespace Isis {
QString message = "Alignment is improperly set";
throw IException(IException::User, message, _FILEINFO_);
}
- iteration++;
}//end while
p_cols.push_back(thisCol);
diff --git a/isis/src/base/apps/isisminer/AssetSidebarStrategy.cpp b/isis/src/base/apps/isisminer/AssetSidebarStrategy.cpp
index 0b8c9e93f671423c804ada17f6b883ccc564c677..e2f566d4aba3ce0451ea9794f2e1c7774dbb52e5 100644
--- a/isis/src/base/apps/isisminer/AssetSidebarStrategy.cpp
+++ b/isis/src/base/apps/isisminer/AssetSidebarStrategy.cpp
@@ -195,7 +195,6 @@ namespace Isis {
const ResourceList &globals) {
// Set up incoming asset handling conditions
- int nremoved = 0;
if ( m_removeEmpties ) {
BOOST_FOREACH ( SharedResource resource, resources ) {
if ( resource->isActive() ) {
@@ -208,7 +207,6 @@ namespace Isis {
ResourceList assetList = asset.value<ResourceList>();
if ( assetList.size() == 0) {
resource->removeAsset(m_asset);
- nremoved++;
}
}
}
diff --git a/isis/src/base/apps/isisminer/RunCommandStrategy.cpp b/isis/src/base/apps/isisminer/RunCommandStrategy.cpp
index ebcf3e6d811d12925c9d740f5922a8136b0a92f3..0f7d42774ab8b51c944295c8df5d9b8cf00b38d2 100644
--- a/isis/src/base/apps/isisminer/RunCommandStrategy.cpp
+++ b/isis/src/base/apps/isisminer/RunCommandStrategy.cpp
@@ -223,7 +223,6 @@ namespace Isis {
int RunCommandStrategy::apply(SharedResource &resource,
const ResourceList &globals) {
- int n_good(0);
BOOST_FOREACH ( Command command, m_commands ) {
QString cmd = processArgs(command.m_command, m_argKeys,
getGlobals(resource, globals));
@@ -248,7 +247,6 @@ namespace Isis {
if ( isDebug() ) {
cout << "Command " << command.m_name << " succeeded\n";
}
- n_good++;
}
}
return (1);
diff --git a/isis/src/base/apps/makeflat/main.cpp b/isis/src/base/apps/makeflat/main.cpp
index 408f81513984b6de88f31944ee0c1a6bf141c528..39e1d729048116ad78ae4f4d31067bc677e48aa9 100644
--- a/isis/src/base/apps/makeflat/main.cpp
+++ b/isis/src/base/apps/makeflat/main.cpp
@@ -381,7 +381,6 @@ void IsisMain() {
oLineMgr->SetLine(1);
ProcessByBrick p;
- int excludedCnt = 0;
if(cameraType == LineScan) {
outputTmpAverages.resize(numOutputSamples);
@@ -392,7 +391,6 @@ void IsisMain() {
cubeInitialized = false;
for(currImage = 0; currImage < inList.size(); currImage++) {
if(Excluded(currImage)) {
- excludedCnt ++;
continue;
}
diff --git a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
index 3ef47feecca71574a5788bbdfeee9e02e6984c09..e3d6e61435c92a7a98d02575da9a77a9bdd9edeb 100644
--- a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
+++ b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp
@@ -486,7 +486,7 @@ namespace Isis {
rtcSetGeometryOccludedFilterFunction(rtcMesh, EmbreeTargetShape::occlusionFilter);
rtcCommitGeometry(rtcMesh);
- unsigned int geomID = rtcAttachGeometry(m_scene, rtcMesh);
+ rtcAttachGeometry(m_scene, rtcMesh);
rtcReleaseGeometry(rtcMesh);
// Done, now we can perform some ray tracing
diff --git a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
index 551ee43ca5e0d8abec89be2dc44788c8d89fcbc6..3d6a0517e79ec5a53f10ef1bce06d48c6c6b532f 100644
--- a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
+++ b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
@@ -102,7 +102,6 @@ namespace Isis {
// fill rowBuffer with packed record values, then fill with padding
EndianSwapper *endianSwap = new EndianSwapper(m_pdsByteOrder);
- int buffsize = 0;
for(int recIndex = 0; recIndex < m_isisTable->Records(); recIndex++) {
TableRecord record = (*m_isisTable)[recIndex];
char rowBuffer[record.RecordSize()];
@@ -110,8 +109,6 @@ namespace Isis {
int i = recIndex*m_outputRecordBytes;
memmove(pdsTableBuffer + i, &rowBuffer, record.RecordSize());
memmove(pdsTableBuffer + i + m_rowBytes, &endRowPadding, numRowNulls);
- buffsize+=record.RecordSize();
- buffsize+=numRowNulls;
}
return fillMetaData();
}
diff --git a/isis/src/base/objs/Pipeline/Pipeline.cpp b/isis/src/base/objs/Pipeline/Pipeline.cpp
index 2d21b00a4c95be71bf9f1ab58f6f4f1d7bd2b6f7..df1fdb5f904ca2ffb46eccdf1675ccdbd77eee9c 100644
--- a/isis/src/base/objs/Pipeline/Pipeline.cpp
+++ b/isis/src/base/objs/Pipeline/Pipeline.cpp
@@ -600,12 +600,8 @@ namespace Isis {
}
//Check for non nulls instead of size ie. find last non null or use this
- int appsSize = 0;
QString pauseAppId = "";
- for (int iapp = 0; iapp < (int) p_apps.size(); iapp++)
- if (p_apps[iapp] != NULL) appsSize++;
-
// Add the new application
if (p_apps.size() == 0) {
p_apps.push_back(new PipelineApplication(appname, this));
diff --git a/isis/src/base/objs/PolygonTools/PolygonTools.cpp b/isis/src/base/objs/PolygonTools/PolygonTools.cpp
index dc7431db568da03db5a085ca61ab8323415a9781..6fc12fb192b5fea713ae86115b22e92a7c6116ab 100644
--- a/isis/src/base/objs/PolygonTools/PolygonTools.cpp
+++ b/isis/src/base/objs/PolygonTools/PolygonTools.cpp
@@ -705,7 +705,7 @@ namespace Isis {
catch(IException &e) {
// Sometimes despike and fix fail, but the input is really valid. We can just go
// with the non-despiked polygon.
- if(ls->isValid() && ls->getGeometryTypeId() == geos::geom::GEOS_LINEARRING) {
+ if (ls && ls->isValid() && ls->getGeometryTypeId() == geos::geom::GEOS_LINEARRING) {
lr.reset(ls.release());
}
else {
diff --git a/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp b/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp
index 60c03752ecac17ac21c5dfc6701887ba99021579..c68c58807ddc3c6007e55b37b27686abb655cb5f 100644
--- a/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp
+++ b/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp
@@ -196,7 +196,7 @@ geos::geom::Geometry* ProcessGroundPolygons::Vectorize(std::vector<double> &lat,
return singlePoly;
}
-
+ return nullptr;
}
/**
diff --git a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
index b728767a93f4c5f6ea01f4ce49e79fde5ab8fca8..dad28f8a3ae785dc75d6c7fdfcd4eda32bc6f610 100644
--- a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
+++ b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
@@ -18,6 +18,7 @@ find files of those names at the top level of this repository. **/
#include "FileName.h"
#include "IException.h"
#include "IString.h"
+#include "Preference.h"
using namespace std;
namespace Isis {
@@ -44,6 +45,9 @@ namespace Isis {
program = isisExecutableFileName;
}
+ PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory");
+ QString tempDir = dataDir["Temporary"];
+
QString command = program.expanded() + " " + parameters +
" -pid=" + toString(getpid());
@@ -59,9 +63,13 @@ namespace Isis {
QLocalServer server;
server.listen(serverName);
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ env.insert("TEMPORARY", tempDir);
+
QProcess childProcess;
+ childProcess.setProcessEnvironment(env);
childProcess.setProcessChannelMode(QProcess::ForwardedChannels);
- childProcess.start(command);
+ childProcess.start("bash", QStringList() << "-c" << command);
childProcess.waitForStarted();
bool connected = false;
diff --git a/isis/src/base/objs/UserInterface/UserInterface.cpp b/isis/src/base/objs/UserInterface/UserInterface.cpp
index bc22e5ac895924546f064cf6250d8a4067482638..7b87b62ccea8d10549971b647b6160f0342f5edc 100644
--- a/isis/src/base/objs/UserInterface/UserInterface.cpp
+++ b/isis/src/base/objs/UserInterface/UserInterface.cpp
@@ -1150,12 +1150,10 @@ namespace Isis {
else if (nextElementStarted && arrayString[strPos] == ' ') {
// Make sure there's something before the next ',' or ')'
bool onlyWhite = true;
- int closingPos = strPos + 1;
for( int pos = strPos;
onlyWhite && arrayString[pos] != ',' && arrayString[pos] != ')' &&
pos < arrayString.size(); pos++) {
- closingPos++;
onlyWhite &= (arrayString[pos] == ' ');
}
diff --git a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
index 25ab7a752b076e571540555edc8ce2f1d7d21972..77591550f9834101e57f450054cc8394092dac99 100644
--- a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
+++ b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp
@@ -117,25 +117,11 @@ namespace Isis {
QString intTime = stime.split(".").first();
stime = stime.split(".").last();
- double etStart = getClockTime(intTime).Et();
-
- // Add 2 seconds to either side of time range because the time are for IR
- // channel, the VIS may actually start integrating before NATIVE_START_TIME.
- // This insures the cache is large enough.
- etStart += toDouble(stime) / 15959.0 - 2.;
-
// Get the end time in et
QString etime = (QString) inst ["NativeStopTime"];
intTime = etime.split(".").first();
etime = etime.split(".").last();
- double etStop = getClockTime(intTime).Et();
-
- // Add 2 seconds to either side of time range because the time are for IR
- // channel, the VIS may actually start integrating before NATIVE_START_TIME.
- // This insures the cache is large enough.
- etStop += toDouble(stime) / 15959.0 + 2.;
-
// Setup detector map
new CameraDetectorMap(this);
diff --git a/isis/src/clementine/apps/clemnirnoise/main.cpp b/isis/src/clementine/apps/clemnirnoise/main.cpp
index fb862dd09b44d43cef46ff5cee2a69dc513df36f..d6cced980e15499d25a5b4ce555981853ea93bbd 100644
--- a/isis/src/clementine/apps/clemnirnoise/main.cpp
+++ b/isis/src/clementine/apps/clemnirnoise/main.cpp
@@ -42,7 +42,6 @@ void NoiseFilter(Buffer &in, Buffer &out) {
double diffSum;
double diffAvg;
int dCount;
- int LCOUNT = 0;
for(int il = 0; il < in.LineDimension(); il++) {
for(int is = 0; is < in.SampleDimension(); is++) {
@@ -67,7 +66,6 @@ void NoiseFilter(Buffer &in, Buffer &out) {
diffAvg = diffSum / dCount;
}
if(diffAvg > TOL1) {
- LCOUNT++;
for(int is = 1; is < in.SampleDimension() - 4; is += 4) {
int index = in.SampleDimension() * il + is;
out[index] = Isis::Null;
@@ -94,7 +92,6 @@ void NoiseFilter(Buffer &in, Buffer &out) {
diffAvg = diffSum / dCount;
}
if(diffAvg > TOL2 && dCount > NPOS) {
- LCOUNT++;
for(int is = 4; is < in.SampleDimension() - 4; is += 4) {
int index = in.SampleDimension() * il + is;
out[index] = Isis::Null;
diff --git a/isis/src/clementine/apps/clemuvviscal/main.cpp b/isis/src/clementine/apps/clemuvviscal/main.cpp
index 1df043e9dc233f5fa6246dd72cefa9e9dfcaef92..232d42cdca323da8a593f7fc47be2a50c98af26c 100644
--- a/isis/src/clementine/apps/clemuvviscal/main.cpp
+++ b/isis/src/clementine/apps/clemuvviscal/main.cpp
@@ -301,8 +301,8 @@ void UvVisCal(std::vector< Isis::Buffer * > &in, std::vector< Isis::Buffer * > &
}
}
- delete sum;
- delete ro;
+ delete[] sum;
+ delete[] ro;
}
/*
diff --git a/isis/src/control/apps/autoseed/autoseed.cpp b/isis/src/control/apps/autoseed/autoseed.cpp
index 7be0d37bf5cc1a685aeedc6004df1788fdfada7e..1787f9c1e9980056696edbad36146c76ce52acf0 100644
--- a/isis/src/control/apps/autoseed/autoseed.cpp
+++ b/isis/src/control/apps/autoseed/autoseed.cpp
@@ -201,8 +201,6 @@ namespace Isis {
overlaps.ReadImageOverlaps(ui.GetFileName("OVERLAPLIST"));
// Create a Universal Ground Map (UGM) for each image in the list
- int stats_noOverlap = 0;
- int stats_tolerance = 0;
map<QString, UniversalGroundMap *> gMaps;
for (int sn = 0; sn < serialNumbers.size(); ++sn) {
@@ -259,7 +257,6 @@ namespace Isis {
progress.CheckStatus();
if (overlaps[ov]->Size() == 1) {
- stats_noOverlap++;
continue;
}
@@ -322,7 +319,6 @@ namespace Isis {
// No points were seeded in this polygon, so collect some stats and move on
if (points.size() == 0) {
- stats_tolerance++;
continue;
}
diff --git a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
index ca8dc1b4dcdc8d6feb48674a65a0dac89a13030f..ef6de55152a1ae8d5293ed57fe17bfad352d578f 100644
--- a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
+++ b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp
@@ -673,7 +673,7 @@ namespace Isis {
BOOST_ASSERT ( b1.dim1() == b2.dim1() );
BitMask omask(b1.dim1());
for (int i = 0 ; i < b1.dim1() ; i++) {
- omask[i] = b1[i] | b2[i];
+ omask[i] = b1[i] || b2[i];
}
return (omask);
}
diff --git a/isis/src/control/apps/findfeatures/RobustMatcher.cpp b/isis/src/control/apps/findfeatures/RobustMatcher.cpp
index ddecd875939c50770335546d7422cc4aff7ac821..0bc6674f2ad3b4607a344d50f247c3c53b4d79a0 100644
--- a/isis/src/control/apps/findfeatures/RobustMatcher.cpp
+++ b/isis/src/control/apps/findfeatures/RobustMatcher.cpp
@@ -670,7 +670,6 @@ int RobustMatcher::ratioTest(std::vector<std::vector<cv::DMatch> > &matches,
int removed(0);
int nInput(0);
- int noTwoNN(0);
int nfailed(0);
// for all matches
for (std::vector<std::vector<cv::DMatch> >::iterator matchIterator= matches.begin();
@@ -689,7 +688,6 @@ int RobustMatcher::ratioTest(std::vector<std::vector<cv::DMatch> > &matches,
else { // does not have 2 neighbours
matchIterator->clear(); // remove match
removed++;
- noTwoNN++;
}
nInput++;
}
diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
index 23a66ca2bfa28655a523e80a4315705cafd24526..8f12d71f8a258a0345acc03ea7ab2f04faff06c5 100644
--- a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
+++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
@@ -1228,7 +1228,6 @@ namespace Isis {
// loop over 3D points
int numObservations = 0;
int numGood3DPoints = 0;
- int numRejected3DPoints = 0;
int numConstrainedCoordinates = 0;
int num3DPoints = m_bundleControlPoints.size();
@@ -1239,7 +1238,6 @@ namespace Isis {
BundleControlPointQsp point = m_bundleControlPoints.at(i);
if (point->isRejected()) {
- numRejected3DPoints++;
continue;
}
@@ -1285,8 +1283,6 @@ namespace Isis {
m_bundleResults.setNumberConstrainedPointParameters(numConstrainedCoordinates);
m_bundleResults.setNumberImageObservations(numObservations);
- int numRejectedLidarPoints = 0.0;
- int numGoodLidarPoints = 0.0;
numObservations = 0;
numConstrainedCoordinates = 0;
@@ -1300,7 +1296,6 @@ namespace Isis {
BundleLidarControlPointQsp point = m_bundleLidarControlPoints.at(i);
if (point->isRejected()) {
- numRejectedLidarPoints++;
continue;
}
@@ -1336,8 +1331,6 @@ namespace Isis {
m_numLidarConstraints += point->applyLidarRangeConstraints(m_sparseNormals, N22, N12, n1, n2);
numConstrainedCoordinates += formLidarPointNormals(N22, N12, n2, m_RHS, point);
-
- numGoodLidarPoints++;
} // end loop over lidar 3D points
m_bundleResults.setNumberLidarRangeConstraints(m_numLidarConstraints);
diff --git a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
index a298615b59f3af2d7e5b1fc671d45d3120ba71d6..def372984d66931fdbb7eaa47bd5e33cd7f23328 100644
--- a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
+++ b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp
@@ -402,7 +402,7 @@ void IsisMain() {
}
os << endl;
}
- delete ref2;
+ delete[] ref2;
}
else {
for (int i=minobs; i<=maxobs; i++) {
diff --git a/isis/src/lro/apps/lronaccal/lronaccal.cpp b/isis/src/lro/apps/lronaccal/lronaccal.cpp
index 6f9bf917ebb00fb8ddd0ad7ee715caf447783f9d..95aaa47245e111e78b980a53be1617e9931b1c88 100644
--- a/isis/src/lro/apps/lronaccal/lronaccal.cpp
+++ b/isis/src/lro/apps/lronaccal/lronaccal.cpp
@@ -492,10 +492,8 @@ namespace Isis {
}
TextFile file(filename.expanded());
QString lineString;
- unsigned int line = 0;
while(file.GetLine(lineString)) {
data.push_back(toDouble(lineString.split(QRegExp("[ ,;]")).first()));
- line++;
}
fileString = filename.original();
}
diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
index 22a58cac744824320279ca3060d44148ecce6084..4d565e19065474755ab763984593fd0d845f6f00 100644
--- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
+++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp
@@ -737,9 +737,7 @@ namespace Isis {
// Determine instrument ID (inst)
PvlKeyword &key = _label.findKeyword("NaifIkCode", PvlObject::Traverse);
QString iCode = key[0];
- SpiceInt inst = (int) key;
key = _label.findKeyword("Number", PvlObject::Traverse);
- inst -= (int) key;
// Get CK time tolerance (tol)
SpiceDouble tol;
diff --git a/isis/src/mgs/apps/mocuncompress/main.cpp b/isis/src/mgs/apps/mocuncompress/main.cpp
index 29828f1e5eed9dcce250ebd8009c4d6b4f79e125..655ce79b054c294fc1ae0820ec54b0eb6e85d1c5 100644
--- a/isis/src/mgs/apps/mocuncompress/main.cpp
+++ b/isis/src/mgs/apps/mocuncompress/main.cpp
@@ -497,8 +497,8 @@ int main(int argc, char **argv)
lasth = h;
fseek(infile, total + 2048, 0);
count = fread(&h, sizeof(h), 1, infile);
- MAKELONG(h.len);
- if(count && MAKELONG(h.len) == 0) {
+ int32_t h_len = MAKELONG(h.len);
+ if(count && h_len == 0) {
// simulate the EOF even though there's padding
count = 0;
h = lasth;
@@ -511,7 +511,7 @@ int main(int argc, char **argv)
total_image += len;
}
if(count == 0) break;
- if(MAKELONG(h.len) == 0) break;
+ if(h_len == 0) break;
sequence += 1;
if(first && !multi) {
diff --git a/isis/src/mro/apps/hicrop/hicrop.cpp b/isis/src/mro/apps/hicrop/hicrop.cpp
index b0c66f6f73be134683d20d1d2f1b7cd225269ce3..f6bd38efce6331f90d5e469df567760c3bf93018 100644
--- a/isis/src/mro/apps/hicrop/hicrop.cpp
+++ b/isis/src/mro/apps/hicrop/hicrop.cpp
@@ -397,7 +397,6 @@ namespace Isis {
void crop(Buffer &out) {
// Read the input line
int iline = g_cropStartLine + (out.Line() - 1);
- int band = 1;
g_in->SetLine(iline, 1);
g_cube->read(*g_in);
@@ -405,8 +404,6 @@ namespace Isis {
for (int i = 0; i < out.size(); i++) {
out[i] = (*g_in)[i];
}
-
- if (out.Line() == g_cropLineCount) band++;
}
/**
diff --git a/isis/src/system/apps/isisdataeval/isisdataeval.cpp b/isis/src/system/apps/isisdataeval/isisdataeval.cpp
index 4d21fb1c952fb57d56581618bb62e2f0b8c55dbb..4503fa3c92640694e944ca7afa866791c7befe49 100644
--- a/isis/src/system/apps/isisdataeval/isisdataeval.cpp
+++ b/isis/src/system/apps/isisdataeval/isisdataeval.cpp
@@ -276,7 +276,6 @@ namespace Isis {
v_progress.SetText("inventory+"+hashtag);
v_progress.SetMaximumSteps( v_isisdatadir.size() );
v_progress.CheckStatus();
- BigInt n_symlinks = 0;
QCryptographicHash volume_hash( hash_algorithm );
// Determine size (MB) of file buffer for hashing only if requested
@@ -297,7 +296,6 @@ namespace Isis {
// Check for symbolic links
if ( dbfile.isSymbolicLink() ) {
- n_symlinks++;
QString symtarget = dbfile.info().symLinkTarget();
DBFileStatus symfile( symtarget );
diff --git a/isis/src/viking/apps/vikfixtrx/main.cpp b/isis/src/viking/apps/vikfixtrx/main.cpp
index c62f00924917da2f738fd6c521c5166ddb55ed3d..68ee572385359d01c73b622caa7622281ed46ce8 100644
--- a/isis/src/viking/apps/vikfixtrx/main.cpp
+++ b/isis/src/viking/apps/vikfixtrx/main.cpp
@@ -64,8 +64,6 @@ void fixtrx(Buffer &in, Buffer &out) {
}
// Go fix the bad tracks
- int trxflag = 0;
- for(trk = 0; trk < 7; trxflag += badtrx[trk++]);
for(trk = 0; trk < 7; trk++) {
if(badtrx[trk] == true) {
for(isamp = trk; isamp < nsamps; isamp += 7) {
diff --git a/isis/tests/FunctionalTestsMsi2isis.cpp b/isis/tests/FunctionalTestsMsi2isis.cpp
index 89f90b2a4271a3b14f1a060f4054cf1419a4cd71..a5006e8a45dd5abc7978bfec1178f0901a6969ac 100644
--- a/isis/tests/FunctionalTestsMsi2isis.cpp
+++ b/isis/tests/FunctionalTestsMsi2isis.cpp
@@ -158,8 +158,6 @@ TEST_F(TempTestingFiles, Msi2isisTestGblIngestNoTrim) {
EXPECT_NEAR(hist->StandardDeviation(), 0.017675184374796, .0001);
// This section tests that the edge was not trimmed (TRIM=FALSE)
- // Count the number of edge pixels
- int total_edge_pixels = 0;
const int trimSize = 33;
const int expectValid = cube.sampleCount() - ( 2 * trimSize);
@@ -176,14 +174,12 @@ TEST_F(TempTestingFiles, Msi2isisTestGblIngestNoTrim) {
const double *lbuf = line.DoubleBuffer();
if ( (line.Line() <= trimSize) || ( line.Line() > end_l ) ) {
trimEdge.AddData(&lbuf[0], line.size());
- total_edge_pixels += line.size();
}
else {
// This is past full line trimming and is on the edges only
trimEdge.AddData(&lbuf[0], trimSize);
trimEdge.AddData(&lbuf[end_s], trimSize);
- total_edge_pixels += (trimSize + trimSize);
// Add valid data in untrimmed area which should match the image
// histogram data of whole trimmed image in the first test