diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf3702de5..70a70e7390 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,6 +70,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github - Changed 'jigsaw' attribute type to account for Linux compiler changes [#5904](https://github.com/DOI-USGS/ISIS3/pull/5904) - Updated GDAL to 3.12 and QT to 6.X [#5909](https://github.com/DOI-USGS/ISIS3/pull/5909) - Updated cmake configs to accommodate new cspice release [#5886](https://github.com/DOI-USGS/ISIS3/pull/5886) +- Changed `PVL` class to read data from GDAL metadata directly [#5824](https://github.com/DOI-USGS/ISIS3/pull/5824) ### Fixed - Fixed Chandrayaan-2 TMC2 serial numbers by setting InstrumentId to CH2_TMC_FORE/NADIR/AFT based on the filename sensor [#5871](https://github.com/DOI-USGS/ISIS3/issues/5871) diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 72cd66ddb2..e69dc72bf0 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -302,7 +302,7 @@ find_package(GSL 2.2.1 REQUIRED) find_package(HDF5 1.8.15 REQUIRED) find_package(Jama 125 REQUIRED) find_package(NN REQUIRED) -find_package(OpenCV 4.12.0 REQUIRED) +find_package(OpenCV 4.9.0 REQUIRED CONFIG) find_package(PCL REQUIRED) find_package(Protobuf REQUIRED CONFIG) find_package(PROJ REQUIRED CONFIG) @@ -396,6 +396,9 @@ endforeach() # add target based linkages to ALLLIBS variable list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL Bullet::Bullet_double CSPICE::cspice) +list(APPEND ALLLIBS ${OpenCV_LIBS}) +list(APPEND ALLINCDIRS ${OpenCV_INCLUDE_DIRS}) + # Sometimes we add the same lib more than once (especially with LIBDIRS) list(REMOVE_DUPLICATES ALLLIBDIRS) list(REMOVE_DUPLICATES ALLLIBS) diff --git a/isis/src/base/apps/catlab/main.cpp b/isis/src/base/apps/catlab/main.cpp index a9595e3054..f48d3a0525 100644 --- a/isis/src/base/apps/catlab/main.cpp +++ b/isis/src/base/apps/catlab/main.cpp @@ -17,14 +17,7 @@ void IsisMain() { QString file = ui.GetCubeName("FROM"); // Extract label from file - Pvl label; - try { - label = Pvl(file); - } - catch (...) { - Cube cube(file); - label = *cube.label(); - } + Pvl label(file); // Output to file if entered if(ui.WasEntered("TO")) { diff --git a/isis/src/base/apps/spiceinit/SpiceClient.cpp b/isis/src/base/apps/spiceinit/SpiceClient.cpp index 5d1d8e1d3d..eddad9cb49 100644 --- a/isis/src/base/apps/spiceinit/SpiceClient.cpp +++ b/isis/src/base/apps/spiceinit/SpiceClient.cpp @@ -77,6 +77,12 @@ namespace Isis { raw += "