Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed capital E that caused an error #5466

Merged
merged 2 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ release.
- Skypt has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5443](https://github.com/USGS-Astrogeology/ISIS3/issues/5443)

### Fixed
- Fixed a bug in which capital E was problematic for OSX / Ubuntu
- Fixed bug in which not all references to 'version' file were replaced with new 'isis_version.txt' file [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
- Fixed a bug in which the IrregularBodyCameraGroundMap unit test was removed but not the associated truth file. [#5461](https://github.com/DOI-USGS/ISIS3/issues/5461)
- Fixed a bug in which the histogram tool used the entire image to calculate bin size, which caused an issue with high dynamic range images. [#5371](https://github.com/DOI-USGS/ISIS3/issues/5371)
Expand Down
4 changes: 2 additions & 2 deletions isis/src/control/objs/ControlNetVersioner/unitTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,11 @@ void TestNetwork(const QString &filename, Progress *progress, bool printNetwork,
cNet2->write( FileName("./tmpCNet2") );

//if there are differences between the pvls.
QString cmd = "diff -EbB --suppress-common-lines -I 'Version.*' " + networkFileName.expanded() + " ./tmp.pvl";
QString cmd = "diff -bB --suppress-common-lines -I 'Version.*' " + networkFileName.expanded() + " ./tmp.pvl";
if(system(cmd.toStdString().c_str())) {

//if the binary files are different.
if(system("diff -EbB --suppress-common-lines ./tmp ./tmpCNet2")){
if(system("diff -bB --suppress-common-lines ./tmp ./tmpCNet2")){
cout << "The conversion from binary to pvl is incorrect." << endl;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion isis/src/osirisrex/apps/tagcams2isis/tagcams2isis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ namespace Isis {
output->putGroup(instGrp);

// Create a Band Bin group
FileName bandTransFile(transDir + "OsirisRExTagcamsBandBin_fit.trn");
FileName bandTransFile(transDir + "OsirisRexTagcamsBandBin_fit.trn");
PvlToPvlTranslationManager bandBinXlater(fitsLabel, bandTransFile.expanded());
bandBinXlater.Auto(outLabel);
output->putGroup(outLabel.findGroup("BandBin", Pvl::Traverse));
Expand Down