latest from "nitro" and "coda-oss" (#462)

J. Daniel Smith · Dan Smith · web-flow · commit 758f189576e8 · 2021-06-10T16:59:57.000-04:00
* Create CMakeSettings.json * new/updated "docs" directory * update externals/nitro with latest from nitro repo * use in32_t, etc. instead of nitf::Int32_t * Revert "Merge branch 'feature/update_nitro' into develop/jdsmith" This reverts commit 52001ee, reversing changes made to aac9d2c. * Revert "Merge branch 'feature/use_standard_C_types' into develop/jdsmith" This reverts commit aac9d2c, reversing changes made to 89b7807. * use in32_t, etc. instead of nitf::Int32_t * update externals/nitro with latest from nitro repo * Revert "update externals/nitro with latest from nitro repo" This reverts commit 7eb2813. * update nitro/nrt * update "nitro" * nitf::Int8 -> int8_t * updates from coda-oss and nitro * update externals/nitro with latest from "main" * update externals/coda-oss with latest from "main" * don't want "docs" directory in externals/nitro * fix bad merge * ignore CMake-generated files * std::auto_ptr -> std::unique_ptr * need std::auto_ptr<> overloads for pre-generated Python wrapper code * provide std::auto_ptr "overloads" so that existing Python wrapper code continues to work w/o changes * impelement std::auto_ptr "overrides" * latest from nitro:main * update externals/nitro * update coda-oss * Create codeql-analysis.yml * update coda-oss with latest from "main" * update nitro with latest from "main" * Revert "Create codeql-analysis.yml" This reverts commit b261bbd. * fix nitf::Field to get rid of compiler errors * build externals/coda-oss by itself * build with Visual Studio 2019 (#358) * Revert "Create codeql-analysis.yml" This reverts commit 4388277. * build nitro projects in SIX solution * build "six" as a Visual Studio project * build "scene" with Visual Studio * build cphd with Visual Studio * build cphd03 with Visual Studio * build six.sicd with Visual Studio * build six.sidd with Visual Studio * buid six.convert with Visual Studio * add a GTest project * trying to get a unittest working * build XML_DATA_CONTENT * get a NITF unit-test working :-) * run all "six" unittests * fix dummy DEFAULT_SCHEMA_PATH * allow unit-tests to run in Visual Studio * run SIDD unit-tests from Visual Studio * set SIX_SCHEMA_PATH so unittest works * run SICD unittests in Visual Studio * build and run six.sicd unittests in Visual Studio * set NITF_PLUGIN_PATH for sicd_test_area_plane * build cphd03 unittests in Visual Studio * run remaining cphd03 unittests * fix build error introduced with VS2019 changes * build cphd unittests in Visual Studio * build & run remaining cphd unittests in Visual Studio * use c++11 (#359) * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * get rid of hard-coded paths with <filesystem> (#360) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * build crop_sicd in Visual Studio (#361) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * build crop_sicd * update coda-oss with latest from "main" * update coda-oss with latest from "main" (#362) * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from coda-oss "main" (#364) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * update coda-oss (#365) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * latest from coda-oss * another update to coda-oss (#366) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * latest from coda-oss * latest from coda-oss * Develop/update externals (#367) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * latest from coda-oss * latest from coda-oss * latest from coda-oss * latest from coda-oss (#368) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * latest from coda-oss * latest from coda-oss * latest from coda-oss * latest from "main" on coda-oss * latest from coda-oss (#369) * update coda-oss with latest from "main" * coda-oss updates to make TextEncoding part of the OutputStream * updates from coda-oss to make TextEncoding part of the OutputStream * fix StringStream() .ctor() * one more coda-oss update * latest from "main" on coda-oss: xml.lite updates for UTF-8 * restore changes lost in merge * latest from coda-oss * latest from coda-oss * latest from coda-oss * latest from "main" on coda-oss * use Filesystem.h from coda-oss instead of <filesystem> * use sys::Filesystem * update "nitro" and "coda-oss" (#370) * update "nitro" and "coda-oss" * Delete CMakeSettings.json * changeFileHeader() doesn't (yet) work in "externals" * preserve utf8 in XML text (#363) * pass io::Encoding::Utf8 to print() and prettyPrint() to preserve UTF-8 in output * store the value of xml::lite::MinidomParser::preserveCharacterData() so we can figure out the encoding * Don't want to set a dummy schema path to a directory that exists * add a unit-test for UTF-8 characters in "Classification" * fix isUnclassified() so it works for "NON CLASSIFIÉ / UNCLASSIFIED" * Revert "Merge branch 'main' into bugfix/preserve_UTF8_in_classified_field" This reverts commit 12534c9, reversing changes made to 02ce755. * account for coda-oss changes where TextEncoding is part of the OutputStream * get the right verson of Element.h * use new xml::lite to read/write XML in UTF-8 * be sure we can read-in and process UTF-8 from a NITF * assume UTF-8 on *ix and Windows-1252 on Windows * reduce "gratuatous" diffs for simpler merge request * one more unneeded diff * French -> Canada * latest from coda-oss * trying to get the test_valid_six unittest working on Linux * use .tar, not .tar.gz * add another unit-test (#371) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * remove some compiler warnings (#372) * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update externals (#373) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * use c++11 features (#374) * update "nitro" * update coda-oss and fix compiler errors * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest "nitro" (#375) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" (#376) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more use of C++11 (#377) * update "nitro" * update coda-oss and fix compiler errors * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * fix build errors from recent changes (#378) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update "nitro" * update coda-oss and fix compiler errors * update "nitro" * update coda-oss and fix compiler errors * use "externals" from top-level "install" * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * build with simplified "externals" scheme * latest from "nitro" * match nitro -> nitf change * make_span() * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * fix compiler errors from previous merge; mostly #include <thread> * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * latest from "coda-oss" * NULL -> nullptr (#379) * update "nitro" * update coda-oss and fix compiler errors * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * use filesystem::path and std::endian * less use of sys:: * NULL -> nullptr * latest from coda-oss (#381) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from develop/jdsmith (#382) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update "nitro" * update coda-oss and fix compiler errors * update "nitro" * update coda-oss and fix compiler errors * use "externals" from top-level "install" * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * build with simplified "externals" scheme * latest from "nitro" * match nitro -> nitf change * make_span() * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * fix compiler errors from previous merge; mostly #include <thread> * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * latest from "coda-oss" * use filesystem::path and std::endian * more filesystem from coda-oss * less use of sys:: * NULL -> nullptr * use .data() rather than &d[0] * mem::BufferView -> std::span * const std::span<>& doesn't make much sense * need make_span() overload for pointer+size * latest from "nitro" (#383) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from "nitro" * latest from develop/jdsmith (#385) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update "nitro" * update coda-oss and fix compiler errors * update "nitro" * update coda-oss and fix compiler errors * use "externals" from top-level "install" * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * build with simplified "externals" scheme * latest from "nitro" * match nitro -> nitf change * make_span() * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * fix compiler errors from previous merge; mostly #include <thread> * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * latest from "coda-oss" * use filesystem::path and std::endian * more filesystem from coda-oss * less use of sys:: * NULL -> nullptr * use .data() rather than &d[0] * mem::BufferView -> std::span * const std::span<>& doesn't make much sense * need make_span() overload for pointer+size * latest from "nitro" * std::endian * coda-oss now gives us std::endian * sys::Filesystem -> std::filesystem * don't need to explicitly call fs::path::string() in most cases * sys::Filesystem -> std::filesystem * fix build errors when using C++17 * latest from "nitro" (#387) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from "nitro" * std::endian * latest from "nitro" * latest changes from develop/jdsmith (#386) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update "nitro" * update coda-oss and fix compiler errors * update "nitro" * update coda-oss and fix compiler errors * use "externals" from top-level "install" * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * build with simplified "externals" scheme * latest from "nitro" * match nitro -> nitf change * make_span() * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * fix compiler errors from previous merge; mostly #include <thread> * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * latest from "coda-oss" * use filesystem::path and std::endian * more filesystem from coda-oss * less use of sys:: * NULL -> nullptr * use .data() rather than &d[0] * mem::BufferView -> std::span * const std::span<>& doesn't make much sense * need make_span() overload for pointer+size * latest from "nitro" * std::endian * coda-oss now gives us std::endian * sys::Filesystem -> std::filesystem * don't need to explicitly call fs::path::string() in most cases * sys::Filesystem -> std::filesystem * fix build errors when using C++17 * simplify access to some ImageSubheader values * newReadControl() returns a std::unique_ptr<> rather than a raw pointer * a singleton is much easier in C++11 * don't need to do manual locking in C++11 * use a template and some macros to dramatically simplify Enums * adjust macros for GCC, provide operators for SWIG * got the map entries wrong * make getIndices() a bit more robust * store a std::unique_ptr<> instead of a raw poniter * throw exceptions in getIndices() rather than assuming * use Enum<T>.toString() where possible rather than duplicating code * remove duplicate code converting from a string to Enum<T> * don't explicilty check for "SIDD" as that's already part of getDataType() * use std::string instead of char[] * reduce use of "delete[]" * less use of "SICD" and "SIDD", use six::DataType instead * simplify Region buffer management * reduce some explicit use of std::shared_ptr<> with std::make_shared and/or auto * more reduction in explicit use of std::shared_ptr * latest from "nitro" * simplify use of six::Region * reduce use of explicit .toString() * further reduction in explicit use of toString() * template specialiaton can't be inline with G++ * simplify cphd enum creation * reduce use of toString() with setAttribute() * update externals (#388) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from "nitro" * std::endian * latest from "nitro" * latest from "nitro" and "coda-oss" * reduce use of toString() (#389) * put common #includes for PCH in a single file * build check_valid_six * use EXIT_* rather than 0/1 * getting rid of std::auto_ptr<> because it's gone in C++17 * build all projects with C++17 * use <filesystem> to remove hard-coded paths * in Visual Studio, run check_valid_six with a pre-defined path * tweak plugin dir * can't have "check_valid_six" as a directory for *ix build * build crop_sicd * turn on /Wall, fix some warnings * C++17 generates more warnings that I don't want to fix right now * removed some compiler warnings from third-party code * comment-out use of C++17's <filesystem> * tweak project settings for consistency * unit-test for createFakeComplexData() * turn on compiler warnings * crank-up warning level * enable "Warnings as errors" * turn on all warnings (many #pragma'd away) * get rid of more warnings * adjust more #pragma's * update "nitro" * update coda-oss and fix compiler errors * update "nitro" * update coda-oss and fix compiler errors * use "externals" from top-level "install" * use int64_t, etc. instead of sys::Int64_T * mem::SharedPtr -> std::shared_ptr * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * use std::unique_ptr<[]> instead of mem::ScopedArray * use int32_t et. al. instead of sys::Int32_T * use std::byte (not quite working yet, but need to move code to a faster machine) * build with std::byte * build with simplified "externals" scheme * latest from "nitro" * match nitro -> nitf change * make_span() * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs() * sys::Off_T -> ptrdiff_t * fix compiler errors from previous merge; mostly #include <thread> * Revert "sys::Off_T -> ptrdiff_t" This reverts commit aa22a37. * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t * latest from "coda-oss" * use filesystem::path and std::endian * more filesystem from coda-oss * less use of sys:: * NULL -> nullptr * use .data() rather than &d[0] * mem::BufferView -> std::span * const std::span<>& doesn't make much sense * need make_span() overload for pointer+size * latest from "nitro" * std::endian * coda-oss now gives us std::endian * sys::Filesystem -> std::filesystem * don't need to explicitly call fs::path::string() in most cases * sys::Filesystem -> std::filesystem * fix build errors when using C++17 * simplify access to some ImageSubheader values * newReadControl() returns a std::unique_ptr<> rather than a raw pointer * a singleton is much easier in C++11 * don't need to do manual locking in C++11 * use a template and some macros to dramatically simplify Enums * adjust macros for GCC, provide operators for SWIG * got the map entries wrong * make getIndices() a bit more robust * store a std::unique_ptr<> instead of a raw poniter * throw exceptions in getIndices() rather than assuming * use Enum<T>.toString() where possible rather than duplicating code * remove duplicate code converting from a string to Enum<T> * don't explicilty check for "SIDD" as that's already part of getDataType() * use std::string instead of char[] * reduce use of "delete[]" * less use of "SICD" and "SIDD", use six::DataType instead * simplify Region buffer management * reduce some explicit use of std::shared_ptr<> with std::make_shared and/or auto * more reduction in explicit use of std::shared_ptr * latest from "nitro" * simplify use of six::Region * reduce use of explicit .toString() * further reduction in explicit use of toString() * template specialiaton can't be inline with G++ * simplify cphd enum creation * reduce use of toString() with setAttribute() * latest from "nitro" and "coda-oss" * don't need catch(excep::Exception) ex.toString() as std::exception::what() now does the same thing * really only have two calls to setAttribute(): std::string and size_t * use macros to generate SIDD Enums * add operator<< for Enum<T> to avoid some explicit .toString() calls * add operator==(std::string) overload to redue need for .toString() * add operator<<() to redue need for .toString() * don't implmeent a bunch of six::toString() routines; they sholdn't be called anymore * further reduction in use of toString() * eliminate six::toString() template; just provide a few overloads instead * createSixString() which calls six::toString(t) instead of t.toString() * createSixString() overload with URI parameter * allow different strings (e.g., "1" and "+1") to map to the same value * put "Enum" support code in a separate file * there is now just one NOT_SET_VALUE * latest from coda-oss (#390) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from "nitro" * std::endian * latest from "nitro" * latest from "nitro" and "coda-oss" * latest from coda-oss * lost toString<nullptr>() * latest from coda-oss/main * want "std" augmented in this repo * latest from coda-oss and nitro (#391) * update "nitro" * update coda-oss and fix compiler errors * update coda-oss and nitro with less use of sys:: * unit-test paths are wrong for "externals" * update "nitro" to get SegmentMemorySource overloads * latest from "nitro" * match nitro -> nitf change * make_span() * latest from "coda-oss" * more filesystem from coda-oss * latest from "nitro" * std::endian * latest from "nitro" * latest from "nitro" and "coda-oss" * latest from coda-oss * lost toString<nullptr>() * latest from coda-oss/main * want "std" augmented in this repo * partial update from coda-oss/main * latest from coda-oss/main * update coda-oss with latest from https://github.com/mdaus/coda-oss * update externals/nitro/docs * latest from "nitro" * Revert "latest from "nitro"" This reverts commit 0b99300. * latest from nitro/master * ignore build/ directory * Revert "latest from nitro/master" This reverts commit e89da71. * update externals/nitro/docs * update "c", "java", "mex", and "python" directories -- but not "c++" * update other nitro top-level files ... everything except modules/c++ * VCXPROJ files from nitro * several changes from nitro/c++ ... hoping this builds. * fix build error on Linux * more changes from nitro/modules/c++ * fix IOStreamWriter ctor * more changes from nitro/modules/c++ * paths are wrong when in "externals" * remove externals/nitro/docs * slam in "main" * latest from coda-oss/main * adjust coda-oss for our usage * latest from nitro/main * std::span removed from "nitro" * need to redo C++17 * fix missing #include file * remove "nitro" files not needed in externals/nitro * paths are wrong in "externals" * Revert "remove "nitro" files not needed in externals/nitro" This reverts commit da30b96. * Revert "Revert "remove "nitro" files not needed in externals/nitro"" This reverts commit e69391b. * slam in externals as merging creates too many conflicts * merge brought back a deleted #include * add back "java" and "mex" * lates from coda-oss/main * latest from "nitro" * paths are wrong in "externals" * need to redo C++17 support * std::span -> gsl::span * Revert "std::span -> gsl::span" This reverts commit c10f233. * latest from coda-oss and nitro * these are the correct files from "master" * gsl::span -> std::span * get #includes right for PCH * didn't want this change * trigger build on GitHub * remove files that shouldn't have been committed * latest from coda-oss:master * latest from nitro::master * adjust to API changes in coda-oss/xml.lite * latest from coda-oss * latest from coda-oss * std::filesystem::path doesn't implicitly convert to std::string * more place where an explicit std::filesystem::path::string() call is needed * latest from "coda-oss" and "nitro" * latest from coda-oss * one more change from coda-oss * "nitro" changes to build with C90 instead of C99 * old C++11 compilers don't like template<template> * new TREs from "nitro" * std::shared_ptr<> doesn't have [] versions, only std::unique_ptr * build with older compilers * latest coda-oss changes * Update .gitignore from "nitro" * SWIG doesn't like "final" * SWIG doesn't like "final" * latest from coda_oss * latest from "nitro" * add a version number to externals/coda-oss * add a version number to externals/nitro * restore "build" and "cmake" * Gsl_.h got lost ... ? * update CMS to 3.0.3.3 (#433) * remove version numbers (for now); we've went a very long time w/o them * finish rename * version number is in too many places ... * missing .cmake files * missing "build" files * latest from coda-oss * latest from "master" on coda-oss * latest from "master" at nitro * remove CA diagnostics from coda-oss * CODA_OSS_AUGMENT_std_namespace got clobbered again * update coda-oss and nitro * be sure coda-oss "std" files are copied * use new coda-oss "std" headers * more coda-oss changes * updates from coda-oss and nitro * latest from coda-oss * fix coda-oss unittest dependencies * WAF dependencies for "scene" * sys/Filesystem.h -> std/filesystem * build using C++17 features * account for removed coda-oss overloads * add back coda_oss;;filesystem::path * forgot to add new "coda_oss" directory * latest from "coda-oss" and "nitro" * tweaks to python wrappers from coda-oss * updates from coda-oss to remove compiler warnings * another update to coda-oss to get rid of code-analysis diagnostics * latest from coda-oss * coda-oss updates to reduce compiler warnings/code-analysis diagnostics * latest from coda-oss to reduce compiler warnings * more code-analysis diagnostics fixes from coda-oss * latest from coda-oss * updates from "nitro" * lost sys/Conf.h #include * latest from coda-oss and nitro * latest from nitro * latest from coda-oss * updates from "nitro" * latest from "nitro" to support nitf-c++ as a DLL/shared-library * build w/o errors when nitf-c++ is a DLL * explicitly list SegmentMemorySource() overloads * latest from coda-oss to get rid of more compiler warnings/code-analysis diagnostics * be sure NITRO validation changes don't break SIX unittests * build NITRO @ /W4 * latest from "nitro" and "coda-oss" * reduce use of .c_str() in "nitro" * changes from coda-oss to reduce code-analysis diagnostics * tweaks for VS2019 16.10 * latest from nitro and coda-oss * latest from coda-oss * latest from NITRO Co-authored-by: Dan Smith <j.daniel.smith@mdaus.com>
diff --git a/externals/coda-oss/modules/c++/except/include/except/Exception.h b/externals/coda-oss/modules/c++/except/include/except/Exception.h
@@ -55,6 +55,8 @@
   struct _Name##Exception : public _Base \
   { \
       _Name##Exception() = default; virtual ~_Name##Exception() = default; \
+      _Name##Exception(const _Name##Exception&) = default;  _Name##Exception& operator=(const _Name##Exception&) = default; \
+      _Name##Exception(_Name##Exception&&) = default;  _Name##Exception& operator=(_Name##Exception&&) = default; \
       _Name##Exception(const except::Context& c) : _Base(c){} \
       _Name##Exception(const std::string& msg) : _Base(msg){} \
       _Name##Exception(const except::Throwable& t, const except::Context& c) : _Base(t, c){} \
diff --git a/externals/coda-oss/modules/c++/except/include/except/Throwable.h b/externals/coda-oss/modules/c++/except/include/except/Throwable.h
@@ -109,7 +109,7 @@ class Throwable
      * Get the trace
      * \return The trace (const)
      */
-    const Trace& getTrace() const
+    const Trace& getTrace() const noexcept
     {
         return mTrace;
     }
@@ -118,7 +118,7 @@ class Throwable
      * Get the trace
      * \return The trace (non-const)
      */
-    Trace& getTrace()
+    Trace& getTrace() noexcept
     {
         return mTrace;
     }
@@ -143,7 +143,7 @@ class Throwable
         return s.str();
     }
 
-    const std::vector<std::string>& getBacktrace() const
+    const std::vector<std::string>& getBacktrace() const noexcept
     {
         return mBacktrace;
     }
diff --git a/externals/coda-oss/modules/c++/except/include/except/Trace.h b/externals/coda-oss/modules/c++/except/include/except/Trace.h
@@ -63,15 +63,15 @@ struct Trace final
     /*!
      * Pops Context off the stack
      */
-    void popContext()
+    void popContext() noexcept
     {
         mStack.pop_front();
     }
 
     /*!
      * Gets first Context on stack
      */
-    const Context& getContext() const
+    const Context& getContext() const noexcept
     {
         return mStack.front();
     }
@@ -80,7 +80,7 @@ struct Trace final
      * Get the stack
      * \return The stack (const)
      */
-    const std::list<Context>& getStack() const
+    const std::list<Context>& getStack() const noexcept
     {
         return mStack;
     }
@@ -89,7 +89,7 @@ struct Trace final
      * Get the stack
      * \return The stack (non-const)
      */
-    std::list<Context>& getStack()
+    std::list<Context>& getStack() noexcept
     {
         return mStack;
     }
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp b/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp
@@ -25,12 +25,13 @@
 #pragma once
 
 #include <assert.h>
+#include <stdio.h>
 
 #include <vector>
 #include <string>
-#include <memory>
 
 #include <std/span>
+#include <std/cstddef> // std::byte
 
 #include "nitf/coda-oss.hpp"
 #include "nitf/ImageReader.h"
@@ -49,7 +50,7 @@ namespace nitf
     class BufferList /*final*/   // no "final", SWIG doesn't like it
     {
         std::vector<T*> buffer;
-        std::vector<std::unique_ptr<T[]>> buffer_;
+        std::vector<std::vector<T>> buffer_;
 
     public:
         BufferList(size_t nBands)
@@ -61,8 +62,8 @@ namespace nitf
         {
             for (size_t i = 0; i < size(); i++)
             {
-                buffer_[i].reset(new T[subWindowSize]);
-                buffer[i] = buffer_[i].get();
+                buffer_[i].resize(subWindowSize);
+                buffer[i] = buffer_[i].data();
             }
         }
 
@@ -81,7 +82,24 @@ namespace nitf
         {
             return buffer[i];
         }
+
+        int padded = 0;
+
+        using iterator = typename std::vector<std::vector<T>>::iterator;
+        iterator begin() { return buffer_.begin(); }
+        iterator end() { return buffer_.end(); }
+
+        using const_iterator = typename std::vector<std::vector<T>>::const_iterator;
+        const_iterator begin() const { return buffer_.begin(); }
+        const_iterator end() const { return buffer_.end(); }
+        const_iterator cbegin() const { return buffer_.cbegin(); }
+        const_iterator cend() const { return buffer_.cend(); }
     };
+    template<typename T>
+    inline size_t write(FILE* f, const std::vector<T>& buffer)
+    {
+        return fwrite(buffer.data(), sizeof(T), buffer.size() / sizeof(T), f);
+    }
 
 /*!
  *  \class ImageReader
@@ -121,6 +139,7 @@ DECLARE_CLASS(ImageReader)
         void* user_ = user;
         read(subWindow, static_cast<uint8_t**>(user_), padded);
     }
+    BufferList<std::byte> read(const nitf::SubWindow& subWindow, size_t nbpp);
 
     /*!
      *  Read a block directly from file
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSubheader.hpp b/externals/nitro/modules/c++/nitf/include/nitf/ImageSubheader.hpp
@@ -287,6 +287,10 @@ DECLARE_CLASS(ImageSubheader)
 
     //! Get the actualBitsPerPixel
     nitf::Field getActualBitsPerPixel() const;
+    size_t actualBitsPerPixel() const
+    {
+        return getActualBitsPerPixel();
+    }
 
     //! Get the pixelJustification
     nitf::Field getPixelJustification() const;
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/SubWindow.hpp b/externals/nitro/modules/c++/nitf/include/nitf/SubWindow.hpp
@@ -25,6 +25,8 @@
 #include <string>
 #include <vector>
 
+#include <std/optional>
+
 #include "nitf/SubWindow.h"
 #include "nitf/DownSampler.hpp"
 #include "nitf/Object.hpp"
@@ -87,9 +89,9 @@ DECLARE_CLASS(SubWindow)
     void setStartCol(uint32_t value);
     void setNumCols(uint32_t value);
     void setBandList(uint32_t * value);
+    void setBandList(std::vector<uint32_t>&&);
     void setNumBands(uint32_t value);
 
-
     /*!
      * Reference a DownSampler within the SubWindow
      * The SubWindow does NOT own the DownSampler
@@ -103,13 +105,16 @@ DECLARE_CLASS(SubWindow)
 
     /*!
      * Return the DownSampler that is referenced by this SubWindow.
-     * If no DownSampler is referenced, a NITFException is thrown.
      */
     nitf::DownSampler* getDownSampler() noexcept;
+    const nitf::DownSampler* getDownSampler() const noexcept;
 
 private:
     nitf::DownSampler* mDownSampler = nullptr;
     nitf_Error error{};
+
+    void updateBandList();
+    std::optional<std::vector<uint32_t>> bandList;
 };
 
 #if CODA_OSS_cpp14
diff --git a/externals/nitro/modules/c++/nitf/source/ImageReader.cpp b/externals/nitro/modules/c++/nitf/source/ImageReader.cpp
@@ -22,6 +22,9 @@
 
 #include "nitf/ImageReader.hpp"
 
+#undef min
+#undef max
+
 using namespace nitf;
 
 ImageReader::ImageReader(const ImageReader & x)
@@ -76,6 +79,29 @@ void ImageReader::setReadCaching()
     nitf_ImageReader_setReadCaching(getNativeOrThrow());
 }
 
+BufferList<std::byte> ImageReader::read(const nitf::SubWindow& window, size_t nbpp)
+{
+    // see py_ImageReader_read() and doRead() in test_buffered_read.cpp
+
+    const auto numBitsPerPixel = nbpp;
+    const size_t numBytesPerPixel = NITF_NBPP_TO_BYTES(numBitsPerPixel);
+    const auto numBytesPerBand = static_cast<size_t>(window.getNumRows()) * static_cast<size_t>(window.getNumCols()) *  numBytesPerPixel;
+
+    auto downsampler = window.getDownSampler();
+    const uint32_t rowSkip = downsampler ? downsampler->getRowSkip() : 1;
+    const uint32_t colSkip = downsampler ? downsampler->getColSkip() : 1;
+
+    auto imageDeblocker = getNativeOrThrow()->imageDeblocker;
+    const auto subimageSize = static_cast<size_t>(window.getNumRows() / rowSkip) *
+        (window.getNumCols() / colSkip) * nitf_ImageIO_pixelSize(imageDeblocker);
+
+    BufferList<std::byte> retval(window.getNumBands());
+    retval.initialize(subimageSize);
+    read(window, retval.data(), &retval.padded);
+
+    return std::move(retval);
+}
+
 extern "C" {
     NITF_BOOL nitf_ImageIO_getMaskInfo(nitf_ImageIO* nitf,
         uint32_t* imageDataOffset, uint32_t* blockRecordLength,
diff --git a/externals/nitro/modules/c++/nitf/source/SubWindow.cpp b/externals/nitro/modules/c++/nitf/source/SubWindow.cpp
@@ -29,10 +29,25 @@ SubWindow::SubWindow(const SubWindow & x)
     *this = x;
 }
 
+void SubWindow::updateBandList()
+{
+    assert(bandList.has_value());
+    setBandList(bandList->data());
+    setNumBands(gsl::narrow<uint32_t>(bandList->size()));
+}
+
 SubWindow & SubWindow::operator=(const SubWindow & x)
 {
     if (&x != this)
+    {
         setNative(x.getNative());
+
+        bandList = x.bandList;
+        if (bandList.has_value())
+        {
+            updateBandList();
+        }
+    }
     return *this;
 }
 
@@ -109,6 +124,12 @@ void SubWindow::setBandList(uint32_t * value)
 {
     getNativeOrThrow()->bandList = value;
 }
+void SubWindow::setBandList(std::vector<uint32_t>&& value)
+{
+    bandList = std::move(value);
+    updateBandList();
+}
+
 
 uint32_t SubWindow::getNumBands() const
 {
@@ -143,3 +164,7 @@ nitf::DownSampler* SubWindow::getDownSampler() noexcept
 {
     return mDownSampler;
 }
+const nitf::DownSampler* SubWindow::getDownSampler() const noexcept
+{
+    return mDownSampler;
+}
diff --git a/externals/nitro/modules/c++/nitf/tests/test_extract.cpp b/externals/nitro/modules/c++/nitf/tests/test_extract.cpp
@@ -0,0 +1,117 @@
+/* =========================================================================
+ * This file is part of NITRO
+ * =========================================================================
+ *
+ * (C) Copyright 2004 - 2014, MDA Information Systems LLC
+ *
+ * NITRO is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// modeled after nitf_extract.py
+
+#include <stdio.h>
+
+#include <string>
+#include <vector>
+#include <numeric> // std::iota
+
+#include <import/str.h>
+#include <import/sys.h>
+
+#include <import/nitf.hpp>
+
+template<typename T>
+inline std::vector<T> iota(size_t count, T value)
+{
+    std::vector<T> retval(count);
+    std::iota(retval.begin(), retval.end(), value);
+    return retval;
+}
+
+static  std::vector<std::string> extract_image(const nitf::ImageSubheader& subheader, uint32_t index, nitf::ImageReader& imageReader,
+    const std::string& outDir="", const std::string& baseName="")
+{
+    nitf::SubWindow window;
+    window.setNumRows(subheader.numRows());
+    window.setNumCols(subheader.numCols());
+    window.setBandList(iota(subheader.getBandCount(), static_cast<uint32_t>(0))); // window.bandList = list(range(subheader.getBandCount()))
+    const auto nbpp = subheader.actualBitsPerPixel(); //const auto nbpp = subheader.numBitsPerPixel();
+    const auto bandData = imageReader.read(window, nbpp);
+
+    std::vector<std::string> outNames;
+    size_t band = 0;
+    for (const auto& data : bandData) // for band, data in enumerate(bandData):
+    {
+        auto outName = str::format("%s_%d__%d_x_%d_%d_band_%d.out",
+            baseName.c_str(), index, window.getNumRows(), window.getNumCols(), static_cast<int>(nbpp), static_cast<int>(band));
+        outName = sys::Path::joinPaths(outDir, outName);
+        auto f = fopen(outName.c_str(), "wb"); // f = open(outName, "wb");
+        nitf::write(f, data); // fwrite(data.data(), sizeof(data[0]), data.size() / sizeof(data[0]), f);
+        fclose(f); // f.close();
+        outNames.push_back(outName);
+        band++;
+    }
+
+    return outNames;
+}
+
+static void extract_images(const std::string& fileName, const std::string& outDir = "")
+{
+    nitf::IOHandle handle(fileName);
+    nitf::Reader reader;
+    nitf::Record record = reader.read(handle);
+
+    uint32_t i = 0;
+    for (nitf::ImageSegment segment : record.getImages())
+    {
+        auto imReader = reader.newImageReader(i);
+        extract_image(segment.getSubheader(), i, imReader, outDir, sys::Path::basename(fileName));
+
+        i++;
+    }
+
+    handle.close();
+}
+
+int main(int argc, char **argv)
+{
+    try
+    {
+        //  Check argv and make sure we are happy
+        if (argc != 3)
+        {
+            std::cout << "Usage: %s <input-file> <output-file> \n" << argv[0]
+                    << std::endl;
+            exit( EXIT_FAILURE);
+        }
+
+        // Check that wew have a valid NITF
+        if (nitf::Reader::getNITFVersion(argv[1]) == nitf::Version::NITF_VER_UNKNOWN)
+        {
+            std::cout << "Invalid NITF: " << argv[1] << std::endl;
+            exit( EXIT_FAILURE);
+        }
+
+        extract_images(argv[1]);
+        return 0;
+    }
+    catch (const std::exception& ex)
+    {
+        std::cerr << "ERROR!: " << ex.what() << "\n";
+        return 1;
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class Throwable`
`109`	`109`	`* Get the trace`
`110`	`110`	`* \return The trace (const)`
`111`	`111`	`*/`
`112`		`- const Trace& getTrace() const`
	`112`	`+ const Trace& getTrace() const noexcept`
`113`	`113`	`{`
`114`	`114`	`return mTrace;`
`115`	`115`	`}`
`@@ -118,7 +118,7 @@ class Throwable`
`118`	`118`	`* Get the trace`
`119`	`119`	`* \return The trace (non-const)`
`120`	`120`	`*/`
`121`		`- Trace& getTrace()`
	`121`	`+ Trace& getTrace() noexcept`
`122`	`122`	`{`
`123`	`123`	`return mTrace;`
`124`	`124`	`}`
`@@ -143,7 +143,7 @@ class Throwable`
`143`	`143`	`return s.str();`
`144`	`144`	`}`
`145`	`145`
`146`		`- const std::vector<std::string>& getBacktrace() const`
	`146`	`+ const std::vector<std::string>& getBacktrace() const noexcept`
`147`	`147`	`{`
`148`	`148`	`return mBacktrace;`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,15 +63,15 @@ struct Trace final`
`63`	`63`	`/*!`
`64`	`64`	`* Pops Context off the stack`
`65`	`65`	`*/`
`66`		`- void popContext()`
	`66`	`+ void popContext() noexcept`
`67`	`67`	`{`
`68`	`68`	`mStack.pop_front();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/*!`
`72`	`72`	`* Gets first Context on stack`
`73`	`73`	`*/`
`74`		`- const Context& getContext() const`
	`74`	`+ const Context& getContext() const noexcept`
`75`	`75`	`{`
`76`	`76`	`return mStack.front();`
`77`	`77`	`}`
`@@ -80,7 +80,7 @@ struct Trace final`
`80`	`80`	`* Get the stack`
`81`	`81`	`* \return The stack (const)`
`82`	`82`	`*/`
`83`		`- const std::list<Context>& getStack() const`
	`83`	`+ const std::list<Context>& getStack() const noexcept`
`84`	`84`	`{`
`85`	`85`	`return mStack;`
`86`	`86`	`}`
`@@ -89,7 +89,7 @@ struct Trace final`
`89`	`89`	`* Get the stack`
`90`	`90`	`* \return The stack (non-const)`
`91`	`91`	`*/`
`92`		`- std::list<Context>& getStack()`
	`92`	`+ std::list<Context>& getStack() noexcept`
`93`	`93`	`{`
`94`	`94`	`return mStack;`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,25 @@ SubWindow::SubWindow(const SubWindow & x)`
`29`	`29`	`*this = x;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+void SubWindow::updateBandList()`
	`33`	`+{`
	`34`	`+ assert(bandList.has_value());`
	`35`	`+ setBandList(bandList->data());`
	`36`	`+ setNumBands(gsl::narrow<uint32_t>(bandList->size()));`
	`37`	`+}`
	`38`	`+`
`32`	`39`	`SubWindow & SubWindow::operator=(const SubWindow & x)`
`33`	`40`	`{`
`34`	`41`	`if (&x != this)`
	`42`	`+ {`
`35`	`43`	`setNative(x.getNative());`
	`44`	`+`
	`45`	`+ bandList = x.bandList;`
	`46`	`+ if (bandList.has_value())`
	`47`	`+ {`
	`48`	`+ updateBandList();`
	`49`	`+ }`
	`50`	`+ }`
`36`	`51`	`return *this;`
`37`	`52`	`}`
`38`	`53`
`@@ -109,6 +124,12 @@ void SubWindow::setBandList(uint32_t * value)`
`109`	`124`	`{`
`110`	`125`	`getNativeOrThrow()->bandList = value;`
`111`	`126`	`}`
	`127`	`+void SubWindow::setBandList(std::vector<uint32_t>&& value)`
	`128`	`+{`
	`129`	`+ bandList = std::move(value);`
	`130`	`+ updateBandList();`
	`131`	`+}`
	`132`	`+`
`112`	`133`
`113`	`134`	`uint32_t SubWindow::getNumBands() const`
`114`	`135`	`{`
`@@ -143,3 +164,7 @@ nitf::DownSampler* SubWindow::getDownSampler() noexcept`
`143`	`164`	`{`
`144`	`165`	`return mDownSampler;`
`145`	`166`	`}`
	`167`	`+const nitf::DownSampler* SubWindow::getDownSampler() const noexcept`
	`168`	`+{`
	`169`	`+ return mDownSampler;`
	`170`	`+}`